From 745dd2d18bdcbf1a8f175174b523e20341bbe579 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 27 Mar 2022 18:21:35 +0200 Subject: [PATCH 01/33] xprintidle: init at 0.2.4 --- pkgs/tools/X11/xprintidle/default.nix | 40 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/X11/xprintidle/default.nix diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix new file mode 100644 index 000000000000..8835d718333b --- /dev/null +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, xorg +}: + +stdenv.mkDerivation rec { + pname = "xprintidle"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "g0hl1n"; + repo = "xprintidle"; + rev = version; + sha256 = "sha256-CgjHTvwQKR/TPQyEWKxN5j97Sh2iec0BQPhC96sfyoI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + xorg.libXScrnSaver + xorg.libX11 + xorg.libXext + ]; + + meta = with lib; { + homepage = "https://github.com/g0hl1n/xprintidle"; + description = "A utility that queries the X server for the user's idle time and prints it to stdout"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ee3327e03c..3aeae7e9de86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11238,6 +11238,8 @@ with pkgs; xfstests = callPackage ../tools/misc/xfstests { }; + xprintidle = callPackage ../tools/X11/xprintidle {}; + xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; xscast = callPackage ../applications/video/xscast { }; From 219ca5845235c7481e48096e32b34aac78630d79 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 1 Apr 2022 17:49:38 +0100 Subject: [PATCH 02/33] gitUpdater: add explicit url parameter to specify a git tree for tags That way gitUpdater could be used to extract most recent published releases for .nix files that don't use git directly to define builds. An example is iproute2 package which does not have a single place to lookup most recent release. --- pkgs/common-updater/git-updater.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/git-updater.nix b/pkgs/common-updater/git-updater.nix index 304bad9af60c..edeb2dfb2c65 100644 --- a/pkgs/common-updater/git-updater.nix +++ b/pkgs/common-updater/git-updater.nix @@ -1,4 +1,5 @@ -{ genericUpdater +{ lib +, genericUpdater , common-updater-scripts }: @@ -9,9 +10,12 @@ , rev-prefix ? "" , odd-unstable ? false , patchlevel-unstable ? false +# explicit url is useful when git protocol is used only for tags listing +# while actual release is referred by tarball +, url ? null }: genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-git-tags"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${lib.optionalString (url != null) "--url=${url}"}"; } From cb79cf47f7624a46acbd964c207bdb4375a56bf7 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 4 Apr 2022 19:06:29 +0200 Subject: [PATCH 03/33] gscan2pdf: 2.12.5 -> 2.12.6 Also re-enabling a no-longer failing test. --- pkgs/applications/graphics/gscan2pdf/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 9d8ae0c8d35f..214688b56f89 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.5"; + version = "2.12.6"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - sha256 = "sha256-MFWW9DTJ/svtgN3fbw+zeGpgg3pgIoC9jZ1HkG5p6sc="; + sha256 = "sha256-9ntpUEM3buT3EhneXz9G8bibvzOnEK6Xt0jJcTvLKT0="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -111,8 +111,6 @@ perlPackages.buildPerlPackage rec { # # Looks like you failed 1 test of 1. # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t - # t/1604_import_multipage_DjVu.t ................ Dubious, test returned 255 (wstat 65280, 0xff00) - rm t/1604_import_multipage_DjVu.t # Disable a test which passes but reports an incorrect status # t/0601_Dialog_Scan.t .......................... All 14 subtests passed From 825c7d5938eb5c0f866474df4db4f074a5b31cc3 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 11 Apr 2022 18:42:29 +0300 Subject: [PATCH 04/33] dsq: pass version to the build Adopted from the way the package handles its version in releases: https://github.com/multiprocessio/dsq/blob/9a2da3c6d9f8db6b1e5c9209e0ddbe92d32c66d2/.github/workflows/releases.yml#L20 --- pkgs/tools/misc/dsq/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 72a38cf1eaf3..e70913114eb9 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -5,6 +5,7 @@ , runCommand , nix-update-script , dsq +, testVersion , diffutils }: @@ -23,10 +24,14 @@ buildGoModule rec { nativeBuildInputs = [ diffutils ]; + ldflags = [ "-X" "main.Version=${version}" ]; + passthru = { updateScript = nix-update-script { attrPath = pname; }; tests = { + version = testVersion { package = dsq; }; + pretty-csv = runCommand "${pname}-test" { } '' mkdir "$out" cat < "$out/input.csv" From 72ff0a0bf853da399322acad72f1910727b219c7 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 12 Apr 2022 02:27:03 +0530 Subject: [PATCH 05/33] openssh_hpn: 8.9p1 -> 9.0p1 --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 77277f20950b..d5d9a9e871b0 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "8.9p1"; + version = "9.0p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx"; + sha256 = "12m2f9czvgmi7akp7xah6y7mrrpi280a3ksk47iwr7hy2q1475q3"; }; extraPatches = [ From b817072297e6ad9ebc73637c1d0dff0804554759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 12 Apr 2022 11:07:55 +1000 Subject: [PATCH 06/33] ejson2env: add version The version needs to be specified using `ldflags` or the displayed version string is just "dev". --- pkgs/tools/admin/ejson2env/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index 9e873d467e1f..9cc65b4944ee 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -13,6 +13,10 @@ buildGoModule rec { vendorSha256 = "sha256-BY45WirK9AVhvFGB5uqI4dLxzO2WuNNhhJbQ6nsRXao="; + ldflags = [ + "-X main.version=${version}" + ]; + meta = with lib; { description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; homepage = "https://github.com/Shopify/ejson2env"; From 9ff1ab4037e2c20bb4ff11af452e4321d17edc99 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 11 Apr 2022 20:54:10 +0200 Subject: [PATCH 07/33] nixos/doc: add notes on additional drivers or firmware This describes how to build your own installer medium with some custom firmware/drivers, using an Intel MacBook as an example - on which WiFi doesn't work out of the box, due to it being nonfree. Fixes #15162. Co-authored-by: Lucas Hoffmann Co-authored-by: Robert Hensing --- .../development/building-nixos.chapter.md | 31 +++++++++++++++++ .../development/building-nixos.chapter.xml | 34 +++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/nixos/doc/manual/development/building-nixos.chapter.md b/nixos/doc/manual/development/building-nixos.chapter.md index 3310dee98f96..27d7e1d38553 100644 --- a/nixos/doc/manual/development/building-nixos.chapter.md +++ b/nixos/doc/manual/development/building-nixos.chapter.md @@ -30,6 +30,37 @@ To check the content of an ISO image, mount it like so: # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso ``` +## Additional drivers or firmware {#sec-building-image-drivers} + +If you need additional (non-distributable) drivers or firmware in the +installer, you might want to extend these configurations. + +For example, to build the GNOME graphical installer ISO, but with support for +certain WiFi adapters present in some MacBooks, you can create the following +file at `modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix`: + +```nix +{ config, ... }: + +{ + imports = [ ./installation-cd-graphical-gnome.nix ]; + + boot.initrd.kernelModules = [ "wl" ]; + + boot.kernelModules = [ "kvm-intel" "wl" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; +} +``` + +Then build it like in the example above: + +```ShellSession +$ git clone https://github.com/NixOS/nixpkgs.git +$ cd nixpkgs/nixos +$ export NIXPKGS_ALLOW_UNFREE=1 +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix +``` + ## Technical Notes {#sec-building-image-tech-notes} The config value enforcement is implemented via `mkImageMediaOverride = mkOverride 60;` diff --git a/nixos/doc/manual/from_md/development/building-nixos.chapter.xml b/nixos/doc/manual/from_md/development/building-nixos.chapter.xml index ad9349da0686..e7a76a6d715d 100644 --- a/nixos/doc/manual/from_md/development/building-nixos.chapter.xml +++ b/nixos/doc/manual/from_md/development/building-nixos.chapter.xml @@ -43,6 +43,40 @@ $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso + + +
+ Additional drivers or firmware + + If you need additional (non-distributable) drivers or firmware in + the installer, you might want to extend these configurations. + + + For example, to build the GNOME graphical installer ISO, but with + support for certain WiFi adapters present in some MacBooks, you + can create the following file at + modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix: + + +{ config, ... }: + +{ + imports = [ ./installation-cd-graphical-gnome.nix ]; + + boot.initrd.kernelModules = [ "wl" ]; + + boot.kernelModules = [ "kvm-intel" "wl" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; +} + + + Then build it like in the example above: + + +$ git clone https://github.com/NixOS/nixpkgs.git +$ cd nixpkgs/nixos +$ export NIXPKGS_ALLOW_UNFREE=1 +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix
From 682b3d03efb4abfa3e715ab7a6fb111d7d479081 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 12 Apr 2022 21:51:54 +0530 Subject: [PATCH 08/33] sickgear: 0.25.28 -> 0.25.31 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index ebe79b927761..4c2048000a64 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.28"; + version = "0.25.31"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "16d0yvsp9yp67q1clhjs77syd13bmfgbadxcc1x8yfrfvdy6v39l"; + sha256 = "11l537c7d6mrbvn24bfkzydb96mwzhr8z5rl6imiphjzr0f8qyyp"; }; dontBuild = true; From ee81903bdfe1c45cb9cdf137b2b2b27f51782b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Apr 2022 19:55:42 +0000 Subject: [PATCH 09/33] abcmidi: 2022.03.20 -> 2022.04.06 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 88fc66602459..b4a5420aa9c0 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.03.20"; + version = "2022.04.06"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-4PN4XL9Jx+vcT2QCA6GwomIqP7lRXkyBkRz641tephw="; + hash = "sha256-s1LFiwFXQsodQdGvgNy7pgXhsWYHw7lVhRXuNYHnvNQ="; }; meta = with lib; { From f87ed34bca7df09582a32df9be757f19a4b2e028 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Wed, 13 Apr 2022 21:42:51 +0800 Subject: [PATCH 10/33] gotktrix: 0.1.2 -> 0.1.3 --- .../networking/instant-messengers/gotktrix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index f44c05da5c01..9cab98156c81 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gotktrix"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K+q0sykdOMnAWypOXnwTU5oTokpYw61CTsAW1gIvGSQ="; + sha256 = "sha256-/UDXqN7FnFvbiXp3pID1WbNfCuKDsMrFQvL1101xxOo="; }; - vendorSha256 = "sha256-Br9KgUoN01yoGujgbj5UEoB57K87oEH/o40rrRtIZVY="; + vendorSha256 = "sha256-xA2DW4v6aT4fEW2WSa96oRr5Yrb2HoR054V1+BiWSvk="; buildInputs = [ gtk4 From 641257cc96ee8d12fc0fb5f541625e1939ecd700 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 Apr 2022 04:20:00 +0000 Subject: [PATCH 11/33] tldr: 1.4.2 -> 1.4.3 https://github.com/tldr-pages/tldr-c-client/releases/tag/v1.4.3 --- pkgs/tools/misc/tldr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 05d3026e76f4..141a6afb66b3 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tldr"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tldr-cpp-client"; rev = "v${version}"; - sha256 = "sha256-dsEqnHIs6vamdfLrkstRcV90tt7QcKIJwrPr+ksTVlQ="; + sha256 = "sha256-ZNUW2PebRUDLcZ2/dXClXqf8NUjgw6N73h32PJ8iwmM="; }; buildInputs = [ curl libzip ]; From c8c6adced1331844ea047dc921f4e9335dff85aa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 Apr 2022 04:20:00 +0000 Subject: [PATCH 12/33] tldr: install completions --- pkgs/tools/misc/tldr/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 141a6afb66b3..698236ada183 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config }: +{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config, installShellFiles }: stdenv.mkDerivation rec { pname = "tldr"; @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { }; buildInputs = [ curl libzip ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + installShellCompletion --cmd tldr autocomplete/complete.{bash,fish,zsh} + ''; + meta = with lib; { description = "Simplified and community-driven man pages"; longDescription = '' From 20f9d3e2ca5bf4d45396d2b3ed5dfc2bd275b330 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 16 Apr 2022 12:34:49 +0800 Subject: [PATCH 13/33] vivaldi: 5.1.2567.73-1 -> 5.2.2623.39-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 30d719593e83..87be80bda8ce 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.1.2567.73-1"; + version = "5.2.2623.39-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "04jzhipn4ip7x3zdwmfnp6w0qc2y1qdfy5w3qyy0r114jz9s9i7g"; + sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk"; }; unpackPhase = '' From db6e8b7538b6330d6aaa1c2fe437e2a1d0ca9ad9 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 16 Apr 2022 12:35:03 +0800 Subject: [PATCH 14/33] vivaldi-ffmepg-codecs: 97.0.4692.71 -> 101.0.4951.15 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 461fd0050cf1..c550c8cea25a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "97.0.4692.71"; + version = "101.0.4951.15"; src = fetchurl { - url = "https://launchpadlibrarian.net/579085093/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-YUv1D8U776NJBRPvYJigG7gyH9zd19FbnjAvIEhfYpA="; + url = "https://launchpadlibrarian.net/594594495/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-aelr/jODmgyVunSFFn6W+QHEmSWJeWzU4SaS5rjHli4="; }; buildInputs = [ dpkg ]; From 11aa76540c10a85759a1d4b7d4ebe03a51136c93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 04:40:01 +0000 Subject: [PATCH 15/33] haste-server: 3dcc43578b99dbafac35dece9d774ff2af39e8d0 -> 72863858338a57d54eb9dee55530e90ebbc22453 --- pkgs/servers/haste-server/default.nix | 4 ++-- pkgs/servers/haste-server/node-deps.nix | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/servers/haste-server/default.nix index 998d9c4235de..80f06bf4fa43 100644 --- a/pkgs/servers/haste-server/default.nix +++ b/pkgs/servers/haste-server/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haste-server"; - version = "3dcc43578b99dbafac35dece9d774ff2af39e8d0"; + version = "72863858338a57d54eb9dee55530e90ebbc22453"; src = fetchFromGitHub { owner = "toptal"; repo = "haste-server"; rev = version; - hash = "sha256-srSPRlG+gXSIwgVFLyfzRex97tCbV9FZXYpLD0KFRfw="; + hash = "sha256-MoEqpfihI3ZqSTHOxFbGziDv8khgq2Nd44YuKYDGflc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/haste-server/node-deps.nix b/pkgs/servers/haste-server/node-deps.nix index df902e8e18cd..fbb33a90c73f 100644 --- a/pkgs/servers/haste-server/node-deps.nix +++ b/pkgs/servers/haste-server/node-deps.nix @@ -22,13 +22,13 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; - "ansi-regex-3.0.0" = { + "ansi-regex-3.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"; + sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; }; }; "ansi-regex-5.0.1" = { @@ -499,13 +499,13 @@ let sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "growl-1.10.5" = { @@ -1341,11 +1341,11 @@ let name = "haste"; packageName = "haste"; version = "0.1.0"; - src = ../../../../../../../../nix/store/5pfi6mmmdlqm2ixww08p7mlqj9a2dwbz-source; + src = ../../../../../../../../../nix/store/jmii2np1kr78g0pnyf2y8wvj09nc1pr0-source; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."argparse-2.0.1" @@ -1412,7 +1412,7 @@ let sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."growl-1.10.5" sources."has-flag-4.0.0" sources."he-1.2.0" From 7062faa185108f3d609a2dc20c4c4b4cb4419293 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 10:15:36 +0000 Subject: [PATCH 16/33] python310Packages.pg8000: 1.24.1 -> 1.24.2 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 8653c28c878d..29ab17c8ba83 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.24.1"; + version = "1.24.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KRIixd39ZqP8DTIXAM9ZHIsPkw0vyEh3fWz8/1VEPOY="; + sha256 = "sha256-q3/ASKVvysTZwkeyKoNW5gjdmgPUg18ch/ui5PJihKU="; }; propagatedBuildInputs = [ From 9f4b7f2952d71eb2a8abd99d3d15c7e4ccd90aee Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sat, 16 Apr 2022 15:00:45 +0300 Subject: [PATCH 17/33] libpostal: mark supported on darwin --- pkgs/development/libraries/libpostal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix index d32cb2731a11..6b616a61d517 100644 --- a/pkgs/development/libraries/libpostal/default.nix +++ b/pkgs/development/libraries/libpostal/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openvenues/libpostal"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From d9d57d2053478dc5cfe9435e71bbc22485b39282 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 16 Apr 2022 14:02:55 +0200 Subject: [PATCH 18/33] yaru-theme: unstable-2022-04-07 -> 22.04.4 --- pkgs/data/themes/yaru/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index e2bc278299dd..18c471e4f96b 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "unstable-2022-04-07"; # 22.04.3.1 is broken + version = "22.04.4"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; - rev = "9bdbf66bf3718c6595c7a15ef4698ba471a36526"; - sha256 = "02f6m0jxnsczw3y7v7bqdihxa33sx2z93yn3j8w4z9r9fv2pn06b"; + rev = version; + sha256 = "sha256-EnlzjJDbiMIImn0XmiurK++JnD/kBqv4Mw6B/ps8d4Y="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From e91da70b45818a8b5bed647b490e7ba48346a5f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Apr 2022 14:17:06 +0200 Subject: [PATCH 19/33] python3Packages.astropy-extension-helpers: disable racy test https://github.com/astropy/extension-helpers/issues/43 --- .../python-modules/astropy-extension-helpers/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 90162d431caf..cb15acf88399 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -35,6 +35,11 @@ buildPythonPackage rec { "extension_helpers" ]; + disabledTests = [ + # https://github.com/astropy/extension-helpers/issues/43 + "test_write_if_different" + ]; + pythonImportsCheck = [ "extension_helpers" ]; From 5ed926eb38cc58138021719bb913ca2303f7d114 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 16 Apr 2022 14:05:01 +0100 Subject: [PATCH 20/33] trivy: 0.25.3 -> 0.26.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 4dbc1c96bb9f..c9595286173d 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.25.3"; + version = "0.26.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TRcGUjmhV5vP3c4VeGfRtV+Fcnl/09HIQ+ojfAFWdm8="; + sha256 = "sha256-Se42a9Q76LsMk6b04P2C2sWSZ2UgfnQrpJUC2gwdCwY="; }; - vendorSha256 = "sha256-3rJj+LDHQPYpYsU52kldFFpgS7Ry1n5Kjy0IAK6q/vU="; + vendorSha256 = "sha256-y/7KhDx6p+n6nvFHWcvGbvOWsXvvL81jOgfjxsL/JDg="; excludedPackages = "misc"; From b2f53084006be15f213f87fd2fc1739899869016 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 16 Apr 2022 15:19:03 +0200 Subject: [PATCH 21/33] nixos/doc: move "Building NixOS" into "Installation", not "Development" This section mostly describes how to build various installer images, so it fits better in that chapter. Proposed in https://github.com/NixOS/nixpkgs/pull/168306#discussion_r848329534 --- nixos/doc/manual/development/development.xml | 1 - .../{development => installation}/building-nixos.chapter.xml | 0 .../{development => installation}/building-nixos.chapter.md | 0 nixos/doc/manual/installation/installation.xml | 1 + 4 files changed, 1 insertion(+), 1 deletion(-) rename nixos/doc/manual/from_md/{development => installation}/building-nixos.chapter.xml (100%) rename nixos/doc/manual/{development => installation}/building-nixos.chapter.md (100%) diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 21286cdbd2b4..624ee3931659 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -14,7 +14,6 @@ - diff --git a/nixos/doc/manual/from_md/development/building-nixos.chapter.xml b/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml similarity index 100% rename from nixos/doc/manual/from_md/development/building-nixos.chapter.xml rename to nixos/doc/manual/from_md/installation/building-nixos.chapter.xml diff --git a/nixos/doc/manual/development/building-nixos.chapter.md b/nixos/doc/manual/installation/building-nixos.chapter.md similarity index 100% rename from nixos/doc/manual/development/building-nixos.chapter.md rename to nixos/doc/manual/installation/building-nixos.chapter.md diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index 1d443bbd0ee1..ba07d71d0ca3 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -14,4 +14,5 @@ + From 7d83997eb49f8098ac3dd2c1641d873bbba394c8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 5 Apr 2022 15:24:25 +0000 Subject: [PATCH 22/33] busybox: 1.34.1 -> 1.35.0 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 970129f97390..636a07edddfd 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -50,14 +50,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - version = "1.34.1"; + version = "1.35.0"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1"; + sha256 = "sha256-+u6yRMNaNIozT0pZ5EYm7ocPsHtohNaMEK6LwZ+DppQ="; }; hardeningDisable = [ "format" "pie" ] From b690d6aff3e62a4e43c658ed92e51f64e7177daf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 13:24:46 +0000 Subject: [PATCH 23/33] python310Packages.diff-cover: 6.4.5 -> 6.5.0 --- pkgs/development/python-modules/diff-cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 22435ae71ba5..1fc50c5ef232 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "6.4.5"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - sha256 = "sha256-qUuMHBfcJEmJF/con+ODtFfYrU7yo//KgKiSpByLWKY="; + sha256 = "sha256-N2O0/C75EGO6crUCFGUiJLLQqfMVRNVQRZb1xKhHzXs="; }; propagatedBuildInputs = [ From b01b9080bd892b1084515a46fe8507699d9272fa Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 16 Apr 2022 06:38:53 -0400 Subject: [PATCH 24/33] vector: 0.20.1 -> 0.21.0 --- pkgs/tools/misc/vector/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index c5b6cc96ea90..41279b1434db 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -21,16 +21,16 @@ # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*" # "disk-buffer" is using leveldb TODO: investigate how useful # it would be, perhaps only for massive scale? -, features ? ([ "sinks" "sources" "transforms" ] +, features ? ([ "sinks" "sources" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ lib.optionals enableKafka [ "rdkafka-plain" "rdkafka/dynamic_linking" ] + ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ] ++ lib.optional stdenv.targetPlatform.isUnix "unix") }: let pname = "vector"; - version = "0.20.1"; + version = "0.21.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0xC6CpmSTRt7zj6RHqtjbMXWEiMUOdIymWVGI8Js+70="; + sha256 = "sha256-ZhOtrv63ZhG3OEWLTk+VdZr6Y6f9KvyCJvAKWck7B7o="; }; - cargoSha256 = "sha256-NLMyE9+iYFWuMmL50TeLZVvlHkIDaSZYJwXK4ykGrb8="; + cargoSha256 = "sha256-VGB+ljojXGrQmcN0AT90hFk9h5nwjDTtzGpWmItw9x4="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -55,6 +55,9 @@ rustPlatform.buildRustPackage { TZDIR = "${tzdata}/share/zoneinfo"; + # needed to dynamically link rdkafka + CARGO_FEATURE_DYNAMIC_LINKING=1; + buildNoDefaultFeatures = true; buildFeatures = features; @@ -105,5 +108,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/timberio/vector"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ thoughtpolice happysalada ]; + platforms = with platforms; linux; }; } From 228209d60b661109fcea362de18594e7d9c8a2e5 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 16 Apr 2022 15:56:12 +0200 Subject: [PATCH 25/33] libnfc: 1.7.1 -> 1.8.0 https://github.com/nfc-tools/libnfc/blob/master/ChangeLog --- pkgs/development/libraries/libnfc/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 7e0d18115ef7..41d546723600 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }: +{ lib, stdenv, fetchFromGitHub, libusb-compat-0_1, readline, cmake, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libnfc"; - version = "1.7.1"; + version = "1.8.0"; - src = fetchurl { - url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2"; - sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; + src = fetchFromGitHub { + owner = "nfc-tools"; + repo = pname; + rev = "libnfc-${version}"; + sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ="; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libusb-compat-0_1 readline ]; configureFlags = [ "sysconfdir=/etc" ]; @@ -17,7 +20,7 @@ stdenv.mkDerivation { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; homepage = "https://github.com/nfc-tools/libnfc"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; } From fb73942a4e04861eb75d32435fef5ff70e956e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 22:32:32 -0500 Subject: [PATCH 26/33] qt5: inherit stdenv for modules and override gcc version for qt512 and qt514 --- pkgs/development/libraries/qt-5/5.12/default.nix | 2 +- pkgs/development/libraries/qt-5/5.14/default.nix | 2 +- pkgs/development/libraries/qt-5/5.15/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 ++++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 01b65eb3e43a..2b8dccf162c9 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -146,7 +146,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 8afff5f0a4b9..b95d49fef876 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -144,7 +144,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5943a80a701e..763bfc675cbe 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -101,7 +101,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00110a4e0674..3c7bafc39f53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19839,19 +19839,25 @@ with pkgs; qt512 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.12) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; + stdenv = if stdenv.cc.isGNU + then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) + else stdenv; }); qt514 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.14) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; inherit bison cups dconf harfbuzz libGL perl gtk3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; + stdenv = if stdenv.cc.isGNU + then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) + else stdenv; }); qt515 = recurseIntoAttrs (makeOverridable From 9028cd4effb3beeef7064cedb5ed75db51c15ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 23:47:01 -0500 Subject: [PATCH 27/33] cjdns: add extra `-Wno-error` for gcc11 --- pkgs/tools/networking/cjdns/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index b68eaeabd633..5fa39f6281b9 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -15,7 +15,14 @@ stdenv.mkDerivation rec { # for flock lib.optional stdenv.isLinux util-linux; - CFLAGS = "-O2 -Wno-error=stringop-truncation"; + NIX_CFLAGS_COMPILE = [ + "-O2" + "-Wno-error=array-bounds" + "-Wno-error=stringop-overflow" + "-Wno-error=stringop-overread" + "-Wno-error=stringop-truncation" + ]; + buildPhase = lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; From 91ffe81b174d2d7faf40404f77b7747dc7c3dda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 23:49:27 -0500 Subject: [PATCH 28/33] coan: use `-std=c++11` flag for gcc11 and later --- pkgs/development/tools/analysis/coan/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 3ef6c2b84590..b7261705545c 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + enableParallelBuilding = true; postInstall = '' From a8b50d73b2450fcaa181ae53076f538355af3d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 23:56:27 -0500 Subject: [PATCH 29/33] deliantra: refactor and override stdenv --- .../deliantra/{deliantra-arch.nix => arch.nix} | 0 .../deliantra/{deliantra-data.nix => data.nix} | 0 pkgs/games/deliantra/default.nix | 10 ---------- .../deliantra/{deliantra-maps.nix => maps.nix} | 0 .../deliantra/{deliantra-server.nix => server.nix} | 4 ++++ pkgs/top-level/all-packages.nix | 14 ++++++++++++-- 6 files changed, 16 insertions(+), 12 deletions(-) rename pkgs/games/deliantra/{deliantra-arch.nix => arch.nix} (100%) rename pkgs/games/deliantra/{deliantra-data.nix => data.nix} (100%) delete mode 100644 pkgs/games/deliantra/default.nix rename pkgs/games/deliantra/{deliantra-maps.nix => maps.nix} (100%) rename pkgs/games/deliantra/{deliantra-server.nix => server.nix} (99%) diff --git a/pkgs/games/deliantra/deliantra-arch.nix b/pkgs/games/deliantra/arch.nix similarity index 100% rename from pkgs/games/deliantra/deliantra-arch.nix rename to pkgs/games/deliantra/arch.nix diff --git a/pkgs/games/deliantra/deliantra-data.nix b/pkgs/games/deliantra/data.nix similarity index 100% rename from pkgs/games/deliantra/deliantra-data.nix rename to pkgs/games/deliantra/data.nix diff --git a/pkgs/games/deliantra/default.nix b/pkgs/games/deliantra/default.nix deleted file mode 100644 index 76a06c960187..000000000000 --- a/pkgs/games/deliantra/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -pkgs: - -let - callPackage = pkgs.callPackage; -in { - deliantra-server = callPackage ./deliantra-server.nix {}; - deliantra-arch = callPackage ./deliantra-arch.nix {}; - deliantra-maps = callPackage ./deliantra-maps.nix {}; - deliantra-data = callPackage ./deliantra-data.nix {}; -} diff --git a/pkgs/games/deliantra/deliantra-maps.nix b/pkgs/games/deliantra/maps.nix similarity index 100% rename from pkgs/games/deliantra/deliantra-maps.nix rename to pkgs/games/deliantra/maps.nix diff --git a/pkgs/games/deliantra/deliantra-server.nix b/pkgs/games/deliantra/server.nix similarity index 99% rename from pkgs/games/deliantra/deliantra-server.nix rename to pkgs/games/deliantra/server.nix index e333b7a472f5..4185a46120e5 100644 --- a/pkgs/games/deliantra/deliantra-server.nix +++ b/pkgs/games/deliantra/server.nix @@ -23,16 +23,20 @@ stdenv.mkDerivation rec { autoconf perl gperf optipng pngnq rsync imagemagick pkg-config makeWrapper ]; + propagatedBuildInputs = perl-deps; + buildInputs = [ blitz boost glib ]; hardeningDisable = [ "format" ]; + patches = [ ./0001-abs.patch ./0002-datadir.patch ]; + postFixup = '' wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00110a4e0674..bc6a84fd8ce8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31121,8 +31121,18 @@ with pkgs; cuyo = callPackage ../games/cuyo { }; - inherit (import ../games/deliantra pkgs) - deliantra-server deliantra-arch deliantra-maps deliantra-data; + deliantra-server = callPackage ../games/deliantra/server.nix { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; + deliantra-arch = callPackage ../games/deliantra/arch.nix { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; + deliantra-maps = callPackage ../games/deliantra/maps.nix { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; + deliantra-data = callPackage ../games/deliantra/data.nix { + stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv; + }; ddnet = callPackage ../games/ddnet { }; From 8c5a58144d5d5e81af9be0078a490cf44a19f45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 15 Apr 2022 13:40:36 -0500 Subject: [PATCH 30/33] =?UTF-8?q?fast-downward:=2019.12=20=E2=86=92=2021.1?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../science/logic/fast-downward/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index ece9367e30bd..cfde70315708 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -1,16 +1,24 @@ -{ stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, python3 +, osi +, cplex +}: stdenv.mkDerivation { - version = "19.12"; pname = "fast-downward"; + version = "21.12.0"; - src = fetchhg { - url = "http://hg.fast-downward.org/"; - rev = "41688a4f16b3"; - sha256 = "08m4k1mkx4sz7c2ab7xh7ip6b67zxv7kl68xrvwa83xw1yigqkna"; + src = fetchFromGitHub { + owner = "aibasel"; + repo = "downward"; + rev = "release-21.12.0"; + sha256 = "sha256-qc+SaUpIYm7bnOZlHH2mdvUaMBB+VRyOCQM/BOoOaPE="; }; - nativeBuildInputs = [ cmake which ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ python3 python3.pkgs.wrapPython osi ]; cmakeFlags = From 5275050ab037eef4dc8e358c7907c931f78c5d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 16 Apr 2022 00:09:03 -0500 Subject: [PATCH 31/33] fityk: add `-std=c++11` flag for gcc11 and later --- pkgs/applications/science/misc/fityk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index a3d6e1564666..6bc65e644b21 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline gnuplot swig3 ]; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + meta = { description = "Curve fitting and peak fitting software"; license = lib.licenses.gpl2; From 3795a2f70718f775048904fac400e569f07c8441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 16 Apr 2022 00:09:33 -0500 Subject: [PATCH 32/33] flatcc: add two `-Wno-error` for compilation on gcc11 and later --- pkgs/development/libraries/flatcc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 6b40814119c6..488cb6846d08 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=misleading-indentation" + "-Wno-error=stringop-overflow" + ]; + meta = { description = "FlatBuffers Compiler and Library in C for C "; homepage = "https://github.com/dvidelabs/flatcc"; From 2151e9af9cbed96a1353ec8964446a47204d62b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 16 Apr 2022 11:31:48 -0500 Subject: [PATCH 33/33] archiveopteryx: fix build on aarch64 by conditioning `-Wno-error` flag --- pkgs/servers/mail/archiveopteryx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 85a0756a1188..2bcd87c3b84d 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -21,13 +21,14 @@ stdenv.mkDerivation rec { ''; # fix build on gcc7+ and gcc11+ - NIX_CFLAGS_COMPILE = builtins.toString [ + NIX_CFLAGS_COMPILE = [ "-std=c++11" # c++17+ has errors "-Wno-error=builtin-declaration-mismatch" "-Wno-error=deprecated-copy" "-Wno-error=implicit-fallthrough" - "-Wno-error=mismatched-new-delete" "-Wno-error=nonnull" + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-Wno-error=mismatched-new-delete" ]; buildPhase = ''jam "-j$NIX_BUILD_CORES" '';