From 51f1663342257f21635563a9cb83091e4bab58fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 02:18:37 +0000 Subject: [PATCH 1/9] wcslib: 7.7 -> 7.9 --- .../libraries/science/astronomy/wcslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 6adf52514710..2b2cade6fbba 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.7"; + version = "7.9"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pwjmtOkOLNZCdDRxW1kbucPUAFyZcl7ElLjgvtLeU1U="; + sha256 = "sha256-vv+MHw6GAAeIE8Ay0a/NnLMFwx9WdWdDSCQjPVgqulg="; }; nativeBuildInputs = [ flex ]; From 9d46a1025a36e2e301a9782a2ff6ba080c0bd7fe Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 6 Apr 2022 17:30:43 -0700 Subject: [PATCH 2/9] pkgs/stdenv/linux: add powerpc64le bootstrap-files This PR adds Hydra-generated bootstrap tarballs for powerpc64le-linux. I'll be following the script established in PR to tarballs.nixos.org. Files came from this Hydra build: https://hydra.nixos.org/build/172142499 Which used nixpkgs revision 49a83445c28c4ffb8a1a90a1f68e6150ea48893b to instantiate: /nix/store/gj272sd56gsj6qpyzh4njpfzwdhviliz-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv and then built: /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu I downloaded these files from Hydra with the following commands: ``` STOREPATH=n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu OPTIONS="--option binary-caches https://cache.nixos.org" nix store add-file \ --name bootstrap-tools.tar.xz \ $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/bootstrap-tools.tar.xz nix store add-path \ --name busybox \ $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/busybox ``` As @lovesegfault requested in #151399, here are the the `sha256sum`s of all the `on-server` components for extra verification: ``` $ sha256sum /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/* 036d062869f7accf0ad89714d12029469dfe6af504f9b226d61eb7d808ad4735 /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz 6bc05832180f5075f4458c32eb0a5e2b673f605884dce01822be474f4e0a63ee /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/busybox ``` Co-authored-by: Sandro --- .../linux/bootstrap-files/powerpc64le.nix | 25 +++++++++++++++++++ pkgs/stdenv/linux/default.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix b/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix new file mode 100644 index 000000000000..9f09a6b60a43 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/172142499 +# +# Which used nixpkgs revision 49a83445c28c4ffb8a1a90a1f68e6150ea48893b +# to instantiate: +# +# /nix/store/gj272sd56gsj6qpyzh4njpfzwdhviliz-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv +# +# and then built: +# +# /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu +# +{ + busybox = import { + url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/busybox"; + sha256 = "sha256-UscnfGKOZAKLkPcRtwrbT5Uj8m3Kj9jhkKp9MUc1eCY="; + executable = true; + }; + bootstrapTools =import { + url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/bootstrap-tools.tar.xz"; + sha256 = "sha256-A20GKGn3rM8K2JcU0SApRp3+avUE+bIm1h632AitRzU="; + }; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d2c28b97ff93..822b69642f21 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,6 +16,7 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; + powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; riscv64-linux = import ./bootstrap-files/riscv64.nix; }; musl = { From ebd77acb8009d035b9c4cf37af0b3f06f0294393 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 23 Mar 2022 15:48:00 +0300 Subject: [PATCH 3/9] 3.0.1+quick_unstable-2021-12.14 > 3.0.2+quick_unstable-2022-03.15 --- pkgs/development/libraries/quictls/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 3d5741ccba55..2cc043ee0c1b 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -9,20 +9,15 @@ , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform }: -assert ( - lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) - "withPerl should not be disabled unless cross compiling" -); - stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.1+quick_unstable-2021-12.14"; + version = "3.0.2+quick_unstable-2022-03.15"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "ab8b87bdb436b11bf2a10a2a57a897722224f828"; - sha256 = "sha256-835oZgoM1CTS+JLxPO3oGSTnhLmJXGT1cFaJhCJK++8="; + rev = "7f2ab56a2b842b8e6fefc7b9d20eb5ff9c6ef151"; + sha256 = "sha256-We4ow0mGJFXqYM4PqbGn8qY5IYH/MtNaefrSaJreoRA="; }; patches = [ From 1a14dd01f37cabf5390ce9d28f9d290bcc9a13b6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 23 Mar 2022 23:54:35 +0300 Subject: [PATCH 4/9] nghttp3: unstable-2021-12-22 -> unstable-2022-04-10 --- pkgs/development/libraries/nghttp3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index fc2416c2cfb0..d9608b8e1404 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "unstable-2021-12-22"; + version = "unstable-2022-04-10"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "8d8184acf850b06b53157bba39022bc7b7b5f1cd"; - sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E="; + rev = "1e4bef2cc45b1fd3971ca3606d08a1e1d1567b1a"; + sha256 = "sha256-DHNxtu4X0S8l1ADwRJC3yQ+Z1ja3FT0Zb/boRh6PvYw="; }; nativeBuildInputs = [ autoreconfHook pkg-config file ]; From 6cb9beddb14ab304bdab7424e16148c34782fbe7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 24 Mar 2022 00:25:13 +0300 Subject: [PATCH 5/9] ngtcp2: unstable-2021-12-19 -> unstable-2022-04-11 --- pkgs/development/libraries/ngtcp2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 650516d360cf..cb11df7f032c 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "unstable-2021-12-19"; + version = "unstable-2022-04-11"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "20c710a8789ec910455ae4e588c72e9e39f8cec9"; - sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M="; + rev = "825899c051ea2a1f06a0c4617f41782f37009a18"; + sha256 = "sha256-VoSy0tyIXWNTmcVdsaiM9ijXLq41AOaPBajvsEIrfjo="; }; nativeBuildInputs = [ autoreconfHook pkg-config file ]; From e5fe7999879627f170efcb97df2cedb67402f88c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 14 Apr 2022 18:51:25 +0800 Subject: [PATCH 6/9] gnome-firmware: rename from gnome-firmware-updater --- .../default.nix | 12 ++++++------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/applications/misc/{gnome-firmware-updater => gnome-firmware}/default.nix (73%) diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix similarity index 73% rename from pkgs/applications/misc/gnome-firmware-updater/default.nix rename to pkgs/applications/misc/gnome-firmware/default.nix index 30d3b57003d1..d8b88031501f 100644 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation rec { - pname = "gnome-firmware-updater"; + pname = "gnome-firmware"; version = "3.34.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "hughsie"; - repo = "gnome-firmware-updater"; + owner = "World"; + repo = "gnome-firmware"; rev = version; sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l"; }; @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { patches = [ # Fixes manual build (fetchpatch { - url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch"; + url = "https://gitlab.gnome.org/World/gnome-firmware/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch"; sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06"; }) (fetchpatch { - url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch"; + url = "https://gitlab.gnome.org/World/gnome-firmware/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch"; sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1"; }) ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater"; + homepage = "https://gitlab.gnome.org/World/gnome-firmware"; description = "Tool for installing firmware on devices"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 897005fecaeb..da0f7c6e52c4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -446,6 +446,7 @@ mapAliases ({ gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06 + gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = celluloid; # Added 2019-08-22 gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0d13a19acc4..c8c15382cdc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15126,7 +15126,7 @@ with pkgs; gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; - gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {}; + gnome-firmware = callPackage ../applications/misc/gnome-firmware {}; gnome-usage = callPackage ../applications/misc/gnome-usage {}; From df30f5b75bdaae8dfd1316531c922277b22357f1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 14 Apr 2022 18:52:37 +0800 Subject: [PATCH 7/9] =?UTF-8?q?gnome-firmware:=203.34.0=20=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gnome-firmware/-/compare/3.34.0...3.36.0 https://gitlab.gnome.org/World/gnome-firmware/-/compare/3.36.0...41.0 https://gitlab.gnome.org/World/gnome-firmware/-/compare/41.0...42.1 --- .../misc/gnome-firmware/default.nix | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index d8b88031501f..f3e32f195fc0 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -1,46 +1,34 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab -, fetchpatch , appstream-glib , desktop-file-utils , fwupd , gettext , glib -, gtk3 -, libsoup +, gtk4 +, libadwaita , libxmlb , meson , ninja , pkg-config , systemd , help2man -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "gnome-firmware"; - version = "3.34.0"; + version = "42.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l"; + sha256 = "9QZ98EElENWsME/jXoj9YJl2e+ipyLm0g4grQUwmnuE="; }; - patches = [ - # Fixes manual build - (fetchpatch { - url = "https://gitlab.gnome.org/World/gnome-firmware/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch"; - sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/World/gnome-firmware/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch"; - sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1"; - }) - ]; - nativeBuildInputs = [ appstream-glib # for ITS rules desktop-file-utils @@ -49,14 +37,14 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ fwupd glib - gtk3 - libsoup + gtk4 + libadwaita libxmlb systemd ]; From ec548e26d54c74a73e01854d8b272a69e3659047 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 16 Apr 2022 14:42:56 +0100 Subject: [PATCH 8/9] driftctl: 0.28.0 -> 0.28.1 --- pkgs/applications/networking/cluster/driftctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 9a3a024d58d0..4b5f60b973b4 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "driftctl"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-sh4A3f6Wnq9yic2p42SEvoIXeh0dm8pQ0e/5Pr04koE="; + sha256 = "sha256-v6NtnCwIAqzlbtvwmWr39wauPxT0I/m5HOykQfmAexQ="; }; vendorSha256 = "sha256-2mAPOUAv0ORRCMxesmcwZZh9SCa12k94y/iiN/rzUbs="; From b94a4c22702f541ed9e098b8fb0db263fc24332b Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Sun, 17 Apr 2022 02:46:33 +0200 Subject: [PATCH 9/9] =?UTF-8?q?nixos/mininet:=20telnet=20=E2=86=92=20inetu?= =?UTF-8?q?tils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the usage of mininet on NixOS due to the replacement of the telnet package by inetutils. --- nixos/modules/programs/mininet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/mininet.nix b/nixos/modules/programs/mininet.nix index 6e90e7669ac6..2cf6c014c352 100644 --- a/nixos/modules/programs/mininet.nix +++ b/nixos/modules/programs/mininet.nix @@ -23,8 +23,8 @@ let ln -s ${pyEnv}/bin/mn $out/bin/mn # mn errors out without a telnet binary - # pkgs.telnet brings an undesired ifconfig into PATH see #43105 - ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet + # pkgs.inetutils brings an undesired ifconfig into PATH see #43105 + ln -s ${pkgs.inetutils}/bin/telnet $out/bin/telnet ''; in {