mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
7949d8db1b
36 changed files with 427 additions and 134 deletions
|
|
@ -149,6 +149,12 @@
|
|||
github = "360ied";
|
||||
githubId = 19516527;
|
||||
};
|
||||
_365tuwe = {
|
||||
name = "Uwe Schlifkowitz";
|
||||
email = "supertuwe@gmail.com";
|
||||
github = "365tuwe";
|
||||
githubId = 10263091;
|
||||
};
|
||||
_3699n = {
|
||||
email = "nicholas@nvk.pm";
|
||||
github = "3699n";
|
||||
|
|
@ -11014,6 +11020,12 @@
|
|||
githubId = 3507;
|
||||
name = "Michael Fellinger";
|
||||
};
|
||||
maolonglong = {
|
||||
email = "shaolong.chen@outlook.it";
|
||||
github = "maolonglong";
|
||||
githubId = 50797868;
|
||||
name = "Shaolong Chen";
|
||||
};
|
||||
maralorn = {
|
||||
email = "mail@maralorn.de";
|
||||
matrix = "@maralorn:maralorn.de";
|
||||
|
|
|
|||
|
|
@ -563,6 +563,8 @@ The module update takes care of the new config syntax and the data itself (user
|
|||
|
||||
- TeX Live environments can now be built with the new `texlive.withPackages`. The procedure for creating custom TeX packages has been changed, see the [Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#sec-language-texlive-custom-packages) for more details.
|
||||
|
||||
- In `wxGTK32`, the webkit module `wxWebView` has been enabled on all builds; prior releases only enabled this on Darwin.
|
||||
|
||||
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
|
||||
|
||||
- Node.js v14, v16 has been removed as they were end of life. Any dependent packages that contributors were not able to reasonably upgrade were dropped after a month of notice to their maintainers, were **removed**.
|
||||
|
|
|
|||
|
|
@ -123,9 +123,7 @@ in
|
|||
};
|
||||
|
||||
sshKey = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
# Prevent key from being copied to store
|
||||
apply = mapNullable toString;
|
||||
type = with types; nullOr (coercedTo path toString str);
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
SSH private key file to use to login to the remote system. Can be
|
||||
|
|
@ -205,9 +203,7 @@ in
|
|||
recursive = mkEnableOption (lib.mdDoc ''the transfer of child datasets'');
|
||||
|
||||
sshKey = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
# Prevent key from being copied to store
|
||||
apply = mapNullable toString;
|
||||
type = with types; nullOr (coercedTo path toString str);
|
||||
description = lib.mdDoc ''
|
||||
SSH private key file to use to login to the remote system.
|
||||
Defaults to {option}`services.syncoid.sshKey` option.
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
let
|
||||
pname = "codux";
|
||||
version = "15.13.0";
|
||||
version = "15.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
|
||||
sha256 = "sha256-63t3v6abr9cZ0mKSPogevKwcFsvGh2udBPRn4k4XAd4=";
|
||||
sha256 = "sha256-GTp9wJrL0TA0Jee1aXKAqmyHfotm7u7gxq/6W8+ermY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb";
|
||||
hash = "sha256-T5SFcdz5yrInE6+ydJqtstEYF0MvHquRZ7nvlCOVNzE=";
|
||||
hash = "sha256-WKL5RabTUD8xIOUoISyn26NXYrNImKZdjXnTYkXpfkE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cadical";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arminbiere";
|
||||
repo = "cadical";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "sha256-hY7+gTwBqQegbm5RjLKhM2vfBOjIRz797Z6wd6usj9s=";
|
||||
sha256 = "sha256-2cMaBo4u7uqrsp11dc9PHOI9ZBnir51BftPE4C6/U7Q=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ in lib.recurseIntoAttrs
|
|||
mpris = callPackage ./mpris.nix { };
|
||||
mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; };
|
||||
mpv-webm = callPackage ./mpv-webm.nix { };
|
||||
mpvacious = callPackage ./mpvacious.nix { };
|
||||
mpvacious = callPackage ./mpvacious.nix { inherit buildLua; };
|
||||
quality-menu = callPackage ./quality-menu.nix { inherit buildLua; };
|
||||
simple-mpv-webui = callPackage ./simple-mpv-webui.nix { };
|
||||
sponsorblock = callPackage ./sponsorblock.nix { };
|
||||
thumbfast = callPackage ./thumbfast.nix { };
|
||||
thumbfast = callPackage ./thumbfast.nix { inherit buildLua; };
|
||||
thumbnail = callPackage ./thumbnail.nix { inherit buildLua; };
|
||||
uosc = callPackage ./uosc.nix { };
|
||||
visualizer = callPackage ./visualizer.nix { };
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, buildLua
|
||||
, fetchFromGitHub
|
||||
, curl
|
||||
, wl-clipboard
|
||||
, xclip
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
buildLua rec {
|
||||
pname = "mpvacious";
|
||||
version = "0.24";
|
||||
version = "0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ajatt-Tools";
|
||||
repo = "mpvacious";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o0YcoSI+4934HlyIoI5V1h/FalCe+6tXS8Lg6kXWjSg=";
|
||||
sha256 = "sha256-XTnib4cguWFEvZtmsLfkesbjFbkt2YoyYLT587ajyUM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -26,23 +26,16 @@ stdenvNoCC.mkDerivation rec {
|
|||
--replace "'xclip" "'${xclip}/bin/xclip"
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
rm -r .github
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp -r . $out/share/mpv/scripts/mpvacious
|
||||
make PREFIX=$out/share/mpv install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "mpvacious";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Adds mpv keybindings to create Anki cards from movies and TV shows";
|
||||
homepage = "https://github.com/Ajatt-Tools/mpvacious";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ kmicklas ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, mpv-unwrapped }:
|
||||
{ lib, fetchFromGitHub, buildLua, mpv-unwrapped }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "mpv-thumbfast";
|
||||
buildLua {
|
||||
pname = "mpv-thumbfast";
|
||||
version = "unstable-2023-06-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "po5";
|
||||
repo = "thumbfast";
|
||||
rev = "6f1d92da25a7b807427f55f085e7ad4d60c4e0d7";
|
||||
hash = "sha256-7CCxMPmZZRDIcWn+YbV4xzZFL80qZS5UFA25E+Y2P2Q=";
|
||||
rev = "4241c7daa444d3859b51b65a39d30e922adb87e9";
|
||||
hash = "sha256-7EnFJVjEzqhWXAvhzURoOp/kad6WzwyidWxug6u8lVw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -16,18 +16,7 @@ stdenvNoCC.mkDerivation {
|
|||
--replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"'
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp -r thumbfast.lua $out/share/mpv/scripts/thumbfast.lua
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "thumbfast.lua";
|
||||
scriptPath = "thumbfast.lua";
|
||||
|
||||
meta = {
|
||||
description = "High-performance on-the-fly thumbnailer for mpv";
|
||||
|
|
|
|||
34
pkgs/by-name/go/gosimports/package.nix
Normal file
34
pkgs/by-name/go/gosimports/package.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gosimports";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinchsan";
|
||||
repo = "gosimports";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xM1CGW8UB+VHN+2Rm6cF/1bOBVDeUG+6kxUxUcvP7FM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xR1YTwUcJcpe4NXH8sp9bNAWggvcvVJLztD49gQIdMU=";
|
||||
|
||||
subPackages = [ "cmd/gosimports" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rinchsan/gosimports";
|
||||
description = "Simpler goimports";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ maolonglong ];
|
||||
mainProgram = "gosimports";
|
||||
};
|
||||
}
|
||||
53
pkgs/by-name/ss/sshx/package.nix
Normal file
53
pkgs/by-name/ss/sshx/package.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, zstd
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sshx";
|
||||
version = "unstable-2023-11-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ekzhang";
|
||||
repo = "sshx";
|
||||
rev = "91c82d46cde4d1ffa0ae34e2a9a49911e2e53baa";
|
||||
hash = "sha256-X9c7ZKIpWI5EsbkgB8FJWlwQQXHAcPjLKp2Bvo0fo/w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mOK5gpPuUKzN5xnJs5nFyslxr9IIHtiCylMP53ObDqg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
outputs = [ "out" "server" ];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput 'bin/sshx' "$out"
|
||||
moveToOutput 'bin/sshx-server' "$server"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast, collaborative live terminal sharing over the web";
|
||||
homepage = "https://github.com/ekzhang/sshx";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pinpox ];
|
||||
mainProgram = "sshx";
|
||||
};
|
||||
}
|
||||
27
pkgs/by-name/te/tera-cli/package.nix
Normal file
27
pkgs/by-name/te/tera-cli/package.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tera-cli";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chevdor";
|
||||
repo = "tera-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W+pcVLxOlikwAGvx0twm23GyCMzdqnHY0YBNtcsSB5I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A01mok8KQk1FV8P7E4svdBCW6xqpduHy1XuUcdDFjfc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command line utility to render templates from json|toml|yaml and ENV, using the tera templating engine";
|
||||
homepage = "https://github.com/chevdor/tera-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [_365tuwe];
|
||||
mainProgram = "tera";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uiua";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uiua-lang";
|
||||
repo = "uiua";
|
||||
rev = version;
|
||||
hash = "sha256-+Hh9vNVWen5ri8+Qy4pzaMrC0Laa1xMlURxEYwo4hSk=";
|
||||
hash = "sha256-UINjoleubgYV7qsjQyOz+8PXCmLBrXxknIc1OKuPPMU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tLBWbnER5ufK3NQ6mxzqY/dmiwaPKTcPOXS68S6yXf4=";
|
||||
cargoHash = "sha256-wSa70jBHNPdyf1NHj+jHr8VwGXNw8p/bJRHc8PUE7BU=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
|
|
|
|||
|
|
@ -1,26 +1,45 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, kdeclarative
|
||||
, plasma-framework
|
||||
, plasma-workspace
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "colloid-kde";
|
||||
version = "unstable-2022-07-13";
|
||||
version = "unstable-2023-07-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "eaf6844e997aa60c755af7ea560ffba798e72ff5";
|
||||
hash = "sha256-FNTG5aVvTWHqNVVR23LFG/ykPtXRD7oH5C6eyWaqc60=";
|
||||
rev = "0b79befdad9b442b5a8287342c4b7e47ff87d555";
|
||||
hash = "sha256-AYH9fW20/p+mq6lxR1lcCV1BQ/kgcsjHncpMvYWXnWA=";
|
||||
};
|
||||
|
||||
# Propagate sddm theme dependencies to user env otherwise sddm does
|
||||
# not find them. Putting them in buildInputs is not enough.
|
||||
propagatedUserEnvPkgs = [
|
||||
kdeclarative.bin
|
||||
plasma-framework
|
||||
plasma-workspace
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
|
||||
substituteInPlace install.sh \
|
||||
--replace '$HOME/.local' $out \
|
||||
--replace '$HOME/.config' $out/share
|
||||
|
||||
substituteInPlace sddm/install.sh \
|
||||
--replace /usr $out \
|
||||
--replace '$(cd $(dirname $0) && pwd)' . \
|
||||
--replace '"$UID" -eq "$ROOT_UID"' true
|
||||
|
||||
substituteInPlace sddm/Colloid/Main.qml \
|
||||
--replace /usr $out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -31,6 +50,10 @@ stdenvNoCC.mkDerivation rec {
|
|||
name= HOME="$TMPDIR" \
|
||||
./install.sh --dest $out/share/themes
|
||||
|
||||
mkdir -p $out/share/sddm/themes
|
||||
cd sddm
|
||||
source install.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,55 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, kdeclarative
|
||||
, plasma-framework
|
||||
, plasma-workspace
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphite-kde-theme";
|
||||
version = "2022-02-08";
|
||||
version = "unstable-2023-10-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf";
|
||||
rev = "33cc85c49c424dfcba73e6ee84b0dc7fb9e52566";
|
||||
hash = "sha256-iQGT2x0wY2EIuYw/a1MB8rT9BxiqWrOyBo6EGIJwsFw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
# Propagate sddm theme dependencies to user env otherwise sddm does
|
||||
# not find them. Putting them in buildInputs is not enough.
|
||||
propagatedUserEnvPkgs = [
|
||||
kdeclarative.bin
|
||||
plasma-framework
|
||||
plasma-workspace
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
|
||||
substituteInPlace install.sh \
|
||||
--replace '$HOME/.local' $out \
|
||||
--replace '$HOME/.config' $out/share
|
||||
|
||||
name= ./install.sh --dest $out/share/themes
|
||||
substituteInPlace sddm/*/Main.qml \
|
||||
--replace /usr $out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
name= ./install.sh
|
||||
|
||||
mkdir -p $out/share/sddm/themes
|
||||
cp -a sddm/Graphite $out/share/sddm/themes/
|
||||
cp -a sddm/Graphite* $out/share/sddm/themes/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A flat Design theme for KDE Plasma desktop";
|
||||
homepage = "https://github.com/vinceliuice/Graphite-kde-theme";
|
||||
|
|
|
|||
|
|
@ -1,26 +1,40 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, kdeclarative
|
||||
, plasma-framework
|
||||
, plasma-workspace
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "layan-kde";
|
||||
version = "2022-02-13";
|
||||
version = "unstable-2023-09-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09z90g13l26v23nwr8n5bapwldp3hhdrdikynvm4vvb7qsvb4vrp";
|
||||
rev = "7ab7cd7461dae8d8d6228d3919efbceea5f4272c";
|
||||
hash = "sha256-Wh8tZcQEdTTlgtBf4ovapojHcpPBZDDkWOclmxZv9zA=";
|
||||
};
|
||||
|
||||
# Propagate sddm theme dependencies to user env otherwise sddm does
|
||||
# not find them. Putting them in buildInputs is not enough.
|
||||
propagatedUserEnvPkgs = [
|
||||
kdeclarative.bin
|
||||
plasma-framework
|
||||
plasma-workspace
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
|
||||
substituteInPlace install.sh \
|
||||
--replace '$HOME/.local' $out \
|
||||
--replace '$HOME/.config' $out/share
|
||||
|
||||
substituteInPlace sddm/*/Main.qml \
|
||||
--replace /usr $out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,26 +1,40 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, kdeclarative
|
||||
, plasma-framework
|
||||
, plasma-workspace
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "qogir-kde";
|
||||
version = "unstable-2022-07-08";
|
||||
version = "unstable-2023-10-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "f240eae10978c7fee518f7a8be1c41a21a9d5c2e";
|
||||
hash = "sha256-AV60IQWwgvLwDO3ylILwx1DkKadwo4isn3JX3WpKoxQ=";
|
||||
rev = "1cfe8da54e6f76d5ce0d2234dcb4f5186431edb3";
|
||||
hash = "sha256-Ts8cS7dH8RkfRgWvzDKLCC2G6Hsnvx0NAGstfxMIt+Y=";
|
||||
};
|
||||
|
||||
# Propagate sddm theme dependencies to user env otherwise sddm does
|
||||
# not find them. Putting them in buildInputs is not enough.
|
||||
propagatedUserEnvPkgs = [
|
||||
kdeclarative.bin
|
||||
plasma-framework
|
||||
plasma-workspace
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
|
||||
substituteInPlace install.sh \
|
||||
--replace '$HOME/.local' $out \
|
||||
--replace '$HOME/.config' $out/share
|
||||
|
||||
substituteInPlace sddm/*/Main.qml \
|
||||
--replace /usr $out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,20 +1,31 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, kdeclarative
|
||||
, plasma-framework
|
||||
, plasma-workspace
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "whitesur-kde";
|
||||
version = "unstable-2023-08-15";
|
||||
version = "unstable-2023-10-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "d50bc20b2b78705bb9856204066affb763fa8a35";
|
||||
hash = "sha256-oG6QT4VQpBznM+gvzdiY4CldOwdHcBeHlbvlc52eFuU=";
|
||||
rev = "2b4bcc76168bd8a4a7601188e177fa0ab485cdc8";
|
||||
hash = "sha256-+Iooj8a7zfLhEWnjLEVoe/ebD9Vew5HZdz0wpWVZxA8=";
|
||||
};
|
||||
|
||||
# Propagate sddm theme dependencies to user env otherwise sddm does
|
||||
# not find them. Putting them in buildInputs is not enough.
|
||||
propagatedUserEnvPkgs = [
|
||||
kdeclarative.bin
|
||||
plasma-framework
|
||||
plasma-workspace
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
|
||||
|
|
@ -22,6 +33,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
--replace '$HOME/.config' $out/share \
|
||||
--replace '$HOME/.local' $out \
|
||||
--replace '"$HOME"/.Xresources' $out/doc/.Xresources
|
||||
|
||||
substituteInPlace sddm/*/Main.qml \
|
||||
--replace /usr $out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
, compat30 ? true
|
||||
, unicode ? true
|
||||
, withMesa ? !stdenv.isDarwin
|
||||
, withWebKit ? stdenv.isDarwin
|
||||
, withWebKit ? true
|
||||
, webkitgtk
|
||||
, setfile
|
||||
, AGL
|
||||
|
|
|
|||
33
pkgs/development/ocaml-modules/zipc/default.nix
Normal file
33
pkgs/development/ocaml-modules/zipc/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, ocaml, findlib, ocamlbuild, topkg, cmdliner
|
||||
}:
|
||||
|
||||
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.14")
|
||||
"zipc is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-zipc";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/zipc/releases/zipc-${version}.tbz";
|
||||
hash = "sha256-vU4AGW1MjQ31xjwvyRKSn1AwS0X6gjLvaJGYKqzFRpk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
ocaml findlib ocamlbuild
|
||||
];
|
||||
|
||||
buildInputs = [ cmdliner topkg ];
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = {
|
||||
description = "ZIP archive and deflate codec for OCaml";
|
||||
homepage = "https://erratique.ch/software/zipc";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,20 +2,22 @@
|
|||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "1.10.37";
|
||||
version = "1.10.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan-src";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-y55bfwE3H/oDCwDq3wrClyX8dhk0p6vEl/CMhqN6LkA=";
|
||||
hash = "sha256-QV3LYsl/vkC7GgGXthMneCTE716YP7dYL6bnSZDCwlA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hjCfrmpn2rYgApenZkHX8fXqPXukh7BVKENkvwIk8Dk=";
|
||||
vendorHash = "sha256-eF9ijUhCjMd0c9/I/QGPvFnXW5vkmBTEvE2TgiZCabg=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/phpstan/phpstan/releases/tag/${finalAttrs.version}";
|
||||
description = "PHP Static Analysis Tool";
|
||||
homepage = "https://github.com/phpstan/phpstan";
|
||||
longDescription = ''
|
||||
PHPStan focuses on finding errors in your code without actually
|
||||
running it. It catches whole classes of bugs even before you write
|
||||
|
|
@ -24,7 +26,7 @@ php.buildComposerProject (finalAttrs: {
|
|||
before you run the actual line.
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/phpstan/phpstan";
|
||||
mainProgram = "phpstan";
|
||||
maintainers = lib.teams.php.members;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc";
|
||||
version = "17.3.25";
|
||||
version = "17.3.41";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EPEfBK/1nbwcajqyv5lFX+02WMvbyFnij2w5J91+UK8=";
|
||||
hash = "sha256-thJBptiwH3jLQIYw7ucCv4xwaGPXMpE+dUwRvsyURtw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,33 +1,57 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, smmap
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gitdb";
|
||||
version = "4.0.10";
|
||||
disabled = !isPy3k;
|
||||
version = "4.0.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-brmQtp304VutiZ6oaNxGVyw/dTOXNWY7gd55sG8X65o=";
|
||||
hash = "sha256-v1QhEmE21tCvVbwefBrxw5ejT1t71553bNPol4XCsEs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ smmap ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace ",<4" ""
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
smmap
|
||||
];
|
||||
|
||||
# Bunch of tests fail because they need an actual git repo
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [
|
||||
"gitdb"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests need part which are not shipped with PyPI releases
|
||||
"test_base"
|
||||
"test_reading"
|
||||
"test_writing"
|
||||
"test_correctness"
|
||||
"test_loose_correctness"
|
||||
"test_pack_random_access"
|
||||
"test_pack_writing"
|
||||
"test_stream_reading"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Git Object Database";
|
||||
maintainers = [ ];
|
||||
homepage = "https://github.com/gitpython-developers/gitdb";
|
||||
license = lib.licenses.bsd3;
|
||||
changelog = "https://github.com/gitpython-developers/gitdb/releases/tag/${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, nix-update-script
|
||||
|
||||
, setuptools
|
||||
, wheel
|
||||
|
||||
, fetchPypi
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -14,27 +12,31 @@ buildPythonPackage rec {
|
|||
version = "30.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1q6KpKdrZvp8XvxGCkoorlZDDgvGg/imTX8+NEOBbWs=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "junit2htmlreport" ];
|
||||
# Tests are not shipped with PyPi and source is not tagged
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"junit2htmlreport"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate HTML reports from Junit results";
|
||||
homepage = "https://pypi.org/project/junit2html/";
|
||||
homepage = "https://gitlab.com/inorton/junit2html";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
mainProgram = "junit2html";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
# build
|
||||
, hatchling
|
||||
|
|
@ -9,6 +10,7 @@
|
|||
, jsonschema
|
||||
, python-json-logger
|
||||
, pyyaml
|
||||
, referencing
|
||||
, traitlets
|
||||
|
||||
# optionals
|
||||
|
|
@ -23,14 +25,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-events";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter";
|
||||
repo = "jupyter_events";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hOx2/WiFpDjtmP+qC6Ew2VY4/gdvXuv2k76qtmS+61M=";
|
||||
hash = "sha256-LDj6dTtq3npJxLKBQEEwGQFeDPvWF2adHeJhOai2MRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,9 +45,9 @@ buildPythonPackage rec {
|
|||
jsonschema
|
||||
python-json-logger
|
||||
pyyaml
|
||||
referencing
|
||||
traitlets
|
||||
]
|
||||
++ jsonschema.optional-dependencies.format
|
||||
++ jsonschema.optional-dependencies.format-nongpl;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
@ -63,6 +67,10 @@ buildPythonPackage rec {
|
|||
export PATH="$out/bin:$PATH"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jupyter_events"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}";
|
||||
description = "Configurable event system for Jupyter applications and extensions";
|
||||
|
|
|
|||
|
|
@ -2,20 +2,25 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minidump";
|
||||
version = "0.0.21";
|
||||
format = "setuptools";
|
||||
version = "0.0.22";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g9YSr7bFdyfr84rKQztVD4P5+MfDtlYq0quXBx/YXzo=";
|
||||
hash = "sha256-PPvvvHz3WA67Vn2P7MIY+ChkjXrCOuTgj0KXr4B2mZ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# Upstream doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -26,6 +31,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python library to parse and read Microsoft minidump file format";
|
||||
homepage = "https://github.com/skelsec/minidump";
|
||||
changelog = "https://github.com/skelsec/minidump/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings-python";
|
||||
version = "1.7.3";
|
||||
version = "1.7.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "mkdocstrings";
|
||||
repo = "python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-r/N2ZGqA1cYFkP4Ai8p6utIw/m+FiNBVbpL4Y0EO2ds=";
|
||||
hash = "sha256-PfAdECR80kYgvaaL+09zsqOeWa8z4pSnORNFnj+/l7M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pychromecast";
|
||||
version = "13.0.7";
|
||||
version = "13.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyChromecast";
|
||||
inherit version;
|
||||
hash = "sha256-DemOnlvkMmndQe+xYSarDVupQcpKyuAkMpcShRwMAyQ=";
|
||||
hash = "sha256-5LdSPbE3+N4F7tzGFUETtoUyhIYpRCtEjCM0+slmpEc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,32 +1,44 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, orjson
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "113";
|
||||
format = "setuptools";
|
||||
version = "114";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Vf3nYUopaGY5JK//rqqsz47VRHwql1cQcslYbkH3owQ=";
|
||||
hash = "sha256-XN6di3pxB7lhZ5TQnyHr7nKA0STBi0CVzGnhvRDsbFY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov=pydeconz --cov-report term-missing" "" \
|
||||
--replace "setuptools==" "setuptools>=" \
|
||||
--replace "wheel==" "wheel>="
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
orjson
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytenable";
|
||||
version = "1.4.13";
|
||||
version = "1.4.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "tenable";
|
||||
repo = "pyTenable";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UY3AFnPplmU0jrV4LIKH4+2tcJEFkKMqO2GWVkgaHYE=";
|
||||
hash = "sha256-EZ6W7DTcmZWjP2BmopU2G3S/82juGG+/ht5Fd8G0W1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "speechbrain";
|
||||
version = "0.5.15";
|
||||
version = "0.5.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "speechbrain";
|
||||
repo = "speechbrain";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d0+3bry69ML65JR8XDppG8RO200ZTTHyd7PrTP7SJkk=";
|
||||
hash = "sha256-Mve6wr3klXMe7sCiJjPuzUPKGHRyI/LzTe6Ea39zNHw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pythonRelaxDepsHook
|
||||
, which
|
||||
# runtime dependencies
|
||||
, numpy
|
||||
, torch
|
||||
, pyre-extensions
|
||||
# check dependencies
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
|
|
@ -27,7 +25,7 @@
|
|||
#, flash-attn
|
||||
}:
|
||||
let
|
||||
version = "0.03";
|
||||
version = "0.0.22.post7";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "xformers";
|
||||
|
|
@ -40,7 +38,7 @@ buildPythonPackage {
|
|||
owner = "facebookresearch";
|
||||
repo = "xformers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-G8f7tny5B8SAQ6+2uOjhY7nD0uOT4sskIwtTdwivQXo=";
|
||||
hash = "sha256-7lZi3+2dVDZJFYCUlxsyDU8t9qdnl+b2ERRXKA6Zp7U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -52,18 +50,12 @@ buildPythonPackage {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
which
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pyre-extensions"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
torch
|
||||
pyre-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "xformers" ];
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.1.4";
|
||||
version = "3.1.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MHiM9ZiVLTqMapebN0gW6WZjHzwm8HvtjZlo31ol+Ak=";
|
||||
hash = "sha256-yUaCLCKOgJyHfhz07tzfcgJLn0k1mSifj4DJZyalRBY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
, substituteAll
|
||||
, writeTextFile
|
||||
, writeShellApplication
|
||||
, makeBinaryWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -129,7 +130,7 @@ let
|
|||
|
||||
defaultShellPath = lib.makeBinPath defaultShellUtils;
|
||||
|
||||
bashWithDefaultShellUtils = writeShellApplication {
|
||||
bashWithDefaultShellUtilsSh = writeShellApplication {
|
||||
name = "bash";
|
||||
runtimeInputs = defaultShellUtils;
|
||||
text = ''
|
||||
|
|
@ -140,6 +141,17 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
# Script-based interpreters in shebangs aren't guaranteed to work,
|
||||
# especially on MacOS. So let's produce a binary
|
||||
bashWithDefaultShellUtils = stdenv.mkDerivation {
|
||||
name = "bash";
|
||||
src = bashWithDefaultShellUtilsSh;
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
buildPhase = ''
|
||||
makeWrapper ${bashWithDefaultShellUtilsSh}/bin/bash $out/bin/bash
|
||||
'';
|
||||
};
|
||||
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
|
||||
|
|
|
|||
|
|
@ -29151,7 +29151,9 @@ with pkgs;
|
|||
|
||||
comfortaa = callPackage ../data/fonts/comfortaa { };
|
||||
|
||||
colloid-kde = callPackage ../data/themes/colloid-kde { };
|
||||
colloid-kde = callPackage ../data/themes/colloid-kde {
|
||||
inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace;
|
||||
};
|
||||
|
||||
comic-mono = callPackage ../data/fonts/comic-mono { };
|
||||
|
||||
|
|
@ -29369,7 +29371,9 @@ with pkgs;
|
|||
|
||||
graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { };
|
||||
|
||||
graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { };
|
||||
graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme {
|
||||
inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace;
|
||||
};
|
||||
|
||||
greybird = callPackage ../data/themes/greybird { };
|
||||
|
||||
|
|
@ -29506,7 +29510,9 @@ with pkgs;
|
|||
|
||||
layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { };
|
||||
|
||||
layan-kde = callPackage ../data/themes/layan-kde { };
|
||||
layan-kde = callPackage ../data/themes/layan-kde {
|
||||
inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace;
|
||||
};
|
||||
|
||||
lao = callPackage ../data/fonts/lao { };
|
||||
|
||||
|
|
@ -29871,7 +29877,9 @@ with pkgs;
|
|||
|
||||
qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { };
|
||||
|
||||
qogir-kde = callPackage ../data/themes/qogir-kde { };
|
||||
qogir-kde = callPackage ../data/themes/qogir-kde {
|
||||
inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace;
|
||||
};
|
||||
|
||||
qogir-theme = callPackage ../data/themes/qogir { };
|
||||
|
||||
|
|
@ -30205,7 +30213,9 @@ with pkgs;
|
|||
|
||||
whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { };
|
||||
|
||||
whitesur-kde = callPackage ../data/themes/whitesur-kde { };
|
||||
whitesur-kde = callPackage ../data/themes/whitesur-kde {
|
||||
inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace;
|
||||
};
|
||||
|
||||
wireless-regdb = callPackage ../data/misc/wireless-regdb { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1896,6 +1896,8 @@ let
|
|||
|
||||
zelus-gtk = callPackage ../development/ocaml-modules/zelus-gtk { };
|
||||
|
||||
zipc = callPackage ../development/ocaml-modules/zipc { };
|
||||
|
||||
zmq = callPackage ../development/ocaml-modules/zmq { };
|
||||
|
||||
zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue