From 3d4b5d990f51a676714c6dd9704d277b39ac8d19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Feb 2022 11:50:03 +0000 Subject: [PATCH 01/17] vaultenv: 0.13.3 -> 0.14.0 --- pkgs/development/tools/haskell/vaultenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 72d5469f0f99..4f51c8238ce0 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48="; + sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI="; }; buildTools = [ hpack ]; From 7b4a69aec369a4ddcfbb690b12591f571e44161d Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 15 Feb 2022 19:39:14 +0100 Subject: [PATCH 02/17] gnome-feeds: add glib-networking as buildInput Otherwise articles secured with TLS fail to load --- .../applications/networking/feedreaders/gnome-feeds/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 9b173e856827..633c1e744bb6 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -11,6 +11,7 @@ , wrapGAppsHook , glib +, glib-networking , gtk3 , libhandy , listparser ? callPackage ./listparser.nix { } @@ -44,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib + glib-networking gtk3 libhandy webkitgtk From bfd0d4b58cc189544114937cc9b5bbc3a331064c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Feb 2022 02:07:18 +0000 Subject: [PATCH 03/17] bacon: 1.2.5 -> 2.0.0 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 271d946000be..b01be7b7aedf 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "1.2.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dpdQ1qBfLU6whkqVHQ/zQxqs/y+nmdvxHanaNw66QxA="; + sha256 = "sha256-Wa5K21QGI43sZkv7xgatf37Wqy9RT3S7HQBsjGUZovA="; }; - cargoSha256 = "sha256-jidZhaB8gF4QBcTvVuygTZdQnlOVwOQO8MMjUuSPht0="; + cargoSha256 = "sha256-PpLZOQd4r50LWJwB2WX5IrRyzYhWgsv9wOqm/sZCaug="; buildInputs = lib.optional stdenv.isDarwin CoreServices; From 0c10da55e447999a27a5b11a4780b93b552903a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Feb 2022 05:30:36 +0000 Subject: [PATCH 04/17] restic-rest-server: 0.10.0 -> 0.11.0 https://github.com/restic/rest-server/releases/tag/v0.11.0 --- pkgs/tools/backup/restic/rest-server.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 9f2a52d64dcd..699343b8728d 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -2,19 +2,20 @@ buildGoModule rec { pname = "restic-rest-server"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "restic"; repo = "rest-server"; rev = "v${version}"; - sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7"; + hash = "sha256-ninPODztNzvB2js9cuNAuExQLK/OGOu80ZNW0BPrdds="; }; - vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg"; + vendorSha256 = "sha256-8x5qYvIX/C5BaewrTNVbIIadL+7XegbRUZiEDWmJM+c="; preCheck = '' - substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin" + substituteInPlace cmd/rest-server/main_test.go \ + --replace "/tmp/restic" "/build/restic" ''; meta = with lib; { From 15314e052b9cc1b056d434ff4cae13f52a9154c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 09:23:07 +0000 Subject: [PATCH 05/17] audiowaveform: 1.5.1 -> 1.6.0 --- pkgs/tools/audio/audiowaveform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/tools/audio/audiowaveform/default.nix index ab56a9890b0c..15981b0fc6e1 100644 --- a/pkgs/tools/audio/audiowaveform/default.nix +++ b/pkgs/tools/audio/audiowaveform/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "sha256-WODAgiwZ7UfoukTcujXE5atw/Z03+Vo6aR2jubPwQeU="; + sha256 = "sha256-ZkkGRohcydi2C1S7J0+yGWsqK7ivxQmFuq1NGNiPPNY="; }; nativeBuildInputs = [ cmake gtest ]; From ef9d0ba1fc9966da61c2fcaa8fd1ad1e44833538 Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Sun, 20 Feb 2022 00:18:48 +0100 Subject: [PATCH 06/17] fishnet: 2.4.0 -> 2.5.1 --- pkgs/servers/fishnet/Cargo.lock.patch | 13 +++++++++++++ pkgs/servers/fishnet/default.nix | 16 +++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/fishnet/Cargo.lock.patch diff --git a/pkgs/servers/fishnet/Cargo.lock.patch b/pkgs/servers/fishnet/Cargo.lock.patch new file mode 100644 index 000000000000..7929eeee088e --- /dev/null +++ b/pkgs/servers/fishnet/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 963e40e..fb76d78 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -230,7 +230,7 @@ dependencies = [ + + [[package]] + name = "fishnet" +-version = "2.5.1-dev" ++version = "2.5.1" + dependencies = [ + "arrayvec", + "atty", \ No newline at end of file diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 784a5525133c..10695e54781f 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -6,21 +6,21 @@ }: let - nnueFile = "nn-6762d36ad265.nnue"; + nnueFile = "nn-13406b1dcbe0.nnue"; nnue = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "0727dsxfpns9fkyir95fybibqmigk5h45k154b2c5rk5s9md6qk7"; + sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28="; }; in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Gl2vJFn9yVYH62yBJefAOBX/jJaFAdSZj2Lj3imcps="; + sha256 = "sha256-nVRG60sSpTqfqhCclvWoeyHR0+oO1Jn1PgftigDGq5c="; fetchSubmodules = true; }; @@ -29,7 +29,13 @@ rustPlatform.buildRustPackage rec { cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}' ''; - cargoSha256 = "sha256-/s7Yyi2FUh+EDvgaHLgZ/FA6kk2FQrZr3L3B76fqTuc="; + cargoSha256 = "sha256-BJK7M/pjHRj74xoeciavhkK2YRpeogkELIuXetX73so="; + + # TODO: Cargo.lock is out of date, so fix it. Likely not necessary anymore in + # the next update. + cargoPatches = [ + ./Cargo.lock.patch + ]; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; From 3db00085b58431f7e87af9a6cf8cf2cec5c889b7 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Mon, 21 Feb 2022 00:22:57 -0500 Subject: [PATCH 07/17] awscli2: 2.4.9 -> 2.4.19 --- pkgs/tools/admin/awscli2/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 2a2d55dc1955..08fb92e4ea63 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,15 +25,7 @@ let rev = "7083e5c204e139dc41f646e0ad85286b5e7c0c23"; sha256 = "sha256-aiCc/CXoTem0a9wI/AMBRK3g2BXJi7LpnUY/BxBEKVM="; }; - propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; - }); - - prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { - version = "2.0.10"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; - }; + propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [ py.pkgs.awscrt ]; }); }; }; @@ -41,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.4.9"; # N.B: if you change this, change botocore to a matching version too + version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-ihmbw+gS7zZz/nebrmpEr9MR+dVabc70DBPPSrm3eeE="; + sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo="; }; propagatedBuildInputs = [ From 26c53e85d7949188e0bd1a5eab3e8aa43b63383a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 19 Feb 2022 08:26:03 +0000 Subject: [PATCH 08/17] go-jsonnet: add jsonnet-deps and jsonnet-lint --- .../compilers/go-jsonnet/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 2b7c6a2f0715..25bedd397b2f 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testVersion }: -buildGoModule rec { +let self = buildGoModule rec { pname = "go-jsonnet"; version = "0.18.0"; @@ -15,12 +15,19 @@ buildGoModule rec { doCheck = false; - subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ]; + subPackages = [ "cmd/jsonnet*" ]; + + passthru.tests.version = testVersion { + package = self; + version = "v${version}"; + }; meta = with lib; { description = "An implementation of Jsonnet in pure Go"; homepage = "https://github.com/google/go-jsonnet"; license = licenses.asl20; - maintainers = with maintainers; [ nshalman ]; + maintainers = with maintainers; [ nshalman aaronjheng ]; + mainProgram = "jsonnet"; }; -} +}; +in self From bf149c406ab90efa2872e05a74c75c3233e67fc8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 25 Feb 2022 19:03:08 +0000 Subject: [PATCH 09/17] python310Packages.sanic: disable due to GHSA-7p79-6x2v-5h88 sanic doesn't support python 3.10 yet and attempting to use it opens users to a DoS attack --- pkgs/development/python-modules/sanic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 660ca5de80bf..63c24e9936fc 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -13,6 +13,7 @@ , pytest-sugar , pytestCheckHook , pythonOlder +, pythonAtLeast , sanic-routing , sanic-testing , ujson @@ -26,7 +27,8 @@ buildPythonPackage rec { version = "21.12.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || + pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 src = fetchFromGitHub { owner = "sanic-org"; From 149d68268dc698fb1689f1336aa4c38e38616c63 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 4 Mar 2022 21:04:19 -0500 Subject: [PATCH 10/17] root: fix ROOTConfig.cmake.in patching --- pkgs/applications/science/misc/root/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index f8037c01e087..872438158d66 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Hardcode path to fix use with cmake sed -i cmake/scripts/ROOTConfig.cmake.in \ - -e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' + -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ '' + lib.optionalString noSplash '' From eb8c10a816370c3145a7812d0d7a4d826ff9d561 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Mar 2022 09:46:43 +0000 Subject: [PATCH 11/17] python310Packages.fastavro: 1.4.9 -> 1.4.10 --- pkgs/development/python-modules/fastavro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 935eefa5182f..fcd65f1f317a 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.4.9"; + version = "1.4.10"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0af6d67s6mi9ylqla8nga6cj4y0y4gp3l2q68br2mrdyivkml0g0"; + sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE="; }; preBuild = '' From cb76041783eb5cb40d1ec376cdadabced6ab45be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Mar 2022 17:09:04 +0000 Subject: [PATCH 12/17] diffoscope: 205 -> 207 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index f74f7855d02d..7f1655b98437 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "205"; + version = "207"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-Smx9trogh7E6jsH0K+FXAocN8znnMXXnN6N/QzXkdJQ="; + sha256 = "sha256-0PWnaOQV4Pj0hFMpn98xYhZDexctkweIE2ZM3ppYfvg="; }; outputs = [ "out" "man" ]; From f7e9fa8dc6eca6b48458d80902b97d4f6aff0fd3 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 5 Mar 2022 20:20:01 +0100 Subject: [PATCH 13/17] nix-output-monitor: 1.0.4.0 -> 1.0.5.0 --- pkgs/tools/nix/nix-output-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a0700e43c5b2..5c4c64c15490 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.4.0"; + version = "1.0.5.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - hash = "sha256-3EQgjrDX8C3qG6danuPRl2gnPlX1qZjxjrROrKitsS0="; + hash = "sha256-7vjGE/MfRlFplGQBkhYwqMWjiFfky7J9aI8Tt5FycBo="; rev = "v${version}"; }; isLibrary = true; From b4e2df2e10616396ecdbacecc52d5c7bc92e8efd Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 5 Mar 2022 21:19:36 +0100 Subject: [PATCH 14/17] remove networkmanager098 (#162904) --- pkgs/build-support/appimage/default.nix | 1 - pkgs/games/steam/fhsenv.nix | 1 - .../networkmanager/0.9.8/default.nix | 64 --------------- .../networkmanager/0.9.8/libnl-3.2.25.patch | 61 --------------- .../networkmanager/0.9.8/nixos-purity.patch | 77 ------------------- pkgs/top-level/all-packages.nix | 3 - 6 files changed, 207 deletions(-) delete mode 100644 pkgs/tools/networking/networkmanager/0.9.8/default.nix delete mode 100644 pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch delete mode 100644 pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 9ceaab88946d..8ae43df05cad 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -123,7 +123,6 @@ rec { atk at-spi2-atk libudev0-shim - networkmanager098 xorg.libXt xorg.libXmu diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index bd0abf48bb53..06dbfea304ce 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -167,7 +167,6 @@ in buildFHSUserEnv rec { ffmpeg # Only libraries are needed from those two libudev0-shim - networkmanager098 # Verified games requirements xorg.libXt diff --git a/pkgs/tools/networking/networkmanager/0.9.8/default.nix b/pkgs/tools/networking/networkmanager/0.9.8/default.nix deleted file mode 100644 index 757c886fdf3f..000000000000 --- a/pkgs/tools/networking/networkmanager/0.9.8/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, dbus-glib -, udev, libnl, libuuid, gnutls, dhcp -, libgcrypt, perl, libgudev, avahi, ppp, kmod }: - -stdenv.mkDerivation rec { - pname = "networkmanager"; - version = "0.9.8.10"; - - src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86"; - }; - - preConfigure = '' - substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl - substituteInPlace src/nm-device.c \ - --replace @avahi@ ${avahi} \ - --replace @kmod@ ${kmod} - substituteInPlace src/ppp-manager/nm-ppp-manager.c \ - --replace @ppp@ ${ppp} \ - --replace @kmod@ ${kmod} - ''; - - # Right now we hardcode quite a few paths at build time. Probably we should - # patch networkmanager to allow passing these path in config file. This will - # remove unneeded build-time dependencies. - configureFlags = [ - "--with-distro=exherbo" - "--with-dhclient=${dhcp}/sbin/dhclient" - "--with-dhcpcd=no" - "--with-iptables=no" - "--with-udev-dir=\${out}/lib/udev" - "--with-resolvconf=no" - "--sysconfdir=/etc" "--localstatedir=/var" - "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" - "--with-crypto=gnutls" "--disable-more-warnings" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-kernel-firmware-dir=/run/current-system/firmware" - "--disable-ppp" - ]; - - buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ]; - - propagatedBuildInputs = [ dbus-glib ]; - - nativeBuildInputs = [ intltool pkg-config ]; - - patches = - [ ./libnl-3.2.25.patch - ./nixos-purity.patch - ]; - - preInstall = - '' - installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) - ''; - - meta = with lib; { - homepage = "http://projects.gnome.org/NetworkManager/"; - description = "Network configuration and management tool"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch b/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch deleted file mode 100644 index 17c2966b7064..000000000000 --- a/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c -index ba8053e..5ac39d3 100644 ---- a/src/nm-netlink-monitor.c -+++ b/src/nm-netlink-monitor.c -@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg) - static int - event_msg_recv (struct nl_msg *msg, void *arg) - { -- struct nl_sock *nlh = arg; -- struct nlmsghdr *hdr = nlmsg_hdr (msg); - struct ucred *creds = nlmsg_get_creds (msg); -- const struct sockaddr_nl *snl; -- guint32 local_port; -- gboolean accept_msg = FALSE; -- -- /* Only messages sent from the kernel */ -- if (!creds || creds->uid != 0) { -- nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d", -- creds ? creds->uid : -1); -- return NL_SKIP; -- } -- -- snl = nlmsg_get_src (msg); -- g_assert (snl); -- -- /* Accept any messages from the kernel */ -- if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0) -- accept_msg = TRUE; - -- /* And any multicast message directed to our netlink PID, since multicast -- * currently requires CAP_ADMIN to use. -- */ -- local_port = nl_socket_get_local_port (nlh); -- if ((hdr->nlmsg_pid == local_port) && snl->nl_groups) -- accept_msg = TRUE; -- -- if (accept_msg == FALSE) { -- nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)", -- hdr->nlmsg_pid, -- local_port, -- (hdr->nlmsg_flags & NLM_F_MULTI)); -- return NL_SKIP; -+ if (!creds || creds->pid || creds->uid || creds->gid) { -+ if (creds) -+ nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)", -+ creds->pid, creds->uid, creds->gid); -+ else -+ nm_log_dbg (LOGD_HW, "netlink: received message without credentials"); -+ return NL_STOP; - } - - return NL_OK; -@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh, - { - int err; - -- nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data); -+ nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL); - - if (valid_func) - nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data); diff --git a/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch deleted file mode 100644 index 9ebc080ba96f..000000000000 --- a/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c -index 0932139..5b5aee8 100644 ---- a/src/dhcp-manager/nm-dhcp-dhclient.c -+++ b/src/dhcp-manager/nm-dhcp-dhclient.c -@@ -68,10 +68,6 @@ const char * - nm_dhcp_dhclient_get_path (const char *try_first) - { - static const char *dhclient_paths[] = { -- "/sbin/dhclient", -- "/usr/sbin/dhclient", -- "/usr/pkg/sbin/dhclient", -- "/usr/local/sbin/dhclient", - NULL - }; - const char **path = dhclient_paths; -diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c -index 237661f..48bc33f 100644 ---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c -+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c -@@ -51,10 +51,6 @@ const char * - nm_dhcp_dhcpcd_get_path (const char *try_first) - { - static const char *dhcpcd_paths[] = { -- "/sbin/dhcpcd", -- "/usr/sbin/dhcpcd", -- "/usr/pkg/sbin/dhcpcd", -- "/usr/local/sbin/dhcpcd", - NULL - }; - const char **path = dhcpcd_paths; -diff --git a/src/nm-device.c b/src/nm-device.c -index 1dc94ee..e60f3c8 100644 ---- a/src/nm-device.c -+++ b/src/nm-device.c -@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason) - char *argv[6], *cmdline; - const char **aipd_binary = NULL; - static const char *aipd_paths[] = { -- "/usr/sbin/avahi-autoipd", -- "/usr/local/sbin/avahi-autoipd", -+ "@avahi@/sbin/avahi-autoipd", - NULL - }; - int i = 0; -@@ -2555,7 +2554,7 @@ share_init (void) - } - - for (iter = modules; *iter; iter++) { -- char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL }; - char *envp[1] = { NULL }; - GError *error = NULL; - -diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c -index 59698c3..7dba0f7 100644 ---- a/src/ppp-manager/nm-ppp-manager.c -+++ b/src/ppp-manager/nm-ppp-manager.c -@@ -661,9 +661,7 @@ static inline const char * - nm_find_pppd (void) - { - static const char *pppd_binary_paths[] = { -- "/usr/local/sbin/pppd", -- "/usr/sbin/pppd", -- "/sbin/pppd", -+ "@ppp@/sbin/pppd", - NULL - }; - -@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager, - - /* Make sure /dev/ppp exists (bgo #533064) */ - if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) -- ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("@kmod@/bin/modprobe ppp_generic"); - - connection = nm_act_request_get_connection (req); - g_assert (connection); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce12eea2877c..575ca2a4c020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8160,9 +8160,6 @@ with pkgs; inherit (skawarePackages) cleanPackaging; }; - # stripped down, needed by steam - networkmanager098 = callPackage ../tools/networking/networkmanager/0.9.8 { }; - networkmanager = callPackage ../tools/networking/networkmanager { }; networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; From b0439f0bd269e99d597b7e0a5788b7be40780a6d Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 5 Mar 2022 15:36:46 -0500 Subject: [PATCH 15/17] streamlink: 3.1.1 -> 3.2.0 --- pkgs/applications/video/streamlink/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 957911e239c9..415790b4c11c 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "3.1.1"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-hVzTHpAOOuHVMoo3Ejv//irsUBoddLzdEvDSonWAYOQ="; + sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY="; }; checkInputs = with python3Packages; [ @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { ''; changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } From bc6b09791edb89e22e175d1b57d7834999922db1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Mar 2022 14:47:03 -0800 Subject: [PATCH 16/17] rauc: 1.5.1 -> 1.6 * rauc: 1.5.1 -> 1.6 (#159728) * rauc: use SPDX3 license identifier Co-authored-by: Renaud --- pkgs/tools/misc/rauc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index 667ce3cabe41..c99f2a460838 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw="; + sha256 = "sha256-HBeH9vzzfY7pG88xyoL+NJ78LMGphCAfyZiOxFSJnnc="; }; passthru = { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Safe and secure software updates for embedded Linux"; homepage = "https://rauc.io"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; }; From a173e92ee458878651356b9bcfb1e2b5145f76af Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:08:41 +0100 Subject: [PATCH 17/17] igrep: 0.1.2 -> 0.2.0 --- pkgs/tools/text/igrep/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 5a05501f1eb5..b7fc915c44d7 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-ZbJogp4rTc3GAD71iQUIf5EqwJ8XD9/WmvdAcGIgcvY="; + sha256 = "sha256-CH0wf9EhNnfi93W/4IJf6bPqU4pgw6Q9965Wjln9pso="; }; - cargoSha256 = "sha256-sj2GEyUPq9+JXlGpKYRNfhfwGf5F/J46AoOjUu4xm7I="; + cargoSha256 = "sha256-VnZuRLBt/Q+D89+jKm0rak+ID5oNbvN1k8or3pYzfIM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Interactive Grep"; homepage = "https://github.com/konradsz/igrep"; + changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ _0x4A6F ]; };