diff options
Diffstat (limited to 'pkgs')
58 files changed, 524 insertions, 644 deletions
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 938d07f5a4478..d6089e70b84d6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17335,5 +17335,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + compiler-nvim = buildVimPlugin { + pname = "compiler-nvim"; + version = "2024-04-26"; + src = fetchFromGitHub { + owner = "Zeioth"; + repo = "compiler.nvim"; + rev = "cb14acd32ba9ea09d01bbe3493aefdc59b68965c"; + sha256 = "sha256-YZyT5B0nk9LxaEA5ntuKPs7yf/Ix7zs3f6N3UOc9AIU="; + }; + meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ee8c3493e71a3..37fbd0448208d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -427,6 +427,11 @@ dependencies = with self; [ plenary-nvim ]; }; + compiler-nvim = super.compiler-nvim.overrideAttrs { + dependencies = [ self.overseer-nvim ]; + nvimRequireCheck = "compiler"; + }; + completion-buffers = super.completion-buffers.overrideAttrs { dependencies = with self; [ completion-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 80a8d23eb0961..7637b8d34ef25 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -203,6 +203,7 @@ https://github.com/tzachar/compe-tabnine/,, https://github.com/tamago324/compe-zsh/,, https://github.com/xeluxee/competitest.nvim/,HEAD, https://github.com/krady21/compiler-explorer.nvim/,HEAD, +https://github.com/Zeioth/compiler.nvim/,HEAD, https://github.com/steelsojka/completion-buffers/,, https://github.com/nvim-lua/completion-nvim/,, https://github.com/aca/completion-tabnine/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 02c605fcc9502..d46f2a3effd4e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1477,8 +1477,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.21.2"; - hash = "sha256-UZthDY+O8rG+oz/jQyQKDPbdS+lVKiLyuicU+4SGivw="; + version = "0.21.3"; + hash = "sha256-C6QFlqMIcefQhzBuVd3CnQHHaDdM1de7j+a/06wZ9FQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 6a6b58fe240e1..b852f9ec23183 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.2.9"; + version = "2.2.10"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-C0rNTlcreBVxmLb2ChU5nYdafcnynd+GGuGFefFJXl8="; + hash = "sha256-2LDV2aVdGuclVmOgIIwMYRKTMVLzlmNFI6xHFpxMRJw="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 25e4c7ab97edf..2b148c859e31c 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-1UDPpavDjWoM5kSfyaT4H5y5ax/vVlfqpzN9U2sTVuk="; + hash = "sha256-hYfh/faOQtN1MTnaCHsdogzBU3Xf6BY4apK+VuVCh6E="; }; - vendorHash = "sha256-52RaQOJ2KTuc8wdk7vv5XsynKdMOwZ1LaqiPdB+jXPw="; + vendorHash = "sha256-5Dxtwu+PM0TbznIPTl8QxgOvNsQZUDMGY2kf+PSfCqo="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 7677abfb0ccf3..2fb3c47aa8f7c 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -19,13 +19,17 @@ nodePackages.n8n.override { pkgs.postgresql ]; - # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. - # This can supposedly be fixed by building a custom copy of the module from source, but that's way - # too much complexity for a setup no one would ever actually run. - # - # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. preRebuild = lib.optionalString stdenv.isAarch64 '' + # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. + # This can supposedly be fixed by building a custom copy of the module from source, but that's way + # too much complexity for a setup no one would ever actually run. + # + # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. rm -rf node_modules/oracledb + + # This package tries to load a prebuilt binary for a different arch, and it doesn't provide the binary for aarch64. + # It is marked as an optional dependency in pnpm-lock.yaml and there are no other references to it n8n. + rm -rf node_modules/@sap/hana-client ''; # makes libmongocrypt bindings not look for static libraries in completely wrong places diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 6b1630594be0f..ab6df01a269bf 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -54,6 +54,9 @@ let # Deleting the bundled library is the simplest way to force it to use our version. rm "$out/lib/vmware/gcc/libstdc++.so.6" + # This bundled version of libpng causes browser issues, and would prevent web-based sign-on. + rm "$out/lib/vmware/libpng16.so.16" + # This opensc library is required to support smartcard authentication during the # initial connection to Horizon. mkdir $out/lib/vmware/view/pkcs11 diff --git a/pkgs/by-name/ae/aeacus/package.nix b/pkgs/by-name/ae/aeacus/package.nix index d172e7c501772..07a75a2d3a3cd 100644 --- a/pkgs/by-name/ae/aeacus/package.nix +++ b/pkgs/by-name/ae/aeacus/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { @@ -31,5 +32,6 @@ buildGoModule rec { license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; mainProgram = "aeacus"; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix index 9dc4f4df19711..dd8168868efbd 100644 --- a/pkgs/by-name/bp/bpftop/package.nix +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -1,24 +1,27 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, elfutils -, zlib -, libbpf +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + elfutils, + zlib, + libbpf, + clangStdenv, }: - -rustPlatform.buildRustPackage rec { +let pname = "bpftop"; - version = "0.4.2"; - + version = "0.5.1"; +in +rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } { + inherit pname version; src = fetchFromGitHub { owner = "Netflix"; repo = "bpftop"; - rev = "v${version}"; - hash = "sha256-zYCv3L+xDFAJ4Wo9xwfHJrqPQUv5KiFDbhCdC1Z6qNo="; + rev = "refs/tags/v${version}"; + hash = "sha256-CSQfg0JuWm0CFyC4eXxn7eSyKIu0gKAqgiQT64tgnDI="; }; - cargoHash = "sha256-6uPfMxjSrSGrAgJcvzTY/i1ckoW/wIi7D5noOafCvZE="; + cargoHash = "sha256-Hg763Zy5KRZqEDoasoDScZGAPb1ABRp+LI1c7IYJNf0="; buildInputs = [ elfutils @@ -26,9 +29,7 @@ rustPlatform.buildRustPackage rec { zlib ]; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "A dynamic real-time view of running eBPF programs"; @@ -36,6 +37,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ _0x4A6F + luftmensch-luftmensch mfrw ]; mainProgram = "bpftop"; diff --git a/pkgs/by-name/br/brainstem/package.nix b/pkgs/by-name/br/brainstem/package.nix deleted file mode 100644 index dcfe3d523dc8e..0000000000000 --- a/pkgs/by-name/br/brainstem/package.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ stdenv -, lib -, autoPatchelfHook -, fetchzip -, curl -, systemd -, zlib -, writeText -, withUpdater ? true -, ... -}: - -let - version = "2.10.5"; - # Upstream has a udev.sh script asking for mode and group, but with uaccess we - # don't need any of that and can make it entirely static. - # For any rule adding the uaccess tag to be effective, the name of the file it - # is defined in has to lexically precede 73-seat-late.rules. - udevRule = writeText "60-brainstem.rules" '' - # Acroname Brainstem control devices - SUBSYSTEM=="usb", ATTRS{idVendor}=="24ff", TAG+="uaccess" - - # Acroname recovery devices (pb82, pb242, pb167) - SUBSYSTEM=="tty", ATTRS{idVendor}=="0424", ATTRS{idProduct}=="274e", TAG+="uaccess" - SUBSYSTEM=="tty", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", TAG+="uaccess" - KERNEL=="hidraw*", ATTRS{idVendor}=="1fc9", ATTRS{idProduct}=="0130", TAG+="uaccess" - ''; - - src = fetchzip { - url = "https://acroname.com/sites/default/files/software/brainstem_sdk/${version}/brainstem_sdk_${version}_Ubuntu_LTS_22.04_x86_64.tgz"; - hash = "sha256-S6u9goxTMCI12sffP/WKUF7bv0pLeNmNog7Hle+vpR4="; - # There's no "brainstem" parent directory in the archive. - stripRoot = false; - }; -in - -stdenv.mkDerivation { - pname = "brainstem"; - inherit version src; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ - # libudev - (lib.getLib systemd) - # libstdc++.so libgcc_s.so - stdenv.cc.cc.lib - ] ++ lib.optionals withUpdater [ - # libcurl.so.4 - curl - # libz.so.1 - zlib - ]; - - # Unpack the CLI tools, documentation, library and C headers. - # There's also a python .whl, containing more libraries, which might be used - # to support more architectures, too, but let's only do that if we need it. - installPhase = '' - mkdir -p $out/bin - install -m744 cli/AcronameHubCLI $out/bin - install -m744 cli/Updater $out/bin/AcronameHubUpdater - - mkdir -p $out/lib/udev/rules.d - cp ${udevRule} $out/lib/udev/rules.d/60-brainstem.rules - - mkdir -p $doc - cp docs/* $doc/ - cp {license,version}.txt $doc/ - - mkdir -p $lib/lib - cp api/lib/libBrainStem2.* $lib/lib - - mkdir -p $dev/include - cp -R api/lib/BrainStem2 $dev/include/ - ''; - - outputs = [ "out" "lib" "dev" "doc" ]; - - meta = with lib; { - description = "BrainStem Software Development Kit"; - longDescription = '' - The BrainStem SDK provides a library to access and control Acroname smart - USB switches, as well as a CLI interface, and a firmware updater. - ''; - homepage = "https://acroname.com/software/brainstem-development-kit"; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - maintainers = with maintainers; [ flokli ]; - mainProgram = "AcronameHubCLI"; - }; -} diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix index ef9d7a173b263..18f9b852a2439 100644 --- a/pkgs/by-name/cr/crc/package.nix +++ b/pkgs/by-name/cr/crc/package.nix @@ -7,16 +7,16 @@ }: let - openShiftVersion = "4.15.3"; + openShiftVersion = "4.15.12"; okdVersion = "4.15.0-0.okd-2024-02-23-163410"; - microshiftVersion = "4.15.3"; + microshiftVersion = "4.15.12"; podmanVersion = "4.4.4"; writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; - gitCommit = "b470b5f68269c93abee8d7139cbd3e3fe3419f93"; - gitHash = "sha256-80B6eGPnAAeUdKzk9/8VDHjv9tUh85rZSki9PSzqVvg="; + gitCommit = "27c493c19b7f396931c3b94cc3367f572e6af04a"; + gitHash = "sha256-uxp3DVYbbjKf1Cjj7GCf9QBxFq3K136k51eymD0U018="; in buildGoModule rec { - version = "2.34.1"; + version = "2.36.0"; pname = "crc"; src = fetchFromGitHub { diff --git a/pkgs/by-name/db/dbd/package.nix b/pkgs/by-name/db/dbd/package.nix new file mode 100644 index 0000000000000..20658b4d716db --- /dev/null +++ b/pkgs/by-name/db/dbd/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation { + pname = "dbd"; + version = "1.50-unstable-2016-01-04"; + + src = fetchFromGitHub { + owner = "gitdurandal"; + repo = "dbd"; + rev = "8cf5350781b6753fcdd863148a5dcc6976e693ca"; + hash = "sha256-b2yBZ2/Ab+SviKNlyZgdfiZ7GGZ1sonZnblD0i+vuFw="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CC=${stdenv.cc.targetPrefix}cc" + ] ++ lib.optionals stdenv.isDarwin [ "darwin" ] ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.isDarwin) [ "unix" ]; + + meta = with lib; { + description = "Netcat-clone, designed to be portable and offer strong encryption"; + mainProgram = "dbd"; + homepage = "https://github.com/gitdurandal/dbd"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/by-name/gi/gitversion/package.nix b/pkgs/by-name/gi/gitversion/package.nix index 871ccf82b4d4b..16c3d586dc8af 100644 --- a/pkgs/by-name/gi/gitversion/package.nix +++ b/pkgs/by-name/gi/gitversion/package.nix @@ -14,7 +14,7 @@ buildDotnetGlobalTool { homepage = "https://gitversion.net/"; downloadPage = "https://github.com/GitTools/GitVersion"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.windows ++ platforms.darwin; maintainers = with maintainers; [ acesyde ]; }; } diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/by-name/jo/journalwatch/package.nix index 0959e6166a0d0..afd2a3ce3681c 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/by-name/jo/journalwatch/package.nix @@ -1,39 +1,40 @@ -{ lib, buildPythonPackage, fetchFromGitHub, systemd, pytest }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "journalwatch"; version = "1.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "The-Compiler"; - repo = pname; - rev = "v${version}"; + repo = "journalwatch"; + rev = "refs/tags/v${version}"; hash = "sha512-60+ewzOIox2wsQFXMAgD7XN+zvPA1ScPz6V4MB5taVDhqCxUTMVOxodf+4AMhxtNQloXZ3ye7/0bjh1NPDjxQg=="; }; # can be removed post 1.1.0 postPatch = '' substituteInPlace test_journalwatch.py \ - --replace "U Thu Jan 1 00:00:00 1970 prio foo [1337]" "U Thu Jan 1 00:00:00 1970 pprio foo [1337]" + --replace-fail "U Thu Jan 1 00:00:00 1970 prio foo [1337]" "U Thu Jan 1 00:00:00 1970 pprio foo [1337]" ''; + build-system = with python3Packages; [ setuptools ]; - doCheck = true; - nativeCheckInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + dependencies = with python3Packages; [ systemd ]; - propagatedBuildInputs = [ - systemd - ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + pythonImportsCheck = [ "journalwatch" ]; meta = with lib; { description = "A tool to find error messages in the systemd journal"; - mainProgram = "journalwatch"; homepage = "https://github.com/The-Compiler/journalwatch"; license = licenses.gpl3Plus; maintainers = with maintainers; [ florianjacob ]; + mainProgram = "journalwatch"; }; } diff --git a/pkgs/by-name/ki/killerbee/package.nix b/pkgs/by-name/ki/killerbee/package.nix index d483da652ff9d..040aa252e8476 100644 --- a/pkgs/by-name/ki/killerbee/package.nix +++ b/pkgs/by-name/ki/killerbee/package.nix @@ -1,7 +1,8 @@ -{ lib -, fetchFromGitHub -, libgcrypt -, python3 +{ + lib, + fetchFromGitHub, + libgcrypt, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -16,29 +17,25 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-WM0Z6sd8S71F8FfhhoUq3MSD/2uvRTY/FsBP7VGGtb0="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; - buildInputs = with python3.pkgs; [ - libgcrypt - ]; + buildInputs = with python3.pkgs; [ libgcrypt ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pyserial pyusb rangeparser scapy ]; - pythonImportsCheck = [ - "killerbee" - ]; + pythonImportsCheck = [ "killerbee" ]; meta = with lib; { description = "IEEE 802.15.4/ZigBee Security Research Toolkit"; homepage = "https://github.com/riverloopsec/killerbee"; + changelog = "https://github.com/riverloopsec/killerbee/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/nr/nray/package.nix b/pkgs/by-name/nr/nray/package.nix index 1641e1c4df874..bfbe6d969ba39 100644 --- a/pkgs/by-name/nr/nray/package.nix +++ b/pkgs/by-name/nr/nray/package.nix @@ -33,5 +33,6 @@ buildGoModule rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "nray"; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix new file mode 100644 index 0000000000000..40f2a982bf4b9 --- /dev/null +++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix @@ -0,0 +1,35 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +let + version = "1.2.0"; + src = fetchFromGitHub { + owner = "tynany"; + repo = "frr_exporter"; + rev = "v${version}"; + hash = "sha256-sjC6ee7VMbr5zlahAA/i4wrZIu8CBUF+LYaq6uEvukk="; + }; +in +buildGoModule { + pname = "prometheus-frr-exporter"; + vendorHash = "sha256-xckGN/FKN2bwFPll6IRDBOGGUm2JTzoZDwKC6ZkoD/Y="; + inherit src version; + + ldflags = [ + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${src.rev}" + "-X github.com/prometheus/common/version.Branch=unknown" + ]; + + meta = with lib; { + description = "Prometheus exporter for FRR version 3.0+"; + longDescription = '' + Prometheus exporter for FRR version 3.0+ that collects metrics from the + FRR Unix sockets and exposes them via HTTP, ready for collecting by + Prometheus. + ''; + homepage = "https://github.com/tynany/frr_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ javaes ]; + mainProgram = "frr_exporter"; + }; +} diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 7a93705cd9140..a76eb47c014f2 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "6.1.1"; + version = "7.0.4"; buildInputs = [ bison @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-GUV6s+P56OAJq9AMe+LZOMPICQO/RuIi+hJAecmO5Wc="; + hash = "sha256-uaox4Q9pTF1r2BZjvnU2LE6XkZw3x9mGSKLdRVUobGU="; }; preConfigure = '' diff --git a/pkgs/tools/security/sirikali/default.nix b/pkgs/by-name/si/sirikali/package.nix index 6ae689d95fd4c..8f02674adbe16 100644 --- a/pkgs/tools/security/sirikali/default.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -1,54 +1,47 @@ { lib , stdenv -, qtbase , libpwquality , hicolor-icon-theme , fetchFromGitHub -, wrapQtAppsHook , cmake , pkg-config -, libgcrypt +, qt6 +, kdePackages , cryfs , encfs , fscrypt-experimental , gocryptfs , securefs , sshfs +, libgcrypt , libsecret -, kwallet , withKWallet ? true , withLibsecret ? true }: stdenv.mkDerivation rec { pname = "sirikali"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "sirikali"; rev = version; - hash = "sha256-1bY8cCMMK4Jie4+9c7eUEBrPEYDaOqFHZ5252TPSotA="; + hash = "sha256-org8mYKwZDdOvkQyd3eD+GaI0aHshMbe2f9i1bM+lBk="; }; buildInputs = [ - qtbase + qt6.qtbase libpwquality hicolor-icon-theme libgcrypt - cryfs - encfs - fscrypt-experimental - gocryptfs - securefs - sshfs ] - ++ lib.optionals withKWallet [ libsecret ] - ++ lib.optionals withLibsecret [ kwallet ] + ++ lib.optionals withKWallet [ kdePackages.kwallet ] + ++ lib.optionals withLibsecret [ libsecret ] ; nativeBuildInputs = [ - wrapQtAppsHook + qt6.wrapQtAppsHook cmake pkg-config ]; @@ -64,17 +57,13 @@ stdenv.mkDerivation rec { ]}'' ]; - postPatch = '' - substituteInPlace "src/engines.cpp" --replace "/sbin/" "/run/wrappers/bin/" - ''; - doCheck = true; cmakeFlags = [ "-DINTERNAL_LXQT_WALLET=false" "-DNOKDESUPPORT=${if withKWallet then "false" else "true"}" "-DNOSECRETSUPPORT=${if withLibsecret then "false" else "true"}" - "-DQT5=true" + "-DBUILD_WITH_QT6=true" ]; meta = with lib; { @@ -83,5 +72,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/mhogomchungu/sirikali/blob/${src.rev}/changelog"; license = licenses.gpl3Only; maintainers = with maintainers; [ linuxissuper ]; + mainProgram = "sirikali"; + platforms = platforms.all; }; } diff --git a/pkgs/by-name/we/websecprobe/package.nix b/pkgs/by-name/we/websecprobe/package.nix index aecc778815572..893954cd77db0 100644 --- a/pkgs/by-name/we/websecprobe/package.nix +++ b/pkgs/by-name/we/websecprobe/package.nix @@ -1,6 +1,7 @@ -{ lib -, python3 -, fetchPypi +{ + lib, + python3, + fetchPypi, }: python3.pkgs.buildPythonApplication rec { @@ -14,9 +15,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-RX4tc6JaUVaNx8nidn8eMcbsmbcSY+VZbup6c6P7oOs="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ requests @@ -27,9 +26,7 @@ python3.pkgs.buildPythonApplication rec { mv $out/bin/WebSecProbe $out/bin/$pname ''; - pythonImportsCheck = [ - "WebSecProbe" - ]; + pythonImportsCheck = [ "WebSecProbe" ]; meta = with lib; { description = "Web Security Assessment Tool"; @@ -38,5 +35,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "websecprobe"; + platforms = platforms.linux; }; } diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index d783e5c794544..6f3d17f3fce6e 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { @@ -16,9 +17,7 @@ buildGoModule rec { vendorHash = "sha256-9zDzwiVEVsfgVzSrouNtLYpjumoWGlfSDpGWbj+zCGQ="; - subPackages = [ - "cmd/xeol/" - ]; + subPackages = [ "cmd/xeol/" ]; ldflags = [ "-w" @@ -36,5 +35,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "xeol"; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index b4925f3c5d954..8418652dbc38a 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -30,10 +30,7 @@ let lxqt-sudo = callPackage ./lxqt-sudo {}; lxqt-themes = callPackage ./lxqt-themes {}; pavucontrol-qt = callPackage ./pavucontrol-qt {}; - qtermwidget = callPackage ./qtermwidget { - lxqt-build-tools = lxqt-build-tools_0_13; - inherit (pkgs.libsForQt5) qtbase qttools; - }; + qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 lxqt-panel = callPackage ./lxqt-panel {}; @@ -41,10 +38,7 @@ let pcmanfm-qt = callPackage ./pcmanfm-qt {}; ### OPTIONAL - qterminal = callPackage ./qterminal { - lxqt-build-tools = lxqt-build-tools_0_13; - inherit (pkgs.libsForQt5) qtbase qttools qtx11extras; - }; + qterminal = callPackage ./qterminal {}; compton-conf = callPackage ./compton-conf { lxqt-build-tools = lxqt-build-tools_0_13; inherit (pkgs.libsForQt5) qtbase qttools qtx11extras; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 720f3ad7e8e44..bb019eeae7e41 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -6,7 +6,6 @@ , qtbase , qtermwidget , qttools -, qtx11extras , wrapQtAppsHook , gitUpdater , nixosTests @@ -14,13 +13,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-nojNx351lYw0jVKEvzAIDP1WrZWcCAlfYMxNG95GcEo="; + hash = "sha256-SesKJCiMoiqkvMM29+0IMERozQ9zuD+NJTtaC6j7ubM="; }; nativeBuildInputs = [ @@ -33,7 +32,6 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtermwidget - qtx11extras ]; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index d8e168af562fb..35c5b2c3f6415 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "qtermwidget"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; + hash = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; homepage = "https://github.com/lxqt/qtermwidget"; - description = "A terminal emulator widget for Qt 5"; + description = "A terminal emulator widget for Qt, used by QTerminal"; license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = teams.lxqt.members; diff --git a/pkgs/development/libraries/catboost/default.nix b/pkgs/development/libraries/catboost/default.nix index 6da5885223a68..b4fa78a125265 100644 --- a/pkgs/development/libraries/catboost/default.nix +++ b/pkgs/development/libraries/catboost/default.nix @@ -22,13 +22,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "catboost"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-wn9STnpqX3zmdxPmMYAz9JPdg13Goux76CMaCiqohk8="; + hash = "sha256-2dfCCCa0LheytkLRbYuBd25M320f1kbhBWKIVjslor0="; }; patches = [ diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 5889c8ef12d55..7a2e358d572be 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.18.2"; + version = "1.20.1"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-OYtNHAIGgwJuapoJNEMVkurUK9bQ7KO+V223bGC0TFI="; + hash = "sha256-AoTfX6Ov9Trj9a9i+K+NYCwxhQ9C5YYqx/15RBtgJYw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index ba24fbe9294b3..39ac1245118a8 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -39,6 +39,8 @@ qtModule { patches = [ ../patches/fix-qtgui-include-incorrect-case.patch + # Remove new constants since macOS 12+, since we build Qt with the macOS 11 SDK + ../patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ ../patches/qtmultimedia-windows-no-uppercase-libs.patch ../patches/qtmultimedia-windows-resolve-function-name.patch diff --git a/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch b/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch new file mode 100644 index 0000000000000..3196a6e4158c0 --- /dev/null +++ b/pkgs/development/libraries/qt-6/patches/qtmultimedia-darwin-revert-replace-deprecated-constant.patch @@ -0,0 +1,50 @@ +diff --git a/src/multimedia/darwin/qdarwinmediadevices.mm b/src/multimedia/darwin/qdarwinmediadevices.mm +index b0a108935..881066928 100644 +--- a/src/multimedia/darwin/qdarwinmediadevices.mm ++++ b/src/multimedia/darwin/qdarwinmediadevices.mm +@@ -42,7 +42,7 @@ static AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode) + const AudioObjectPropertyAddress propertyAddress = { + selector, + kAudioObjectPropertyScopeGlobal, +- kAudioObjectPropertyElementMain, ++ kAudioObjectPropertyElementMaster, + }; + + if (auto audioDevice = getAudioObject<AudioDeviceID>(kAudioObjectSystemObject, propertyAddress, +@@ -77,7 +77,7 @@ static QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode) + + const AudioObjectPropertyAddress audioDevicesPropertyAddress = { + kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, +- kAudioObjectPropertyElementMain ++ kAudioObjectPropertyElementMaster + }; + + if (auto audioDevices = getAudioData<AudioDeviceID>( +@@ -130,11 +130,11 @@ static OSStatus audioDeviceChangeListener(AudioObjectID id, UInt32, + + static constexpr AudioObjectPropertyAddress listenerAddresses[] = { + { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, +- kAudioObjectPropertyElementMain }, ++ kAudioObjectPropertyElementMaster }, + { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, +- kAudioObjectPropertyElementMain }, ++ kAudioObjectPropertyElementMaster }, + { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, +- kAudioObjectPropertyElementMain } ++ kAudioObjectPropertyElementMaster } + }; + + static void setAudioListeners(QDarwinMediaDevices &instance) +diff --git a/src/multimedia/darwin/qmacosaudiodatautils_p.h b/src/multimedia/darwin/qmacosaudiodatautils_p.h +index 8cc2f8440..5cd6fced2 100644 +--- a/src/multimedia/darwin/qmacosaudiodatautils_p.h ++++ b/src/multimedia/darwin/qmacosaudiodatautils_p.h +@@ -44,7 +44,7 @@ void printUnableToReadWarning(const char *logName, AudioObjectID objectID, const + + inline static AudioObjectPropertyAddress + makePropertyAddress(AudioObjectPropertySelector selector, QAudioDevice::Mode mode, +- AudioObjectPropertyElement element = kAudioObjectPropertyElementMain) ++ AudioObjectPropertyElement element = kAudioObjectPropertyElementMaster) + { + return { selector, + mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 140c2a4d4ae2b..cbe910b4469ed 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.44.1"; + version = "2.44.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-QlsUWbDwTQYAx40au15+36PAYKQg+LIx6aai1dKcVWE="; + hash = "sha256-Uj9CyP8kgyrdF2Mfbqr+j5MDr+MW7xp+GES5Uqf3Uhs="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index b98c2508458ed..b68fc39bc137c 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -1,27 +1,34 @@ -{ lib -, aiohttp -, aioresponses -, buildPythonPackage -, fetchFromGitHub -, pandas -, pytestCheckHook -, requests -, requests-mock +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + pandas, + pytestCheckHook, + requests, + requests-mock, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "alpha-vantage"; version = "2.3.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RomelTorres"; repo = "alpha_vantage"; - rev = version; - sha256 = "0cyw6zw7c7r076rmhnmg905ihwb9r7g511n6gdlph06v74pdls8d"; + rev = "refs/tags/${version}"; + hash = "sha256-DWnaLjnbAHhpe8aGUN7JaXEYC0ivWlizOSAfdvg33DM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp requests ]; @@ -33,18 +40,16 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # Tests require network access - "test_alpha_vantage/test_integration_alphavantage.py" - "test_alpha_vantage/test_integration_alphavantage_async.py" - ]; + # https://github.com/RomelTorres/alpha_vantage/issues/344 + doCheck = false; pythonImportsCheck = [ "alpha_vantage" ]; meta = with lib; { description = "Python module for the Alpha Vantage API"; homepage = "https://github.com/RomelTorres/alpha_vantage"; - license = with licenses; [ mit ]; + changelog = "https://github.com/RomelTorres/alpha_vantage/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index 1de7da6f829fc..de008a1d2f1be 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -1,23 +1,27 @@ -{ lib -, argcomplete -, buildPythonPackage -, fetchFromGitHub -, mock -, httpx -, pytestCheckHook -, pythonOlder -, requests -, responses -, urllib3 -, typing-extensions +{ + lib, + argcomplete, + buildPythonPackage, + fetchFromGitHub, + httpx, + mock, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + requests, + responses, + setuptools, + typing-extensions, + urllib3, }: buildPythonPackage rec { pname = "amcrest"; version = "1.9.8"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + # Still uses distutils, https://github.com/tchellomello/python-amcrest/issues/234 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "tchellomello"; @@ -26,7 +30,11 @@ buildPythonPackage rec { hash = "sha256-v0jWEZo06vltEq//suGrvJ/AeeDxUG5CCFhbf03q34w="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ argcomplete httpx requests @@ -48,7 +56,7 @@ buildPythonPackage rec { description = "Python module for Amcrest and Dahua Cameras"; homepage = "https://github.com/tchellomello/python-amcrest"; changelog = "https://github.com/tchellomello/python-amcrest/releases/tag/${version}"; - license = with licenses; [ gpl2Only ]; + license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/automate-home/default.nix b/pkgs/development/python-modules/automate-home/default.nix index c13395aa42e3e..bfaa26afc761d 100644 --- a/pkgs/development/python-modules/automate-home/default.nix +++ b/pkgs/development/python-modules/automate-home/default.nix @@ -1,29 +1,42 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -, pythonOlder -, apscheduler -, hiredis -, aioredis -, ephem -, pytz -, pyyaml +{ + lib, + aioredis, + apscheduler, + buildPythonPackage, + ephem, + fetchPypi, + hiredis, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + pytz, + pyyaml, + setuptools, }: buildPythonPackage rec { pname = "automate-home"; version = "0.9.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + # Typing issue + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; hash = "sha256-41qd+KPSrOrczkovwXht3irbcYlYehBZ1HZ44yZe4cM="; }; - propagatedBuildInputs = [ + postPatch = '' + # Rename pyephem, https://github.com/majamassarini/automate-home/pull/3 + substituteInPlace setup.py \ + --replace-fail "pyephem" "ephem" \ + --replace-fail "aioredis==1.3.1" "aioredis" + ''; + + build-system = [ setuptools ]; + + dependencies = [ apscheduler hiredis aioredis @@ -32,24 +45,14 @@ buildPythonPackage rec { pyyaml ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - # Rename pyephem, https://github.com/majamassarini/automate-home/pull/3 - substituteInPlace setup.py \ - --replace "pyephem" "ephem" \ - --replace "aioredis==1.3.1" "aioredis" - ''; - - pythonImportsCheck = [ - "home" - ]; + pythonImportsCheck = [ "home" ]; meta = with lib; { description = "Python module to automate (home) devices"; homepage = "https://github.com/majamassarini/automate-home"; + changelog = "https://github.com/majamassarini/automate-home/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix index e7a0b017f405f..b86989bbbd71d 100644 --- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -1,17 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, packaging -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, scapy +{ + lib, + buildPythonPackage, + fetchFromGitHub, + packaging, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + scapy, + setuptools, }: buildPythonPackage rec { pname = "boiboite-opener-framework"; version = "1.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,18 +29,16 @@ buildPythonPackage rec { --replace "scapy==2.5.0rc1" "scapy" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ packaging scapy ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "bof" - ]; + pythonImportsCheck = [ "bof" ]; disabledTests = [ # Tests are using netcat and cat to do UDP connections @@ -75,5 +75,6 @@ buildPythonPackage rec { changelog = "https://github.com/Orange-Cyberdefense/bof/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index b2d93687988da..c7f57622801f7 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-image"; - version = "2024.5.2"; + version = "2024.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-image"; rev = "refs/tags/v${version}"; - hash = "sha256-smoiGSY7ou4zPRf0+6bRoViZDwNFBIwq+Mk8Tc9vniM="; + hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac="; }; build-system = [ diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index 783ace83f6560..3741b71a34ea6 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-nebula"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_nebula"; inherit version; - hash = "sha256-Xb/0ogj2NlGV4MGC9Be54d/JfalT40jtAe6LOPO1u/8="; + hash = "sha256-Mhej0nslypY1Z99VUrTgl4S9PlrBWbaKvANSwEKTMZk="; }; build-system = [ diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix deleted file mode 100644 index afb797d3e2f25..0000000000000 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, nose -, numpy -}: - -buildPythonPackage rec { - pname = "nose-randomly"; - version = "1.2.6"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c"; - }; - - nativeCheckInputs = [ numpy nose ]; - - checkPhase = if stdenv.isDarwin then '' - # Work around "OSError: AF_UNIX path too long" - TMPDIR="/tmp" nosetests - '' else '' - nosetests - ''; - - meta = with lib; { - description = "Nose plugin to randomly order tests and control random.seed"; - homepage = "https://github.com/adamchainz/nose-randomly"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index c7ee5359bee41..613bf25632144 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -1,43 +1,35 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, cython -, numpy -, scipy -, sympy -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchPypi, + numpy, + scipy, + sympy, + setuptools, }: buildPythonPackage rec { pname = "pydy"; version = "0.7.1"; - format = "setuptools"; + + pyproject = true; + build-system = [ setuptools ]; src = fetchPypi { inherit pname version; hash = "sha256-aaRinJMGR8v/OVkeSp1hA4+QLOrmDWq50wvA6b/suvk="; }; - propagatedBuildInputs = [ + dependencies = [ numpy scipy sympy ]; - nativeCheckInputs = [ - nose - cython - pytestCheckHook - ]; + # nose test does not support 3.10 or later + doCheck = false; - disabledTests = [ - # Tests not fixed yet. Check https://github.com/pydy/pydy/issues/465 - "test_generate_cse" - "test_generate_code_blocks" - "test_doprint" - "test_OctaveMatrixGenerator" - ]; + pythonImportsCheck = [ "pydy" ]; meta = with lib; { description = "Python tool kit for multi-body dynamics"; diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index 69837c5d68533..c05b3b0b96ef7 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -1,29 +1,36 @@ -{ lib -, buildPythonPackage -, colorlog -, fetchFromGitHub -, pytest-sugar -, pytest-timeout -, pytestCheckHook -, pythonOlder -, requests -, requests-mock +{ + lib, + buildPythonPackage, + colorlog, + fetchFromGitHub, + pytest-sugar, + pytest-timeout, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + requests, + requests-mock, + setuptools, }: buildPythonPackage rec { pname = "skybellpy"; version = "0.6.3"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + pyproject = true; + + # Still uses distrutils, https://github.com/MisterWil/skybellpy/issues/22 + disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "MisterWil"; - repo = pname; - rev = "v${version}"; - sha256 = "1ghvm0pcdyhq6xfjc2dkldd701x77w07077sx09xsk6q2milmvzz"; + repo = "skybellpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-/+9KYxXYTN0T6PoccAA/pwdwWqOzCSZdNxj6xi6oG74="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ colorlog requests ]; @@ -39,9 +46,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Skybell alarm API"; - mainProgram = "skybellpy"; homepage = "https://github.com/MisterWil/skybellpy"; - license = with licenses; [ mit ]; + changelog = "https://github.com/MisterWil/skybellpy/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "skybellpy"; }; } diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 4f03293b2dba0..1eee4a02da4f9 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1151"; + version = "3.0.1152"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-JxxTfpb+03rBv/RIZgRpASq+WEjsAzDhtNL78FqU/Oc="; + hash = "sha256-pmmZnTvZwpVD/ECjKzA6LQ2c7McYznJMlKabcYwh3LY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index ed530f95d1915..2ab0dbd7c89ae 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -1,10 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitLab -, fetchpatch -, pytestCheckHook -, pythonOlder -, setuptools-scm +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitLab, + fetchpatch, + pytestCheckHook, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { @@ -21,33 +23,25 @@ buildPythonPackage rec { hash = "sha256-TxWKV2nrnCxZmj6+wBDMSdJRvKV+MsPFbOyIlUJYJ3Q="; }; - nativeBuildInputs = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export PATH="$PATH:$out/bin"; ''; - disabledTests = [ - # Test requires network access - "test_discovery" - ]; + pythonImportsCheck = [ "tololib" ]; - pythonImportsCheck = [ - "tololib" - ]; + # Network discovery doesn't work in the sandbox for darwin + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; - mainProgram = "tolo-cli"; homepage = "https://gitlab.com/MatthiasLohr/tololib"; changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "tolo-cli"; }; } diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 760b9f96c89ba..1bfcce4e430e4 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -1,34 +1,38 @@ -{ lib -, aiohttp -, aioresponses -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pyroute2 -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pyroute2, + pytest-asyncio, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "unifi-discovery"; version = "1.1.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "unifi-discovery"; rev = "refs/tags/v${version}"; hash = "sha256-gE/2awyhDACrc0nuTvTPOcK2lFbPIZAXDPRnVJtWFco="; }; - nativeBuildInputs = [ - poetry-core - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=unifi_discovery --cov-report=term-missing:skip-covered" "" + ''; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pyroute2 ]; @@ -39,23 +43,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=auto" - ]; + pytestFlagsArray = [ "--asyncio-mode=auto" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=unifi_discovery --cov-report=term-missing:skip-covered" "" - ''; - - pythonImportsCheck = [ - "unifi_discovery" - ]; + pythonImportsCheck = [ "unifi_discovery" ]; meta = with lib; { description = "Module to discover Unifi devices"; homepage = "https://github.com/bdraco/unifi-discovery"; + changelog = "https://github.com/bdraco/unifi-discovery/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 8e5b16ef00159..d9916af5069d8 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.6.2"; + version = "4.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-BegAiAOhVafH7NWVgayRbdLKBYjWmD5zC6P7tU11XKM="; + hash = "sha256-v8I0ovH99q5uYlnbZsQYgL9mg3n9i59W2n6/d9IiKyQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/webdriver-manager/default.nix b/pkgs/development/python-modules/webdriver-manager/default.nix index 6680fa7eea6b1..411d5b9b78da3 100644 --- a/pkgs/development/python-modules/webdriver-manager/default.nix +++ b/pkgs/development/python-modules/webdriver-manager/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, packaging -, pybrowsers -, pytestCheckHook -, python-dotenv -, pythonOlder -, requests -, selenium -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + packaging, + pybrowsers, + pytestCheckHook, + python-dotenv, + pythonOlder, + requests, + selenium, + setuptools, }: buildPythonPackage rec { @@ -25,11 +26,11 @@ buildPythonPackage rec { hash = "sha256-PdUlloJ4DncnktKQHofn/OLVrgSVyWhaeEEhl3Hgjek="; }; - nativeBuildInputs = [ - setuptools - ]; + __darwinAllowLocalNetworking = true; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ packaging python-dotenv requests @@ -41,9 +42,7 @@ buildPythonPackage rec { selenium ]; - pythonImportsCheck = [ - "webdriver_manager" - ]; + pythonImportsCheck = [ "webdriver_manager" ]; disabledTestPaths = [ # Tests require network access and browsers available @@ -69,5 +68,6 @@ buildPythonPackage rec { changelog = "https://github.com/SergeyPirogov/webdriver_manager/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 003614876b98a..30e5accbb3cf2 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -1,17 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, paho-mqtt -, python-dateutil -, weconnect -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + paho-mqtt, + pytestCheckHook, + python-dateutil, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + weconnect, }: buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.49.0"; + version = "0.48.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-V96fdy6h012SbP3tyOMniAwLf/1+iKzTc9WnevAVwTI="; + hash = "sha256-Yv6CAGTDi4P9pImLxVk2QkZ014iqQ8UMBUeiyZWnYiQ="; }; postPatch = '' @@ -33,30 +35,28 @@ buildPythonPackage rec { --replace-fail "pytest-cov" "" ''; - nativeBuildInputs = [ - setuptools - ]; + pythonRelaxDeps = [ "python-dateutil" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ paho-mqtt python-dateutil weconnect ] ++ weconnect.optional-dependencies.Images; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "weconnect_mqtt" - ]; + pythonImportsCheck = [ "weconnect_mqtt" ]; meta = with lib; { description = "Python client that publishes data from Volkswagen WeConnect"; - mainProgram = "weconnect-mqtt"; homepage = "https://github.com/tillsteinbach/WeConnect-mqtt"; changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "weconnect-mqtt"; }; } diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 01b84b2f3dc21..38e62c57eef81 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -1,17 +1,13 @@ -{ lib -, buildPythonPackage -, fetchPypi - -# build-system -, setuptools - -# dependencies -, importlib-metadata -, platformdirs -, tomli - -# tests -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + importlib-metadata, + platformdirs, + tomli, + pythonOlder, + pytestCheckHook, }: buildPythonPackage rec { @@ -19,27 +15,22 @@ buildPythonPackage rec { version = "0.40.2"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-TauKXtcTTibVfBZHx0g6+z8TaHi1eQYreGyboWuUY3s="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata platformdirs tomli ]; - # nose is unavailable on pypy - #doCheck = !isPyPy; - - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { changelog = "https://github.com/google/yapf/blob/v${version}/CHANGELOG.md"; @@ -67,6 +58,9 @@ buildPythonPackage rec { ''; license = lib.licenses.asl20; mainProgram = "yapf"; - maintainers = with lib.maintainers; [ AndersonTorres siddharthist ]; + maintainers = with lib.maintainers; [ + AndersonTorres + siddharthist + ]; }; } diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index b7437d70bf80f..a47918f4354b1 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./2.7.7-fixes.patch ]; buildInputs = [ jdk ]; + CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION"; + meta = with lib; { description = "Powerful parser generator"; longDescription = '' diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index f93bc857116fc..c642c62be1ce7 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "7.4.0p0"; + version = "7.5.0p0"; nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconf libtool bison ]; buildInputs = [ libevent zlib libressl db pam libxcrypt ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - hash = "sha256-wYHMw0NKEeWDYZ4AAoUg1Ff+Bi403AO+6jWAeCIM43Q="; + hash = "sha256-hPXBOTwMG+zHLO6pceCr1wdbLKfk4fiQm4Pt/Y3gw5w="; }; patches = [ diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index e2a07cf2d2625..56803c3dc312b 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -42,8 +42,8 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/xray \ - --suffix V2RAY_LOCATION_ASSET : $assetsDrv/share/v2ray \ - --suffix XRAY_LOCATION_ASSET : $assetsDrv/share/v2ray + --set-default V2RAY_LOCATION_ASSET $assetsDrv/share/v2ray \ + --set-default XRAY_LOCATION_ASSET $assetsDrv/share/v2ray ''; passthru = { diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 2835576a8d6a0..d534a4977a14b 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.4.3"; + version = "11.5.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-vLkGysRhcSzSu++p71hZLbA0RNCDcukC3HqPrUugd/s="; + hash = "sha256-MQrWZ3nFE/gEU7/AoSIr91LMteo/+68MDwiJBxiosvM="; }; proxyVendor = true; - vendorHash = "sha256-wL0cXNfJ8qyonUQRE7w2cRoqGLa6NGhv3EPFie/9/Z4="; + vendorHash = "sha256-1ytyebfUyeAQcx1HPxn6X0p4t5VlB4uflZJF1f+HhPU="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/tools/security/ospd-openvas/default.nix index 9b20f221447ec..f047958c24929 100644 --- a/pkgs/tools/security/ospd-openvas/default.nix +++ b/pkgs/tools/security/ospd-openvas/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -20,13 +21,9 @@ python3.pkgs.buildPythonApplication rec { "python-gnupg" ]; - build-system = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ defusedxml @@ -40,13 +37,9 @@ python3.pkgs.buildPythonApplication rec { sentry-sdk ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - pythonImportsCheck = [ - "ospd_openvas" - ]; + pythonImportsCheck = [ "ospd_openvas" ]; meta = with lib; { description = "OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"; @@ -54,5 +47,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/greenbone/ospd-openvas/releases/tag/v${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index cbba33c1373a6..0be41525ea289 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchurl , fetchpatch , python3Packages , gnupg @@ -8,30 +8,23 @@ python3Packages.buildPythonApplication rec { pname = "pass-import"; - version = "3.2"; + version = "3.5"; - src = fetchFromGitHub { - owner = "roddhjav"; - repo = "pass-import"; - rev = "v${version}"; - sha256 = "0hrpg7yiv50xmbajfy0zdilsyhbj5iv0qnlrgkfv99q1dvd5qy56"; + src = fetchurl { + url = "https://github.com/roddhjav/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-+wrff3OxPkAGu1Mn4Kl0KN4FmvIAb+MnaERcD5ScDNc="; }; - patches = [ - (fetchpatch { - name = "support-for-pykeepass-4.0.3.patch"; - url = "https://github.com/roddhjav/pass-import/commit/f1b167578916d971ee4f99be99ba0e86ef49015e.patch"; - hash = "sha256-u6bJbV3/QTfRaPauKSyCWNodpy6CKsreMXUZWKRbee0="; - }) - ]; - propagatedBuildInputs = with python3Packages; [ cryptography defusedxml + jsonpath-ng pyaml pykeepass python-magic # similar API to "file-magic", but already in nixpkgs. + requests secretstorage + zxcvbn ]; nativeCheckInputs = [ @@ -46,12 +39,12 @@ python3Packages.buildPythonApplication rec { postInstall = '' mkdir -p $out/lib/password-store/extensions - cp ${src}/import.bash $out/lib/password-store/extensions/import.bash + cp import.bash $out/lib/password-store/extensions/import.bash wrapProgram $out/lib/password-store/extensions/import.bash \ --prefix PATH : "${python3Packages.python.withPackages (_: propagatedBuildInputs)}/bin" \ --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}" \ --run "export PREFIX" - cp -r ${src}/share $out/ + cp -r share $out/ ''; postCheck = '' diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 254aa3e82c42f..2718be70c71f1 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -2,26 +2,15 @@ stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "sha256-2v6tJpP6646Ll4MrI0B/btWzIZvBeE9ILdhVd04tUMI="; + sha256 = "sha256-Kr7WG8bSuexJiXPARAuLgEt6ctcUQGm1qSCbKtaTooI="; }; - patches = [ - # issues with popt 1.19 (from upstream but not yet released): - # https://github.com/rpm-software-management/popt/issues/80 - ./popt-1-19.patch - - # fix UUID generation (from upstream but not yet released): - # https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/ - # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1853985.html - ./uuid.patch - ]; - postPatch = '' patchShebangs gdisk_test.sh '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/system/gptfdisk/popt-1-19.patch b/pkgs/tools/system/gptfdisk/popt-1-19.patch deleted file mode 100644 index 234c664c962cd..0000000000000 --- a/pkgs/tools/system/gptfdisk/popt-1-19.patch +++ /dev/null @@ -1,84 +0,0 @@ -commit 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d -Author: Rod Smith <rodsmith@rodsbooks.com> -Date: Fri Apr 15 18:10:14 2022 -0400 - - Fix failure & crash of sgdisk when compiled with latest popt (commit 740; presumably eventually release 1.19) - -diff --git a/NEWS b/NEWS -index c7add56..9e153fd 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,11 @@ -+1.0.10 (?/??/2022): -+------------------- -+ -+- Fixed problem that caused sgdisk to crash with errors about being unable -+ to read the disk's partition table when compiled with the latest popt -+ (commit 740, which is pre-release as I type; presumably version 1.19 and -+ later once released). -+ - 1.0.9 (4/14/2022): - ------------------ - -diff --git a/gptcl.cc b/gptcl.cc -index 34c9421..0d578eb 100644 ---- a/gptcl.cc -+++ b/gptcl.cc -@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - } // while - - // Assume first non-option argument is the device filename.... -- device = (char*) poptGetArg(poptCon); -+ device = strdup((char*) poptGetArg(poptCon)); - poptResetContext(poptCon); - - if (device != NULL) { -diff --git a/support.h b/support.h -index 8ba9ad1..f91f1bc 100644 ---- a/support.h -+++ b/support.h -@@ -8,7 +8,7 @@ - #include <stdlib.h> - #include <string> - --#define GPTFDISK_VERSION "1.0.9" -+#define GPTFDISK_VERSION "1.0.9.1" - - #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) - // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 - -commit f5de3401b974ce103ffd93af8f9d43505a04aaf9 -Author: Damian Kurek <starfire24680@gmail.com> -Date: Thu Jul 7 03:39:16 2022 +0000 - - Fix NULL dereference when duplicating string argument - - poptGetArg can return NULL if there are no additional arguments, which - makes strdup dereference NULL on strlen - -diff --git a/gptcl.cc b/gptcl.cc -index 0d578eb..ab95239 100644 ---- a/gptcl.cc -+++ b/gptcl.cc -@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - } // while - - // Assume first non-option argument is the device filename.... -- device = strdup((char*) poptGetArg(poptCon)); -- poptResetContext(poptCon); -+ device = (char*) poptGetArg(poptCon); - - if (device != NULL) { -+ device = strdup(device); -+ poptResetContext(poptCon); - JustLooking(); // reset as necessary - BeQuiet(); // Tell called functions to be less verbose & interactive - if (LoadPartitions((string) device)) { -@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { - cerr << "Error encountered; not saving changes.\n"; - retval = 4; - } // if -+ free(device); - } // if (device != NULL) - poptFreeContext(poptCon); - return retval; diff --git a/pkgs/tools/system/gptfdisk/uuid.patch b/pkgs/tools/system/gptfdisk/uuid.patch deleted file mode 100644 index 110c3d106b434..0000000000000 --- a/pkgs/tools/system/gptfdisk/uuid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/guid.cc -+++ b/guid.cc -@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { - void GUIDData::Randomize(void) { - int i, uuidGenerated = 0; - --#ifdef _UUID_UUID_H -+#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) - uuid_generate(uuidData); - ReverseBytes(&uuidData[0], 4); - ReverseBytes(&uuidData[4], 2); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d22fdb10c86c..ee2907d324cc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41076,8 +41076,6 @@ with pkgs; dict-cc-py = callPackage ../applications/misc/dict-cc-py { }; - sirikali = libsForQt5.callPackage ../tools/security/sirikali { }; - wpm = callPackage ../applications/misc/wpm { }; weggli = callPackage ../tools/security/weggli { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index caf1e8fbc970b..49eec3d93d70f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -307,6 +307,7 @@ mapAliases ({ nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21 + nose-randomly = throw "nose-randomly has been removed, it was archived and unmaintained since 2019"; # added 2024-05-22 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 nose_warnings_filters = nose-warnings-filters; # added 2024-01-07 notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73bf650c68c3a..150965f1d2052 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6100,10 +6100,6 @@ self: super: with self; { joserfc = callPackage ../development/python-modules/joserfc { }; - journalwatch = callPackage ../tools/system/journalwatch { - inherit (self) systemd pytest; - }; - jplephem = callPackage ../development/python-modules/jplephem { }; jproperties = callPackage ../development/python-modules/jproperties { }; @@ -8869,8 +8865,6 @@ self: super: with self; { nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; - nose-randomly = callPackage ../development/python-modules/nose-randomly { }; - nose-warnings-filters = callPackage ../development/python-modules/nose-warnings-filters { }; nose-xunitmp = callPackage ../development/python-modules/nose-xunitmp { }; |