From 63dc4b38f3cf1ce17f778270adfa1422b1863a5c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 09:04:57 +0800 Subject: [PATCH 01/22] devserver: drop --- .../tools/rust/devserver/default.nix | 31 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 --- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/development/tools/rust/devserver/default.nix diff --git a/pkgs/development/tools/rust/devserver/default.nix b/pkgs/development/tools/rust/devserver/default.nix deleted file mode 100644 index 305a01b69991..000000000000 --- a/pkgs/development/tools/rust/devserver/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, stdenv -, fetchCrate -, rustPlatform -, openssl -, pkg-config -, CoreServices -}: - -rustPlatform.buildRustPackage rec { - pname = "devserver"; - version = "0.4.0"; - - src = fetchCrate { - inherit pname version; - sha256 = "sha256-UcrLzsALwl0zqNRMS1kTTXsR6wN8XDd5Iq+yrudh6M4="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin CoreServices; - - cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js="; - - meta = with lib; { - description = "An extremely tiny tool to serve a static folder locally"; - homepage = "https://github.com/kettle11/devserver"; - license = licenses.zlib; - maintainers = with maintainers; [ nickhu ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 39f375fa9947..3a9aeed6b69f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -361,6 +361,7 @@ mapAliases ({ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8733035de7c8..6946d45e3cbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15701,11 +15701,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - devserver = callPackage ../development/tools/rust/devserver { - inherit (darwin.apple_sdk.frameworks) CoreServices; - openssl = openssl_1_1; - }; - devspace = callPackage ../development/tools/misc/devspace { }; maturin = callPackage ../development/tools/rust/maturin { From 6a1f32b90dfac17401968c172821234b756b8d5d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 09:13:32 +0800 Subject: [PATCH 02/22] coinlive: 0.2.1 -> 0.2.2 --- pkgs/tools/misc/coinlive/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix index a386853247dc..2d81a940dd57 100644 --- a/pkgs/tools/misc/coinlive/default.nix +++ b/pkgs/tools/misc/coinlive/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "coinlive"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mayeranalytics"; repo = pname; rev = "v${version}"; - hash = "sha256-i21C1ZSAPoUOBlnDQl40/17yRqmNx3wkjswHJeV9vko="; + hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs="; }; - cargoSha256 = "sha256-0pUXCY5rZWh26KGD2OU2+M9L0RtCIan6hmuNeIeBEHI="; + cargoSha256 = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4="; nativeBuildInputs = [ pkg-config @@ -30,6 +30,11 @@ rustPlatform.buildRustPackage rec { Security ]; + checkFlags = [ + # requires network access + "--skip=utils::test_get_infos" + ]; + meta = with lib; { description = "Live cryptocurrency prices CLI"; homepage = "https://github.com/mayeranalytics/coinlive"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6946d45e3cbe..78805ba3ae96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19089,7 +19089,6 @@ with pkgs; coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; cointop = callPackage ../applications/misc/cointop { }; From 0c560c854402bbc0336343e2fce1bba595a82f0b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 09:33:54 +0800 Subject: [PATCH 03/22] tunnelto: 0.1.18 -> unstable-2022-09-25 --- pkgs/tools/networking/tunnelto/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 924d2c3afa0f..ff34a39fc0b9 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.18"; + version = "unstable-2022-09-25"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; - rev = version; - sha256 = "sha256-dCHl5EXjUagOKeHxqb3GlAoSDw0u3tQ4GKEtbFF8OSs="; + rev = "06428f13c638180dd349a4c42a17b569ab51a25f"; + sha256 = "sha256-84jGcR/E1QoqIlbGu67muYUtZU66ZJtj4tdZvmYbII4="; }; - cargoSha256 = "sha256-6HU1w69cJj+tE1IUUNoxh0cHEwlRKF5qWx7FiOHeUNk="; + cargoSha256 = "sha256-bVHvQRtnKwrwS0huax6OrteYfxws2Ce2fFaBQ3oeoow="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78805ba3ae96..5cbfdc5ab7a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12611,7 +12611,6 @@ with pkgs; tunnelto = callPackage ../tools/networking/tunnelto { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; tuptime = callPackage ../tools/system/tuptime { }; From 254051982bdc26c987cbdae9928968b1308b8f11 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 09:52:55 +0800 Subject: [PATCH 04/22] git-subset: drop --- .../version-management/git-subset/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ---- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/applications/version-management/git-subset/default.nix diff --git a/pkgs/applications/version-management/git-subset/default.nix b/pkgs/applications/version-management/git-subset/default.nix deleted file mode 100644 index 53db1c01eefb..000000000000 --- a/pkgs/applications/version-management/git-subset/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: - -rustPlatform.buildRustPackage rec { - pname = "git-subset"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "jasonwhite"; - repo = pname; - rev = "v${version}"; - sha256 = "02z2r0kcd0nnn1zjslp6xxam5ddbhrmzn67qzxhlamsw0p9vvkbb"; - }; - - cargoSha256 = "0lc9m9prmhr4ipjh95cfczvlmpp9scryksvqd49h4acyr904n7ry"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ]; - - meta = with lib; { - description = "Super fast Git tree filtering"; - homepage = "https://github.com/jasonwhite/git-subset"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a9aeed6b69f..7cde84f5295b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -510,6 +510,7 @@ mapAliases ({ giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 + git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { darcsToGit = darcs-to-git; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cbfdc5ab7a4..daec05886d77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1830,11 +1830,6 @@ with pkgs; git-subrepo = callPackage ../applications/version-management/git-subrepo { }; - git-subset = callPackage ../applications/version-management/git-subset { - openssl = openssl_1_1; - inherit (darwin.apple_sdk.frameworks) Security; - }; - git-subtrac = callPackage ../applications/version-management/git-subtrac { }; git-sync = callPackage ../applications/version-management/git-sync { }; From d22575be494d6aa5f69f8112af98e8d16f58c750 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 10:05:24 +0800 Subject: [PATCH 05/22] imag: drop --- pkgs/applications/misc/imag/default.nix | 61 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 -- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 pkgs/applications/misc/imag/default.nix diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix deleted file mode 100644 index d923dc9bfedb..000000000000 --- a/pkgs/applications/misc/imag/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv -, rustPlatform -, fetchFromGitHub -, llvmPackages -, openssl -, pkg-config -, installShellFiles -, Security -, gitMinimal -, util-linuxMinimal -}: - -rustPlatform.buildRustPackage rec { - pname = "imag"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "matthiasbeyer"; - repo = pname; - rev = "v${version}"; - sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; - }; - - nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; - nativeCheckInputs = [ gitMinimal util-linuxMinimal ]; - - cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; - - checkPhase = '' - export HOME=$TMPDIR - git config --global user.email "nobody@example.com" - git config --global user.name "Nobody" - - # UI tests uses executables directly, so we need to build them before - # launching the tests - cargo build - '' + ( - # CLI uses the presence of a controlling TTY to check if arguments are - # passed in stdin, or in the command-line, so we use script to create - # a PTY for us. - if !stdenv.isDarwin then '' - script -qfec "cargo test --workspace" - '' else '' - script -q "cargo test --workspace" - '' - ); - - postInstall = '' - installShellCompletion target/imag.{bash,fish} --zsh target/_imag - ''; - - meta = with lib; { - description = "Commandline personal information management suite"; - homepage = "https://imag-pim.org/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ Br1ght0ne minijackson ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7cde84f5295b..14c0f0002a2a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -652,6 +652,7 @@ mapAliases ({ idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 + imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daec05886d77..6a21d40cc040 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30072,11 +30072,6 @@ with pkgs; avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { }; - imag = callPackage ../applications/misc/imag { - inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; - }; - image-roll = callPackage ../applications/graphics/image-roll { }; imagej = callPackage ../applications/graphics/imagej { }; From 03214405bbfb25e6a7168e98715afb19dcfa6dba Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 10:28:28 +0800 Subject: [PATCH 06/22] firmware-manager: 0.1.2 -> unstable-2022-12-09 --- .../firmware/firmware-manager/default.nix | 56 +++++++++++++------ 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index ee36ab574426..3ae23aa56071 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,32 +1,56 @@ -{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: -rustPlatform.buildRustPackage rec { +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, xz +, pkg-config +, openssl +, dbus +, glib +, udev +, cairo +, pango +, atk +, gdk-pixbuf +, gtk3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { pname = "firmware-manager"; - version = "0.1.2"; + version = "unstable-2022-12-09"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = version; - sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc="; + rev = "9be8160346689bd74f95db7897884a91fa48afe3"; + sha256 = "sha256-zZk2RVghhKxETSVv/Jtv8Wq6+ITx/BudE/o7h4jKk5M="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; - - depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "sha256-3drsOmlmy1xXRWg7WMDNN+iuVmPYf60sDLIdCvu4rEw="; + }; postPatch = '' - sed -i 's|etc|$(prefix)/etc|' Makefile + substituteInPlace Makefile --replace '$(DESTDIR)/etc' '$(DESTDIR)$(prefix)/etc' ''; - buildPhase = "make prefix='$(out)'"; + nativeBuildInputs = with rustPlatform; [ + rust.cargo + rust.rustc + pkg-config + cargoSetupHook + wrapGAppsHook + ]; - installPhase = "make prefix='$(out)' install"; + buildInputs = [ + openssl + gtk3 + udev + ]; - cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U="; - - doCheck = false; + makeFlags = [ "prefix=$(out)" ]; meta = { description = "Graphical frontend for firmware management"; From 71034ab59226818c69992971f5d3eeb23c93ee93 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 18:56:38 +0800 Subject: [PATCH 07/22] finalfrontier: 0.9.4 -> unstable-2022-01-06 --- .../science/machine-learning/finalfrontier/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 1644ca3d1433..6b76eea33cef 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "finalfrontier"; - version = "0.9.4"; + version = "unstable-2022-01-06"; src = fetchFromGitHub { owner = "finalfusion"; repo = pname; - rev = version; - sha256 = "1lvwv238p8hrl4sc5pmnvaargl2dd25p44gxl3kibq5ng03afd0n"; + rev = "2461fb1dde13b73039926aa66606e470907a1b59"; + sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoSha256 = "0lhcazcih48gc23q484h344bzz7p3lh189ljhswdyph2i11caarp"; + cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a21d40cc040..98d7de787ac9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28944,7 +28944,6 @@ with pkgs; finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { From 9d75205879f46a25c0a9d6ca97bf9be02c1af1de Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 2 Feb 2023 18:11:10 +0000 Subject: [PATCH 08/22] tarball: add --show-trace to nix-env command Otherwise, when this fails on Hydra, we have no way of seeing what went wrong, e.g. [1]. [1]: https://hydra.nixos.org/log/2210x8gsd8jgdx73qa7hmhmmridyy7yp-nixpkgs-tarball-23.05pre450719.c11c55dd08a.drv Suggested-by: K900 --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index dbe96bd096f8..ea975a9b6fcc 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -64,7 +64,7 @@ pkgs.releaseTools.sourceTarball { echo "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --meta --json --show-trace --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages From 9c69938485b8d59c45126bed04c1381887e885e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 2 Feb 2023 18:31:19 -0300 Subject: [PATCH 09/22] linuxKernel.kernels.linux_testing_bcachefs: 6.1.9-unstable-2022-12-29 -> 6.1.3-unstable-2023-02-01 --- .../linux/kernel/linux-testing-bcachefs.nix | 6 +++--- pkgs/top-level/linux-kernels.nix | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 8a6d1a89dc87..06a1bfc29b76 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, commitDate ? "2022-12-29" -, currentCommit ? "8f064a4cb5c7cce289b83d7a459e6d8620188b37" -, diffHash ? "sha256-RnlM7uOSWhFHG1aj5BOjrfRtoZfbx+tqQw1V49nW5vw=" +, commitDate ? "2023-02-01" +, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f" +, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5d15cff25df1..56225b6d4241 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -184,9 +184,18 @@ in { then latest else testing; - linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_6_1; - kernelPatches = kernel.kernelPatches; + linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { + # Pinned on the last version which Kent's commits can be cleany rebased up. + kernel = buildLinux rec { + version = "6.1.3"; + modDirVersion = lib.versions.pad 3 version; + extraMeta.branch = lib.versions.majorMinor version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; + }; + }; + kernelPatches = linux_6_1.kernelPatches; }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { From 64d752ea6042178a08f1d12cc16b62eae84ddb6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 2 Feb 2023 18:31:46 -0300 Subject: [PATCH 10/22] linuxKernel.kernels.linux_testing_bcachefs: add pedrohlc to maintainers --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 06a1bfc29b76..115d8ad93149 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -17,7 +17,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak Madouura ]; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; }; } // argsOverride; From 338e4c14333a720e3bbb097f21fdb3cd91e121b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 2 Feb 2023 18:32:34 -0300 Subject: [PATCH 11/22] bcachefs-tools: unstable-2022-12-29 -> unstable-2023-01-31 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index eb54f08a3a26..f96ee77d9339 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-12-29"; + version = "unstable-2023-01-31"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "42cf74fd1d0ef58927967e6236988e86cfc0d086"; - sha256 = "sha256-N/1heStwmB7CzE/ddTud/ywnMdhq8ZkLju+x0UL0yjY="; + rev = "3c39b422acd3346321185be0ce263809e2a9a23f"; + hash = "sha256-2ci/m4JfodLiPoWfP+QCEqlk0k48zq3mKb8Pdrtln0o="; }; postPatch = '' From cc4da379917810b2f0708011e55ed4cd6c205577 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 3 Feb 2023 10:33:25 -0500 Subject: [PATCH 12/22] difftastic: 0.42.0 -> 0.43.0 Diff: https://github.com/Wilfred/difftastic/compare/0.42.0...0.43.0 Changelog: https://github.com/Wilfred/difftastic/blob/0.43.0/CHANGELOG.md --- pkgs/tools/text/difftastic/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 9d189f40fb06..40ddc9263e8c 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -1,21 +1,20 @@ { lib +, rustPlatform , fetchFromGitHub , fetchpatch -, rustPlatform -, tree-sitter -, difftastic , testers +, difftastic }: rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-9ooVXGZ7MEB4D0awciJJio3ttqxEQ8EUBbIQ6xxrXh0="; + sha256 = "sha256-YL2rKsP5FSoG1gIyxQtt9kovBAyu8Flko5RxXRQy5mQ="; }; depsExtraArgs = { @@ -40,14 +39,20 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-Zbnk5tcCRoaEH3A1mbsfpEhLe1EMcZqPQ4vzWxi0oG0="; + cargoSha256 = "sha256-SUNBnJP8B/HvlozcCbehL1A2/WudYE20DIPc7/fYF/k="; + + checkFlags = [ + # test is broken + # https://github.com/Wilfred/difftastic/issues/479 + "--skip=files::tests::test_gzip_is_binary" + ]; passthru.tests.version = testers.testVersion { package = difftastic; }; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; - changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/Wilfred/difftastic/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 figsoda ]; mainProgram = "difft"; From 8c3d73408971b8e3cbaca3841e24f9501f91c3ea Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 3 Feb 2023 19:20:51 +0000 Subject: [PATCH 13/22] vcmi: 1.1.0 -> 1.1.1 Changes: https://github.com/vcmi/vcmi/compare/1.1.0...1.1.1 --- pkgs/games/vcmi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index f38053a65a1d..632d4fe7f2d8 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-Ah+aAuU2ioUfvtxfcSb4GNqriqY71ee5RhW2L9UMYFY="; + hash = "sha256-/BHpAXOCLi6d0+/uE79g8p6YO1swizItAwVlPVf/nkQ="; }; postPatch = '' @@ -69,7 +69,9 @@ stdenv.mkDerivation rec { # Upstream assumes relative value while Nixpkgs passes absolute. # Both should be allowed: https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html # Meanwhile work it around by passing a relative value. + "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" + "-DCMAKE_INSTALL_DATAROOTDIR:STRING=share" ]; postFixup = '' From c47337a5ebb94bf266a2085337ec59c647d9f888 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Feb 2023 20:35:08 +0000 Subject: [PATCH 14/22] deno: 1.30.0 -> 1.30.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 7d570f07aca1..4e1563f7716a 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.30.0"; + version = "1.30.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-He8RgzmiL8Zp+klm0JPNeqbyjK/5CsE7HB2Hco7GZss="; + sha256 = "sha256-WpS1pqy6o8FUWMdJpzG5T8xoCkQZ/SbWI4k9vellVb8="; }; - cargoSha256 = "sha256-lPgVivYsR3SljPkjRRkb3qM3ZO7RALfk1KGPd7cwSYQ="; + cargoSha256 = "sha256-RVoXHrEWMwuC+nD6ypiZzGsYEr/BFReE67z7gqqDOzA="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From 6f15885434d121efcf026c160e47013090080eb2 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Fri, 27 Jan 2023 03:19:59 +0100 Subject: [PATCH 15/22] swayrbar: init at 0.3.4 --- pkgs/tools/wayland/swayrbar/default.nix | 30 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/wayland/swayrbar/default.nix diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix new file mode 100644 index 000000000000..808d5c3c31de --- /dev/null +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayrbar"; + version = "0.3.4"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "swayrbar-${version}"; + sha256 = "sha256-OQhq5ZUe2OrfRFxoaAbbewoHgQVPv9cQy0VCpYe1SNo="; + }; + + cargoHash = "sha256-vM4SoRbVylN90b378Qk18A8/2S2IB88lnGCM6sqrhs8="; + + # don't build swayr + buildAndTestSubdir = pname; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Status command for sway's swaybar implementing the swaybar-protocol"; + homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ sebtm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9651b06f507..72ad87cfd4f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4101,6 +4101,8 @@ with pkgs; swayr = callPackage ../tools/wayland/swayr { }; + swayrbar = callPackage ../tools/wayland/swayrbar { }; + swaysome = callPackage ../tools/wayland/swaysome { }; swayimg = callPackage ../tools/wayland/swayimg { }; From 01959f61f0fda94a9d85a01c777ae69568c8c311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 31 Jan 2023 22:27:39 -0800 Subject: [PATCH 16/22] poetry: add withPlugins --- .../package-management/poetry/default.nix | 133 +++------------- .../package-management/poetry/unwrapped.nix | 149 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 172 insertions(+), 112 deletions(-) create mode 100644 pkgs/tools/package-management/poetry/unwrapped.nix diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 069b6f24eaa5..e706f727c29b 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -1,13 +1,13 @@ { lib -, stdenv , python3 -, fetchFromGitHub -, installShellFiles }: let python = python3.override { packageOverrides = self: super: { + poetry = self.callPackage ./unwrapped.nix { }; + + # version overrides required by poetry and its plugins dulwich = super.dulwich.overridePythonAttrs (old: rec { version = "0.20.50"; src = self.fetchPypi { @@ -18,118 +18,27 @@ let }); }; }; -in python.pkgs.buildPythonApplication rec { - pname = "poetry"; - version = "1.3.2"; - format = "pyproject"; - disabled = python.pkgs.pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "python-poetry"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + plugins = with python.pkgs; { }; - nativeBuildInputs = [ - installShellFiles - ]; + # selector is a function mapping pythonPackages to a list of plugins + withPlugins = selector: let + selected = selector plugins; + in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ selected; - propagatedBuildInputs = with python.pkgs; [ - cachecontrol - cleo - crashtest - dulwich - filelock - html5lib - jsonschema - keyring - packaging - pexpect - pkginfo - platformdirs - poetry-core - poetry-plugin-export - requests - requests-toolbelt - shellingham - tomlkit - trove-classifiers - virtualenv - ] ++ lib.optionals (stdenv.isDarwin) [ - xattr - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ lib.optionals (pythonOlder "3.10") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.8") [ - backports-cached-property - ] ++ cachecontrol.optional-dependencies.filecache; + # save some build time when adding plugins by disabling tests + doCheck = selected == [ ]; - postInstall = '' - installShellCompletion --cmd poetry \ - --bash <($out/bin/poetry completions bash) \ - --fish <($out/bin/poetry completions fish) \ - --zsh <($out/bin/poetry completions zsh) \ - ''; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; - # Propagating dependencies leaks them through $PYTHONPATH which causes issues - # when used in nix-shell. - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; - - nativeCheckInputs = with python.pkgs; [ - cachy - deepdiff - flatdict - pytestCheckHook - httpretty - pytest-mock - pytest-xdist - ]; - - preCheck = ('' - export HOME=$TMPDIR - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 - export no_proxy='*'; - ''); - - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - unset no_proxy - ''; - - disabledTests = [ - # touches network - "git" - "solver" - "load" - "vcs" - "prereleases_if_they_are_compatible" - "test_executor" - # requires git history to work correctly - "default_with_excluded_data" - # toml ordering has changed - "lock" - # fs permission errors - "test_builder_should_execute_build_scripts" - ] ++ lib.optionals (python.pythonAtLeast "3.10") [ - # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended - "test_info_setup_complex_pep517_error" - ]; - - # Allow for package to use pep420's native namespaces - pythonNamespaces = [ - "poetry" - ]; - - meta = with lib; { - changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; - homepage = "https://python-poetry.org/"; - description = "Python dependency management and packaging made easy"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum dotlambda ]; - }; -} + passthru = rec { + inherit plugins withPlugins; + }; + })); +in withPlugins (ps: [ ]) diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix new file mode 100644 index 000000000000..e98c571ddb75 --- /dev/null +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -0,0 +1,149 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, installShellFiles +, cachecontrol +, cleo +, crashtest +, dulwich +, filelock +, html5lib +, jsonschema +, keyring +, packaging +, pexpect +, pkginfo +, platformdirs +, poetry-core +, poetry-plugin-export +, requests +, requests-toolbelt +, shellingham +, tomlkit +, trove-classifiers +, virtualenv +, xattr +, tomli +, importlib-metadata +, backports-cached-property +, cachy +, deepdiff +, flatdict +, pytestCheckHook +, httpretty +, pytest-mock +, pytest-xdist +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "poetry"; + version = "1.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + cachecontrol + cleo + crashtest + dulwich + filelock + html5lib + jsonschema + keyring + packaging + pexpect + pkginfo + platformdirs + poetry-core + poetry-plugin-export + requests + requests-toolbelt + shellingham + tomlkit + trove-classifiers + virtualenv + ] ++ lib.optionals (stdenv.isDarwin) [ + xattr + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.8") [ + backports-cached-property + ] ++ cachecontrol.optional-dependencies.filecache; + + postInstall = '' + installShellCompletion --cmd poetry \ + --bash <($out/bin/poetry completions bash) \ + --fish <($out/bin/poetry completions fish) \ + --zsh <($out/bin/poetry completions zsh) \ + ''; + + nativeCheckInputs = [ + cachy + deepdiff + flatdict + pytestCheckHook + httpretty + pytest-mock + pytest-xdist + ]; + + preCheck = ('' + export HOME=$TMPDIR + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 + export no_proxy='*'; + ''); + + postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + unset no_proxy + ''; + + disabledTests = [ + # touches network + "git" + "solver" + "load" + "vcs" + "prereleases_if_they_are_compatible" + "test_executor" + # requires git history to work correctly + "default_with_excluded_data" + # toml ordering has changed + "lock" + # fs permission errors + "test_builder_should_execute_build_scripts" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended + "test_info_setup_complex_pep517_error" + ]; + + # Allow for package to use pep420's native namespaces + pythonNamespaces = [ + "poetry" + ]; + + meta = with lib; { + changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://python-poetry.org/"; + description = "Python dependency management and packaging made easy"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8916723831a..9f0f1cbf0f56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16597,6 +16597,8 @@ with pkgs; poetry = callPackage ../tools/package-management/poetry { }; + poetryPlugins = recurseIntoAttrs poetry.plugins; + poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { inherit pkgs lib; }; From 0349728efbdbb92e6880a560fc9ab82a8824d7bf Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 31 Jan 2023 22:37:45 -0800 Subject: [PATCH 17/22] poetryPlugins.poetry-plugin-up: init at 0.2.1 --- .../package-management/poetry/default.nix | 2 + .../poetry/plugins/poetry-plugin-up.nix | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index e706f727c29b..3d9a2fe8c9aa 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -20,9 +20,11 @@ let }; plugins = with python.pkgs; { + poetry-plugin-up = callPackage ./plugins/poetry-plugin-up.nix { }; }; # selector is a function mapping pythonPackages to a list of plugins + # e.g. poetry.withPlugins (ps: with ps; [ poetry-plugin-up ]) withPlugins = selector: let selected = selector plugins; in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: { diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix new file mode 100644 index 000000000000..e84546573dac --- /dev/null +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytestCheckHook +, pytest-mock +, poetry +}: + +buildPythonPackage rec { + pname = "poetry-plugin-up"; + version = "0.2.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "MousaZeidBaker"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-16p0emvgWa56Km8U5HualCSStbulqyINbC3Jez9Y1n0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + poetry + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Poetry plugin to simplify package updates"; + homepage = "https://github.com/MousaZeidBaker/poetry-plugin-up"; + changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}"; + license = licenses.mit; + maintainers = [ maintainers.k900 ]; + }; +} From 72fc45dc80320a01eada4ccb81262991551e5edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Feb 2023 09:34:49 -0800 Subject: [PATCH 18/22] poetryPlugins.poetry-audit-plugin: init at 0.3.0 --- .../package-management/poetry/default.nix | 1 + .../poetry/plugins/poetry-audit-plugin.nix | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 3d9a2fe8c9aa..eaaa2dc57d47 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -20,6 +20,7 @@ let }; plugins = with python.pkgs; { + poetry-audit-plugin = callPackage ./plugins/poetry-audit-plugin.nix { }; poetry-plugin-up = callPackage ./plugins/poetry-plugin-up.nix { }; }; diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix b/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix new file mode 100644 index 000000000000..85eb0b5d19b1 --- /dev/null +++ b/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, poetry +, safety +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "poetry-audit-plugin"; + version = "0.3.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "opeco17"; + repo = "poetry-audit-plugin"; + rev = "refs/tags/${version}"; + hash = "sha256-49OnYz3EFiqOe+cLgfynjy14Ve4Ga6OUrLdM8HhZuKQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + safety + ]; + + pythonImportsCheck = [ "poetry_audit_plugin" ]; + + nativeCheckInputs = [ + poetry # for the executable + pytestCheckHook + ]; + + # requires networking + doCheck = false; + + meta = { + description = "Poetry plugin for checking security vulnerabilities in dependencies"; + homepage = "https://github.com/opeco17/poetry-audit-plugin"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} From e694229bb69a6860dbe3ee8c6a71e5be8136d8e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Feb 2023 22:38:55 +0000 Subject: [PATCH 19/22] v2ray-geoip: 202301260045 -> 202302020047 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 5f33ff70c150..be7466674259 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202301260045"; + version = "202302020047"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "dda29e7611d13ff6f580cf389a7b84194363f75c"; - sha256 = "sha256-9X9Oh4WFFpuRG1jQyQHTqNOCcW5f+uNOjH1iv1i6Je0="; + rev = "9ab244ed78fea88a1ce5bf789fb31bbcd81e8d17"; + sha256 = "sha256-2NYuvzOU0W3qZqWZMr3rTNqX+0rH3fhIr1zCD5dSdWc="; }; installPhase = '' From c1fd7598cf66cd5c653d081bd92f787e1ffa9a9f Mon Sep 17 00:00:00 2001 From: Masanori Misono Date: Wed, 1 Feb 2023 14:55:41 +0000 Subject: [PATCH 20/22] bpftrace: 0.16.0 -> 0.17.0 --- pkgs/os-specific/linux/bpftrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 0c6a6f648672..cb58ed48bb13 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-S43KS/qpzxU+Sgkcud4Cyx4yRjaT6SZzLv6R6bg5I2w="; + sha256 = "sha256-PBqq3u8zym+RY6xudJ66ItzDZEJBNvJDtve1GtxcOdQ="; }; buildInputs = with llvmPackages; From fd5d7b258694c1ef5d499cba37693ebd21fbc13f Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 3 Feb 2023 13:44:13 +0900 Subject: [PATCH 21/22] tests/bpf: add module BTF test bpftrace 0.17 added module BTF support, check this works. On bpftrace 0.16, this failed with the following error: > ERROR: kfunc:nft_trans_alloc_gfp: no BTF data for the function --- nixos/tests/bpf.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 5868e3bfcb4c..5dc97404772b 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -25,5 +25,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { print(machine.succeed("bpftrace -e 'kprobe:schedule { " " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " "}'")) + # module BTF (bpftrace >= 0.17) + print(machine.succeed("bpftrace -e 'kfunc:nft_trans_alloc_gfp { " + " printf(\"portid: %d\\n\",args->ctx->portid); " + "} BEGIN { exit() }'")) ''; }) From 32d066dce3e443459148fcd003927f00362d8f26 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Feb 2023 23:02:47 +0000 Subject: [PATCH 22/22] channel: add --show-trace to nix-env command Otherwise, when this fails on Hydra, we have no way of seeing what went wrong. --- nixos/lib/make-channel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index 9b920b989fcf..0a511468fb2d 100644 --- a/nixos/lib/make-channel.nix +++ b/nixos/lib/make-channel.nix @@ -23,7 +23,7 @@ pkgs.releaseTools.makeSourceTarball { cp -prd . ../$releaseName chmod -R u+w ../$releaseName ln -s . ../$releaseName/nixpkgs # hack to make ‘’ work - NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null + NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --show-trace --xml \* > /dev/null cd .. chmod -R u+w $releaseName tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName