From e1c47b01030714b4aa0992d715475c108417f807 Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 23 Dec 2019 22:27:50 +0100 Subject: [PATCH 01/88] restya-board: further fix for functionality --- nixos/modules/services/web-apps/restya-board.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 9d0a3f65253..16ad5cdfcd6 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -285,7 +285,7 @@ in sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php" '' else '' sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${cfg.database.host}');/g" "${runDir}/server/php/config.inc.php" - sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'file_get_contents(${cfg.database.passwordFile})'"});/g" "${runDir}/server/php/config.inc.php + sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'${builtins.replaceStrings ["\n"] [""] (builtins.readFile cfg.database.passwordFile)}');/g"}" "${runDir}/server/php/config.inc.php" ''} sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${toString cfg.database.port}');/g" "${runDir}/server/php/config.inc.php" sed -i "s/^.*'R_DB_NAME'.*$/define('R_DB_NAME', '${cfg.database.name}');/g" "${runDir}/server/php/config.inc.php" @@ -305,9 +305,9 @@ in mkdir -m 0750 -p "${cfg.dataDir}/client/img" cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media" cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img" - chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" + chown "${cfg.user}":"${cfg.group}" "${cfg.dataDir}" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/media" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/client/img" ${optionalString (cfg.database.host == null) '' if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then From 80a72807e7d32d5176b1734accb867cd43da95c4 Mon Sep 17 00:00:00 2001 From: nek0 Date: Wed, 25 Dec 2019 07:23:27 +0100 Subject: [PATCH 02/88] restya-board: change password read-in to cat --- nixos/modules/services/web-apps/restya-board.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 16ad5cdfcd6..249fd29ec5f 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -285,7 +285,7 @@ in sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php" '' else '' sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${cfg.database.host}');/g" "${runDir}/server/php/config.inc.php" - sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'${builtins.replaceStrings ["\n"] [""] (builtins.readFile cfg.database.passwordFile)}');/g"}" "${runDir}/server/php/config.inc.php" + sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'$(cat ${cfg.database.passwordFile})');/g"}" "${runDir}/server/php/config.inc.php" ''} sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${toString cfg.database.port}');/g" "${runDir}/server/php/config.inc.php" sed -i "s/^.*'R_DB_NAME'.*$/define('R_DB_NAME', '${cfg.database.name}');/g" "${runDir}/server/php/config.inc.php" From ca88e5a03aeb0b09ae1e750e39176e7ecd5e66ed Mon Sep 17 00:00:00 2001 From: nek0 Date: Wed, 25 Dec 2019 07:23:57 +0100 Subject: [PATCH 03/88] restya-board: require postgresql service only on local database --- nixos/modules/services/web-apps/restya-board.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 249fd29ec5f..1ddda93fd47 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -266,8 +266,8 @@ in serviceConfig.RemainAfterExit = true; wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "network.target" "postgresql.service" ]; + requires = if cfg.database.host == null then [] else [ "postgresql.service" ]; + after = [ "network.target" ] ++ (if cfg.database.host == null then [] else [ "postgresql.service" ]); script = '' rm -rf "${runDir}" From 221dee65480573d890b1e7c7bdb7c0b55d811eeb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 27 Feb 2022 15:12:05 +0100 Subject: [PATCH 04/88] bloat: init at unstable-2022-03-31 --- pkgs/servers/bloat/default.nix | 42 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/servers/bloat/default.nix diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix new file mode 100644 index 00000000000..bea2f705449 --- /dev/null +++ b/pkgs/servers/bloat/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchgit +, unstableGitUpdater +}: + +buildGoModule { + pname = "bloat"; + version = "unstable-2022-03-31"; + + src = fetchgit { + url = "git://git.freesoftwareextremist.com/bloat"; + rev = "a38d29a43592601d37d671db8748f0980071c0c4"; + sha256 = "sha256-7Hxt0QlOYMBMvDS40fpfSItGkd5nYFQmmjJIevNyeF8="; + }; + + vendorSha256 = null; + + postInstall = '' + mkdir -p $out/share/bloat + cp -r templates $out/share/bloat/templates + cp -r static $out/share/bloat/static + sed \ + -e "s%=templates%=$out/share/bloat/templates%g" \ + -e "s%=static%=$out/share/bloat/static%g" \ + < bloat.conf > $out/share/bloat/bloat.conf.example + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A web client for Pleroma and Mastodon"; + longDescription = '' + A lightweight web client for Pleroma and Mastodon. + Does not require JavaScript to display text, images, audio and videos. + ''; + homepage = "https://bloat.freesoftwareextremist.com"; + downloadPage = "https://git.freesoftwareextremist.com/bloat/"; + license = licenses.cc0; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bb6b6c348b..097e7866cf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21201,6 +21201,8 @@ with pkgs; bird = callPackage ../servers/bird { }; + bloat = callPackage ../servers/bloat { }; + bosun = callPackage ../servers/monitoring/bosun { }; cayley = callPackage ../servers/cayley { }; From 73135fb85dea9c796207ac1aba95b27c870263d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 2 May 2022 16:45:44 +0200 Subject: [PATCH 05/88] nixos/nebula: Always restart Without this, if the network goes down for a while, systemd will give up after 5 restarts: Scheduled restart job, restart counter is at 5. Stopped Nebula VPN service for myvpn. nebula@myvpn.service: Start request repeated too quickly. Failed with result 'exit-code'. Failed to start Nebula VPN service for myvpn. Most network services need this, but for VPNs it's extra important. --- nixos/modules/services/networking/nebula.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index de4439415cf..c83cd9d521c 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -192,6 +192,7 @@ in Group = networkId; }) ]; + unitConfig.StartLimitIntervalSec = 0; # ensure Restart=always is always honoured (networks can go down for arbitrarily long) }; }) enabledNetworks); From 49945f07ccfc3dcd36ccb66a5ae37569c80e40e9 Mon Sep 17 00:00:00 2001 From: ners Date: Thu, 12 May 2022 09:32:43 +0200 Subject: [PATCH 06/88] installation-cd: add more guest tools to graphical installation base --- .../installer/cd-dvd/installation-cd-graphical-base.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 0e4feba2282..9017eab358f 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -35,8 +35,13 @@ with lib; # Enable sound in graphical iso's. hardware.pulseaudio.enable = true; - # Spice guest additions + # VM guest additions to improve host-guest interaction services.spice-vdagentd.enable = true; + services.qemuGuest.enable = true; + virtualisation.virtualbox.guest.enable = true; + virtualisation.vmware.guest.enable = true; + virtualisation.hypervGuest.enable = true; + services.xe-guest-utilities.enable = true; # Enable plymouth boot.plymouth.enable = true; From 82a5a605899ff4b3bf4567c1e3e87eb19a131b16 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 12 May 2022 22:42:48 +0100 Subject: [PATCH 07/88] dirt: pull fix pending upstream inclusion for -fno-common toolchains Without the change build fails on -fno-common toolchains like upstream gcc-10: ld: audio.o:/home/slyfox/dev/git/Dirt/audio.h:55: multiple definition of `delays'; dirt.o:/home/slyfox/dev/git/Dirt/audio.h:55: first defined here --- pkgs/applications/audio/dirt/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index a456d62e6f6..9d9c5c869f7 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libsndfile, libsamplerate, liblo, libjack2 }: stdenv.mkDerivation { pname = "dirt"; @@ -10,6 +10,15 @@ stdenv.mkDerivation { sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n"; fetchSubmodules = true; }; + patches = [ + # Pull patch pending upstream inclusion for upstream gcc-10 support: + # https://github.com/tidalcycles/Dirt/pull/65 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/tidalcycles/Dirt/commit/43fd267745d486228c4185b4fcbd7d9fbc362cc2.patch"; + sha256 = "08r34ylzs31wwf0la995pb149ccq0vr7qg4792pkhca57zi0bff8"; + }) + ]; buildInputs = [ libsndfile libsamplerate liblo libjack2 ]; postPatch = '' sed -i "s|./samples|$out/share/dirt/samples|" dirt.c From 3fc4607b5eeff24fe5f1e0d9c53850b4c14f3655 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 13 May 2022 12:12:39 +0200 Subject: [PATCH 08/88] plasma5Packages.kimageformats: enable HEIF/HEIC --- .../development/libraries/kde-frameworks/kimageformats.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 86026bf50f4..cbdaf1da892 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ilmbase, karchive, openexr, libavif, qtbase + ilmbase, karchive, openexr, libavif, libheif, qtbase }: let inherit (lib) getDev; in @@ -10,9 +10,12 @@ mkDerivation { pname = "kimageformats"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive openexr libavif qtbase ]; + buildInputs = [ karchive openexr libavif libheif qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; + cmakeFlags = [ + "-DKIMAGEFORMATS_HEIF=ON" + ]; meta = with lib; { broken = versionOlder qtbase.version "5.14"; From aee00ac405cbafc234e6b8f0b5e60f9cb5d9914e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 May 2022 14:08:29 +0200 Subject: [PATCH 09/88] =?UTF-8?q?jasmin-compiler:=2021.0=20=E2=86=92=20202?= =?UTF-8?q?2.04.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/jasmin-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index dbacda5c479..140de424519 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "21.0"; + version = "2022.04.0"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - sha256 = "sha256:1px17fpc00gca5ayfcr4k008srkyw120c25rnyf7cgzfs1gpylj2"; + sha256 = "sha256:0yf3lp469m8jdpqmqq3sw3h8l3psrzdp134wp3l1q31j3akskn2s"; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; From dac345515807018ee89d46b510073788b4ba7cf4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 13 May 2022 21:03:00 +0100 Subject: [PATCH 10/88] disk_indicator: unstable-2014-05-19 -> unstable-2018-12-18 Among other things pull in fix fo r-fno-common toolchains. --- .../linux/disk-indicator/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 44dd19b27df..f5c7f3bc774 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -2,31 +2,40 @@ stdenv.mkDerivation { pname = "disk-indicator"; - version = "unstable-2014-05-19"; + version = "unstable-2018-12-18"; src = fetchFromGitHub { owner = "MeanEYE"; repo = "Disk-Indicator"; - rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; - sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI="; + rev = "ec2d2f6833f038f07a72d15e2d52625c23e10b12"; + sha256 = "sha256-cRqgIxF6H1WyJs5hhaAXVdWAlv6t22BZLp3p/qRlCSM="; }; buildInputs = [ libX11 ]; - patchPhase = '' - substituteInPlace ./makefile --replace "COMPILER=c99" "COMPILER=gcc -std=c99" - substituteInPlace ./makefile --replace "COMPILE_FLAGS=" "COMPILE_FLAGS=-O2 " + postPatch = '' + # avoid -Werror + substituteInPlace Makefile --replace "-Werror" "" + # avoid host-specific options + substituteInPlace Makefile --replace "-march=native" "" ''; - buildPhase = "make -f makefile"; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + postConfigure = '' + patchShebangs ./configure.sh + ./configure.sh --all + ''; - hardeningDisable = [ "fortify" ]; + makeFlags = [ + "COMPILER=${stdenv.cc.targetPrefix}cc" + ]; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp ./disk_indicator "$out/bin/" + + runHook postInstall ''; meta = { From a45936728a83cca77573b21a4d0cef79b898d689 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 09:54:30 +0100 Subject: [PATCH 11/88] egoboo: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: mad.o:(.bss+0x233800): multiple definition of `tile_dict'; camera.o:(.bss+0x140): first defined here --- pkgs/games/egoboo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 506868efe31..4023eccec44 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation rec { ''; */ + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: mad.o:(.bss+0x233800): multiple definition of `tile_dict'; camera.o:(.bss+0x140): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + NIX_LDFLAGS = "-lm"; meta = { From d45dfee2d6b24ac6317cd7ae7f5e688a10657962 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 10:27:58 +0100 Subject: [PATCH 12/88] eukleides: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: eukleides_build/triangle.o:(.bss+0x28): multiple definition of `A'; eukleides_build/quadrilateral.o:(.bss+0x18): first defined here --- pkgs/applications/science/math/eukleides/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 0c3ef25909b..507fa081529 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -32,6 +32,12 @@ lib.fix (eukleides: stdenv.mkDerivation rec { --replace '$(SHARE_DIR)/texmf' "$tex" ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: eukleides_build/triangle.o:(.bss+0x28): multiple definition of `A'; + # eukleides_build/quadrilateral.o:(.bss+0x18): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preInstall = '' mkdir -p $out/bin ''; From e098c562b306d2fcb3121e289d03e320930829bd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 16:40:33 +0100 Subject: [PATCH 13/88] gpg-mdp: pull patch pending upstream inclusion for -fno-common toolchains Without the change build fails as: ld: editor.o:(.bss+0x8): multiple definition of `cfg_character_set'; config.o:(.bss+0x20): first defined here ld: editor.o:(.bss+0x10): multiple definition of `cfg_character_count'; config.o:(.data+0x10): first defined here --- pkgs/applications/misc/gpg-mdp/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index 48c7c7724eb..08ab2a5b7d9 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, ncurses, gnupg }: +{ fetchurl, fetchpatch, lib, stdenv, ncurses, gnupg }: let version = "0.7.4"; in stdenv.mkDerivation { @@ -14,6 +14,15 @@ in stdenv.mkDerivation { url = "https://tamentis.com/projects/mdp/files/mdp-${version}.tar.gz"; sha256 = "04mdnx4ccpxf9m2myy9nvpl9ma4jgzmv9bkrzv2b9affzss3r34g"; }; + patches = [ + # Pull fix pending upstream inclusion for -fno-common toolchain support: + # https://github.com/tamentis/mdp/pull/9 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/tamentis/mdp/commit/95c77de3beb96dc7c76ff36d3f3dfb18411d7c54.patch"; + sha256 = "1j6yvjzkx31b758yav4arhlm5ig7phl8mgx4fcwj7lm2pfvzwcsz"; + }) + ]; buildInputs = [ ncurses ]; prePatch = '' substituteInPlace ./configure \ From 85b0aa8d4d4a1c4c252573ef72440acc6de595d7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 17:55:30 +0100 Subject: [PATCH 14/88] grafx2: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here --- pkgs/applications/graphics/grafx2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index df570008b0f..48e97e7dbb3 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { preBuild = "cd src"; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of + # `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preInstall = '' mkdir -p "$out" ''; installPhase = ''make install prefix="$out"''; From 128d1385b0b77c8dad4dcb93af6b6cddda9a8ccd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 May 2022 18:26:29 +0100 Subject: [PATCH 15/88] hping: pull patch pending upstream inclusion for -fno-common toolchain support Without the change build fails against upstream gcc-10 as: ld: scan.o:/build/source/hping2.h:360: multiple definition of `delaytable'; main.o:/build/source/hping2.h:360: first defined here --- pkgs/tools/networking/hping/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 97b45c64ee2..33663a44d2a 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libpcap, withTcl ? true, tcl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libpcap, withTcl ? true, tcl }: stdenv.mkDerivation rec { pname = "hping"; @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { rev = "3547c7691742c6eaa31f8402e0ccbb81387c1b99"; # there are no tags/releases sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain + # support: https://github.com/antirez/hping/pull/64 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/antirez/hping/pull/64/commits/d057b9309aec3a5a53aaee1ac3451a8a5b71b4e8.patch"; + sha256 = "0bqr7kdlziijja588ipj8g5hv2109wq01c6x2qadbhjfnsps1b6l"; + }) + ]; buildInputs = [ libpcap ] ++ lib.optional withTcl tcl; From b10eac1b232f2e08f4ccc90aaea1fa4a25523437 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Sat, 14 May 2022 22:43:38 -0300 Subject: [PATCH 16/88] Zettlr: 2.2.5 -> 2.2.6 --- pkgs/applications/misc/zettlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index d80c8d03bf4..097edbcdb80 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.5"; + version = "2.2.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-KP3lt0CweT1f/BR3IpnjwCqNvhFbrpz9KLg6K8OMs+I="; + sha256 = "sha256-f01WLxp8fe7y2EwTUhpPqcRuWBs/9lMaAAOdybmHB5M="; }; appimageContents = appimageTools.extractType2 { inherit name src; From 058fae42a9503f5ba27493738d018ff0709c21a0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 May 2022 10:44:06 +0100 Subject: [PATCH 17/88] iftop: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: tui.o:/build/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; iftop.o:/build/iftop-1.0pre4/ui_common.h:41: first defined here --- pkgs/tools/networking/iftop/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index abdb7d05b28..137ce03b252 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: tui.o:/build/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; + # iftop.o:/build/iftop-1.0pre4/ui_common.h:41: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + passthru.tests = { inherit (nixosTests) iftop; }; meta = with lib; { From 1b8cc52931949616df3292a8f4bb3677d99fa9f7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 May 2022 10:48:34 +0100 Subject: [PATCH 18/88] iouyap: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: netmap.o:(.bss+0x20): multiple definition of `sizecheck'; iouyap.o:(.bss+0x20): first defined here --- pkgs/tools/networking/iouyap/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix index 2367261b522..0b3c8007af6 100644 --- a/pkgs/tools/networking/iouyap/default.nix +++ b/pkgs/tools/networking/iouyap/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: netmap.o:(.bss+0x20): multiple definition of `sizecheck'; iouyap.o:(.bss+0x20): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installPhase = '' install -D -m555 iouyap $out/bin/iouyap; ''; From 6372948d4b936229acfbc6c015058babe981f488 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 May 2022 13:28:29 +0100 Subject: [PATCH 19/88] jamin: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here --- pkgs/applications/audio/jamin/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 2bd23b821f1..70cb4d7f110 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ] ++ (with perlPackages; [ perl XMLParser ]); + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of + # `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + NIX_LDFLAGS = "-ldl"; postInstall = '' From 50b95670d2922b2f8c30a6c39a8d36fa093314fa Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 May 2022 16:11:07 +0100 Subject: [PATCH 20/88] jfsutils: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: extract.o:/build/jfsutils-1.1.15/fscklog/extract.c:67: multiple definition of `xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here --- pkgs/tools/filesystems/jfsutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 290bc313910..52b8fc4c3c2 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libuuid ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: extract.o:/build/jfsutils-1.1.15/fscklog/extract.c:67: multiple definition of + # `xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + meta = with lib; { description = "IBM JFS utilities"; homepage = "http://jfs.sourceforge.net"; From e58ce95275ecb4db0b544892f0983309ccc13b3d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 May 2022 17:01:22 +0100 Subject: [PATCH 21/88] kmscube: pull upstream fix for -fno-common toolchains Without the change build against upstream gcc-10 fails as: ld: kmscube-cube-tex.o:/build/kmscube-9dcce71/cube-tex.c:48: multiple definition of `gl'; kmscube-cube-smooth.o:/build/kmscube-9dcce71/cube-smooth.c:40: first defined here --- pkgs/os-specific/linux/kmscube/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 53b4cd60fb1..b9da3790170 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: +{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: stdenv.mkDerivation { pname = "kmscube"; @@ -10,6 +10,15 @@ stdenv.mkDerivation { sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933"; }; + patches = [ + # Pull upstream patch for -fno-common toolchains. + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitlab.freedesktop.org/mesa/kmscube/-/commit/908ef39864442c0807954af5d3f88a3da1a6f8a5.patch"; + sha256 = "1gxn3b50mvjlc25234839v5z29r8fd9di4176a3yx4gbsz8cc5vi"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libdrm libX11 libGL mesa ]; From 578e075e1a4e7c457c0032efff958622d18d341c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 May 2022 17:12:05 +0100 Subject: [PATCH 22/88] lcdproc: pull upstream fix for fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: iface.o:(.bss+0x0): multiple definition of `iface'; main.o:(.bss+0x60): first defined here --- pkgs/servers/monitoring/lcdproc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index bd0a7dc0dfb..949be34b80b 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , makeWrapper , pkg-config @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { patches = [ ./hardcode_mtab.patch + + # Pull upstream fix for -fno-common toolchains: + # https://github.com/lcdproc/lcdproc/pull/148 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/lcdproc/lcdproc/commit/fda5302878692da933dc03cd011f8ddffefa07a4.patch"; + sha256 = "0ld6p1r4rjsnjr63afw3lp5lx25jxjs07lsp9yc3q96r91r835cy"; + }) ]; # we don't need to see the GPL every time we launch lcdd in the foreground From c4a2a468408348237712f003e09be7b0f7588a5e Mon Sep 17 00:00:00 2001 From: Jens Nolte Date: Sun, 15 May 2022 20:56:53 +0200 Subject: [PATCH 23/88] =?UTF-8?q?networkmanager:=201.36.4=20=E2=86=92=201.?= =?UTF-8?q?38.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 86195ba8692..5dc59f9590f 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.36.4"; + version = "1.38.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "YTBOk33ZJkcdVnFb3t57q3zKyCc1bmfycA00MxfNPFk="; + sha256 = "sha256-gqTPB93+sIFnh7Z8D1BYrmxQ1iWcCwVBok41FWBisu8="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From 3458d4cf89e2f789197c7e3dbf2e3fd0f052ba1b Mon Sep 17 00:00:00 2001 From: ners Date: Mon, 16 May 2022 12:34:55 +0200 Subject: [PATCH 24/88] installation-cd: remove broken virtualbox module --- .../cd-dvd/installation-cd-graphical-base.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 9017eab358f..5bf06cb3d17 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -36,12 +36,14 @@ with lib; hardware.pulseaudio.enable = true; # VM guest additions to improve host-guest interaction - services.spice-vdagentd.enable = true; - services.qemuGuest.enable = true; - virtualisation.virtualbox.guest.enable = true; - virtualisation.vmware.guest.enable = true; - virtualisation.hypervGuest.enable = true; - services.xe-guest-utilities.enable = true; + services.spice-vdagentd.enable = mkDefault true; + services.qemuGuest.enable = mkDefault true; + virtualisation.vmware.guest.enable = mkDefault true; + virtualisation.hypervGuest.enable = mkDefault true; + services.xe-guest-utilities.enable = mkDefault true; + # The VirtualBox guest additions rely on an out-of-tree kernel module + # which lags behind kernel releases, potentially causing broken builds. + virtualisation.virtualbox.guest.enable = mkDefault false; # Enable plymouth boot.plymouth.enable = true; From b8135edb7c65729a21adc70c5dd63c3d20140bcb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 16 May 2022 17:47:47 +0100 Subject: [PATCH 25/88] bluez-tools: unstable-2016-12-12 -> unstable-2020-10-24 Has a few fixes. Among other things fixes upstream gcc-10 build failure: ld: bt-agent.o:(.bss+0x0): multiple definition of `agent_need_unregister'; lib/agent-helper.o:(.bss+0x0): first defined here --- pkgs/tools/bluetooth/bluez-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index dfb7147d08e..af76991436f 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -2,14 +2,14 @@ , fetchFromGitHub, glib, pkg-config }: stdenv.mkDerivation rec { - version = "unstable-2016-12-12"; + version = "unstable-2020-10-24"; pname = "bluez-tools"; src = fetchFromGitHub { owner = "khvzak"; repo = "bluez-tools"; - rev = "97efd293491ad7ec96a655665339908f2478b3d1"; - sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6"; + rev = "f65321736475429316f07ee94ec0deac8e46ec4a"; + sha256 = "0xk39lz3hm8lcnb5fdbfz4ldbbq8gswg95vilzdwxzrglcr6xnqq"; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From fb4fc93a3eacab755184924ae7bbb3d1e28e5575 Mon Sep 17 00:00:00 2001 From: ners Date: Tue, 17 May 2022 10:36:59 +0200 Subject: [PATCH 26/88] Remove mkDefault --- .../cd-dvd/installation-cd-graphical-base.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 5bf06cb3d17..8c7bac6f6cc 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -36,14 +36,14 @@ with lib; hardware.pulseaudio.enable = true; # VM guest additions to improve host-guest interaction - services.spice-vdagentd.enable = mkDefault true; - services.qemuGuest.enable = mkDefault true; - virtualisation.vmware.guest.enable = mkDefault true; - virtualisation.hypervGuest.enable = mkDefault true; - services.xe-guest-utilities.enable = mkDefault true; + services.spice-vdagentd.enable = true; + services.qemuGuest.enable = true; + virtualisation.vmware.guest.enable = true; + virtualisation.hypervGuest.enable = true; + services.xe-guest-utilities.enable = true; # The VirtualBox guest additions rely on an out-of-tree kernel module # which lags behind kernel releases, potentially causing broken builds. - virtualisation.virtualbox.guest.enable = mkDefault false; + virtualisation.virtualbox.guest.enable = false; # Enable plymouth boot.plymouth.enable = true; From 4ae5670eaa7dce6e82d5e0a5b49a97ac7023ccce Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 17 May 2022 23:33:48 +0800 Subject: [PATCH 27/88] rust-analyzer: 2022-05-02 -> 2022-05-17 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index acacdcefb41..ce07a3973f9 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-05-02"; - cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ="; + version = "2022-05-17"; + cargoSha256 = "sha256-H0nuS56mvo5YUAUOsEnR4Cv3iFKixoHK83BcM1PFMA8="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA="; + sha256 = "sha256-vrVpgQYUuJPgK1NMb1nxlCdxjoYo40YkUbZpH2Z2mwM="; }; patches = [ From 3d2fd9ab51f74e113aa6a5a704676b4fe3854df1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 17 May 2022 16:50:37 +0100 Subject: [PATCH 28/88] lsh: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: liblsh.a(unix_user.o):/build/lsh-2.0.4/src/server_userauth.h:108: multiple definition of `server_userauth_none_preauth'; lshd.o:/build/lsh-2.0.4/src/server_userauth.h:108: first defined here --- pkgs/tools/networking/lsh/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 5893579b1a7..07f0524d5f4 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -31,7 +31,12 @@ stdenv.mkDerivation rec { export lsh_cv_sys_unix98_ptys=yes ''; - NIX_CFLAGS_COMPILE = "-std=gnu90"; + # -fcommon: workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: liblsh.a(unix_user.o):/build/lsh-2.0.4/src/server_userauth.h:108: multiple definition of + # `server_userauth_none_preauth'; lshd.o:/build/lsh-2.0.4/src/server_userauth.h:108: first defined here + # Should be present in upcoming 2.1 release. + NIX_CFLAGS_COMPILE = "-std=gnu90 -fcommon"; buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ]; From 3286faa7e5e4ee65468521cf61d0da654dd2890b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 17 May 2022 16:57:10 +0100 Subject: [PATCH 29/88] matchbox: pull upstream fix fo -fno-common toolchains Without thce change build fails on upstream gcc-10 as: ld: mbtheme.o:/build/matchbox-window-manager-1.2/src/structs.h:229: multiple definition of `MBAtomEnum'; main.o:/build/matchbox-window-manager-1.2/src/structs.h:229: first defined here --- .../applications/window-managers/matchbox/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 51bb3010d33..f12ed0ea0a7 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { pname = "matchbox"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1"; }; + patches = [ + # Pull upstream fix for -fno-common tollchains: + (fetchpatch { + name = "fno-common.patch"; + url = "https://git.yoctoproject.org/matchbox-window-manager/patch/?id=844f61069896fe3f549ab425d731c061028f697c"; + sha256 = "1md2s7q094hn4gzg21pfyz8d426y07d5rbx2icas9nvc8jj7bwfc"; + }) + ]; + meta = { description = "X window manager for non-desktop embedded systems"; homepage = "https://www.yoctoproject.org/software-item/matchbox/"; From 178aaa60f1d179a4351f7d8f5b5403bc1d756992 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 18 May 2022 01:27:46 +0800 Subject: [PATCH 30/88] rust-analyzer: add tests with neovim --- .../tools/rust/rust-analyzer/default.nix | 7 ++- .../rust/rust-analyzer/test-neovim-lsp.nix | 49 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index ce07a3973f9..861a4075990 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, callPackage , fetchFromGitHub , rustPlatform , CoreServices @@ -54,7 +55,11 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + # FIXME: Pass overrided `rust-analyzer` once `buildRustPackage` also implements #119942 + tests.neovim-lsp = callPackage ./test-neovim-lsp.nix { }; + }; meta = with lib; { description = "A modular compiler frontend for the Rust language"; diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix new file mode 100644 index 00000000000..6782a7418a6 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix @@ -0,0 +1,49 @@ +{ runCommandNoCC, cargo, neovim, rust-analyzer, rustc }: +runCommandNoCC "test-neovim-rust-analyzer" { + nativeBuildInputs = [ cargo neovim rust-analyzer rustc ]; + + testRustSrc = /* rust */ '' + fn main() { + let mut var = vec![None]; + var.push(Some("hello".to_owned())); + } + ''; + + nvimConfig = /* lua */ '' + vim.lsp.buf_attach_client(vim.api.nvim_get_current_buf(), vim.lsp.start_client({ + cmd = { "rust-analyzer" }, + handlers = { + ["$/progress"] = function(_, msg, ctx) + if msg.token == "rustAnalyzer/Indexing" and msg.value.kind == "end" then + vim.cmd("goto 23") -- let mut |var =... + vim.lsp.buf.hover() + end + end, + ["textDocument/hover"] = function(_, msg, ctx) + -- Keep newlines. + io.write(msg.contents.value) + vim.cmd("q") + end, + }, + on_error = function(code) + print("error: " .. code) + vim.cmd("q") + end + })) + ''; + +} '' + # neovim requires a writable HOME. + export HOME="$(pwd)" + + cargo new --bin test-rust-analyzer + cd test-rust-analyzer + cat <<<"$testRustSrc" >src/main.rs + cat <<<"$nvimConfig" >script.lua + + # `-u` doesn't work + result="$(nvim --headless +'lua dofile("script.lua")' src/main.rs)" + echo "$result" + [[ "$result" == *"var: Vec>"* ]] + touch $out +'' From 1a02999d5d802d72040bace983c4efe93752bcd0 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 17 May 2022 22:25:04 -0400 Subject: [PATCH 31/88] krane: fix build by updating dependencies jsonpath v1.1.1 was revoked from rubygems ``` error: cannot download jsonpath-1.1.1.gem from any mirror ``` --- pkgs/applications/networking/cluster/krane/Gemfile.lock | 4 ++-- pkgs/applications/networking/cluster/krane/gemset.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index ba7e5bb0a63..e886f40c8a5 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -60,7 +60,7 @@ GEM ffi-compiler (>= 1.0, < 2.0) i18n (1.10.0) concurrent-ruby (~> 1.0) - jsonpath (1.1.1) + jsonpath (1.1.2) multi_json jwt (2.3.0) krane (2.4.6) diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 058910072a7..3c18789c095 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; + sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -276,10 +276,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0slr38w21gwizkq4nk6c7l7lcqc2c733zfn5fq1pmbwy5bwiggad"; + sha256 = "0fkdjic88hh0accp0sbx5mcrr9yaqwampf5c3214212d4i614138"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; jwt = { groups = ["default"]; From 6e4887ce07549f95e88742712969e6a153dc337c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 May 2022 04:20:00 +0000 Subject: [PATCH 32/88] lab: 0.24.0 -> 0.25.0 --- .../version-management/git-and-tools/lab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 8f4acbc3fc4..d73d1d13bde 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "lab"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "sha256-sw00D/PJaLAPHoPdJC2WYUNklIzMbc/bXt2jlQZ7E90="; + sha256 = "sha256-7AUhH2aBRpsjUzZQGE2fHDOa1k0rMUfZJqUEKZXpJuM="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-FwnVMH//GwFbi+llFF6XNqrZX2hRB4r51p8TRz2vN+g="; + vendorSha256 = "sha256-ChysquNuUffcM3qaWUdqu3Av33gnKkdlotEoFKoedA0="; doCheck = false; From 87eb72f1c3452171a93a760841050c2cdcbb1c7d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 May 2022 04:20:00 +0000 Subject: [PATCH 33/88] dua: 2.17.1 -> 2.17.5 --- pkgs/tools/misc/dua/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index d7f3eafe3ec..097aee5f068 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.17.1"; + version = "2.17.5"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-58l0E5wwRKbF/ja3fmMMBIONjuwVOxlwdKRT5BeO9MQ="; + sha256 = "sha256-dpkUbZz/bIiTMhZalXHGct77qMzYB6LATs7MPVyW1GY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,13 +18,14 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-nft0wrgTMrI8Tav6NcqPwSF8Q367twIOr1voBsW2488="; + cargoSha256 = "sha256-xBiabY0aGPxrAHypuSg3AF/EcChDgtIK9cJDCeTNkm0="; doCheck = false; meta = with lib; { description = "A tool to conveniently learn about the disk usage of directories, fast!"; homepage = "https://github.com/Byron/dua-cli"; + changelog = "https://github.com/Byron/dua-cli/raw/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ killercup ]; }; From d25d89dbe42d94ae24c7838146905537aca78f3d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 18 May 2022 07:54:37 +0100 Subject: [PATCH 34/88] yubikey-personalization: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: ./.libs/libykpers_args.a(ykpers-args.o):/build/ykpers-1.20.0/ykpers-args.h:36: multiple definition of `usage'; ykpersonalize.o:/build/ykpers-1.20.0/ykpers-args.h:36: first defined here --- pkgs/tools/misc/yubikey-personalization/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 59739e06aa0..f8583f36140 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { url = "https://github.com/Yubico/yubikey-personalization/commit/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch"; sha256 = "1wnigf3hbq59i15kgxpq3pwrl1drpbj134x81mmv9xm1r44cjva8"; }) + + # Pull upstream fix for -fno-common toolchain support: + # https://github.com/Yubico/yubikey-personalization/issues/155 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/Yubico/yubikey-personalization/commit/09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch"; + sha256 = "0n3ka8n7f3ndbxv3k0bi77d850kr2ypglkw81gqycpqyaciidqwa"; + }) ]; nativeBuildInputs = [ pkg-config ]; From 4e4ffb73e83b10212df42562db00108f8c195e0f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 18 May 2022 08:01:16 +0100 Subject: [PATCH 35/88] ympd: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: CMakeFiles/ympd.dir/src/mpd_client.c.o:(.bss+0x0): multiple definition of `mpd'; CMakeFiles/ympd.dir/src/ympd.c.o:(.bss+0x20): first defined here --- pkgs/applications/audio/ympd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 38c05276be4..218204d690a 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -18,11 +18,18 @@ stdenv.mkDerivation rec { sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq"; }; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: CMakeFiles/ympd.dir/src/mpd_client.c.o:(.bss+0x0): multiple definition of `mpd'; + # CMakeFiles/ympd.dir/src/ympd.c.o:(.bss+0x20): first defined here + # Should be fixed by pending https://github.com/notandy/ympd/pull/191 (does not apply as is). + NIX_CFLAGS_COMPILE = "-fcommon"; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libmpdclient openssl ]; meta = with lib; { - homepage = "https://www.ympd.org"; + homepage = "https://github.com/notandy/ympd"; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; maintainers = [ maintainers.siddharthist ]; platforms = platforms.unix; From 8d8d1103f9853972e3c7e47120f5becc94e2cab4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 18 May 2022 08:13:17 +0100 Subject: [PATCH 36/88] yeahwm: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here --- pkgs/applications/window-managers/yeahwm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix index 3cf997c22c2..25a25a06ad9 100644 --- a/pkgs/applications/window-managers/yeahwm/default.nix +++ b/pkgs/applications/window-managers/yeahwm/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { prefix="${placeholder "out"}" ) ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + postInstall = '' gzip -9 --stdout yeahwm.1 > yeahwm.1.gz install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/ From 12f04ef16e8588c5c2797811b2b21b4dddee670c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 18 May 2022 08:32:06 +0100 Subject: [PATCH 37/88] yap: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: libYap.a(pl-dtoa.o):/build/yap-6.3.3/H/pl-yap.h:230: multiple definition of `ATOM_'; libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here --- pkgs/development/compilers/yap/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 4428d4dbba6..10ba3c55901 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tabling=yes" ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; + # -fcommon: workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: libYap.a(pl-dtoa.o):/build/yap-6.3.3/H/pl-yap.h:230: multiple definition of `ATOM_'; + # libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here + NIX_CFLAGS_COMPILE = "-fpermissive -fcommon"; meta = { homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; From 84db863eb50be1ba1ad4abc5b44bf6782152ec2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 May 2022 10:55:01 +0200 Subject: [PATCH 38/88] esphome: 2022.4.0 -> 2022.5.0 https://github.com/esphome/esphome/releases/tag/2022.5.0 --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 1f101735e98..52ec2688103 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20220309.0"; + version = "20220508.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J/T3Av0jwT0CJSwc0j+YjaiKFqs9soLf7ctpiz5rmm4="; + sha256 = "sha256-nBVVNe6Qwo72ws6G8WAO99f2ftbxoixOB0eiLuILyeg="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 3ce65eb2038..6eba2ca9446 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.4.0"; + version = "2022.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-/IMiUMtWFouAjOlyq+BXvqQ1IddBXvua7y0i4J1cktM="; + sha256 = "sha256-ys4oGYZvOxKOLyeIFPR33L2uCAB1lybSo6nCIYFuA/0="; }; postPatch = '' From f1ea4a53a2a0a20d24410b8733c67c4474f5cee4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 May 2022 10:55:54 +0200 Subject: [PATCH 39/88] python3Packages.aioesphomeapi: 10.8.2 -> 10.10.0 https://github.com/esphome/aioesphomeapi/releases/tag/v10.9.0 https://github.com/esphome/aioesphomeapi/releases/tag/v10.10.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 06389d50677..9d6d3f2d56d 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.8.2"; + version = "10.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zvilMBx9H2VDmu13IiAiCqXEGkbpAJpGnt4Ea7FlGVI="; + sha256 = "sha256-j1YYzyOLuH+COBDXJUpkUx8H2K8F5tC5LB8ysZKi6oI="; }; propagatedBuildInputs = [ From ce7ebe6ccac19cfd215a8a1991f437c4ebafd652 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 18 May 2022 14:32:17 +0100 Subject: [PATCH 40/88] agate: 3.2.3 -> 3.2.4 --- pkgs/servers/gemini/agate/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index ae198707ec5..2240536021d 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: +{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nkWk/0TIAHcYQjxbg0HnT+4S4Cinl22WfqHb9U6u5eI="; + sha256 = "sha256-NyHs/9kRBGqmh44MSRzYb7CSvEB0RlmL9l5QpGEwDhY="; }; - cargoSha256 = "sha256-aF86QpizJ+lMNmN9DQKA9o1QZWZObyQ3v3+HmT/s02g="; - - patches = [ - # https://github.com/mbrubeck/agate/pull/143 - (fetchpatch { - name = "fix-port-collision.patch"; - url = "https://github.com/mbrubeck/agate/commit/2f5d7878ec9d0dd51762c4c7680fc9f825d8ecd5.patch"; - sha256 = "sha256-NEFmfb0y97O2W96YggD+MgcN7tlFEi9T4FNzLCND77s="; - }) - ]; + cargoSha256 = "sha256-V0MLXOLLmKnk4Iyhbu+EomsxOX6RLYHIsi/IwWiqmcg="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 6d54fe622d9fb31c7c08c832522bf46ffb79ea27 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 15 May 2022 19:25:41 +0300 Subject: [PATCH 41/88] stdenv: start deprecating non-list configureFlags the motivation for this is to simplify stdenv and ease the job of reviewers due to them needing to tell contributors about the defacto rule that configureFlags should be a list of strings --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cfed6d197cf..ed457019c55 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -331,8 +331,8 @@ else let # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck configureFlags = let inherit (lib) optional elem; in - (/**/ if lib.isString configureFlags then [configureFlags] - else if configureFlags == null then [] + (/**/ if lib.isString configureFlags then lib.warn "String 'configureFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" [configureFlags] + else if configureFlags == null then lib.warn "Null 'configureFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" [] else configureFlags) ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" From cf7476804a3f29e446a5aece77e60b64d15182c5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 16 May 2022 21:46:33 +0300 Subject: [PATCH 42/88] treewide: convert string configureFlags to list of strings --- pkgs/applications/audio/ecasound/default.nix | 2 +- pkgs/applications/science/logic/alt-ergo/default.nix | 6 +++--- pkgs/development/ocaml-modules/stdcompat/default.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 108be8726c5..f23b11d1a67 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { strictDeps = true; CXXFLAGS = "-std=c++11"; - configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0"; + configureFlags = [ "--enable-liblilv" "--with-extra-cppflags=-Dnullptr=0" ]; postPatch = '' sed -i -e ' diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 096a648b4dd..0767c58bdea 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -17,7 +17,7 @@ in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; inherit version src useDune2; - configureFlags = pname; + configureFlags = [ pname ]; nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; @@ -26,7 +26,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; inherit version src useDune2; - configureFlags = pname; + configureFlags = [ pname ]; nativeBuildInputs = [ which ocamlPackages.menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); }; in @@ -35,7 +35,7 @@ ocamlPackages.buildDunePackage { inherit pname version src useDune2; - configureFlags = pname; + configureFlags = [ pname ]; nativeBuildInputs = [ which ocamlPackages.menhir ]; buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ]; diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index eae9b264ba1..3630be368e5 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # build fails otherwise enableParallelBuilding = false; - configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)"; + configureFlags = [ "--libdir=$(OCAMLFIND_DESTDIR)" ]; meta = { homepage = "https://github.com/thierry-martinez/stdcompat"; From a695081e681afd637643b6215e02079d85f10e5f Mon Sep 17 00:00:00 2001 From: lom Date: Wed, 18 May 2022 18:23:03 -0600 Subject: [PATCH 43/88] wiki-tui: 0.4.7 -> 0.4.8 --- pkgs/misc/wiki-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 1c954de3822..cc98cf46d07 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qoj5rg0YeBWQuU/HU84wOSG9y9p4Q1DFbqsh61mYnUc="; + sha256 = "sha256-/u0segKHrrtXfEjOmpnQ/iFbsM+VfsZKTpyc1IfuOU8="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-btSWvlObvn08cAWVMM4R0aciYz8swRFZjX+WDhALj3M="; + cargoSha256 = "sha256-3xvaEzqAz/U8CkdGYXLBnxrgW1raeKuzRsmD+0Sd4iQ="; # Tests fail with this error: `found argument --test-threads which was not expected` doCheck = false; From 4844d867d72b457feb59165f7511a05fa2d36121 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 18 May 2022 21:07:22 -0400 Subject: [PATCH 44/88] libmodsecurity: remove dependency on valgrind valgrind is only supported on certain platforms (it notably lacks support for armv6l), so needs to be excluded as a dependency on unsupported platforms. In this case, it turns out that valgrind is not currently used at all, so I removed it entirely. libmodsecurity can optionally use valgrind to run tests, but we don't run the tests at all. --- pkgs/tools/security/libmodsecurity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 4ba294e42f2..531f88333d0 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, bison, flex, pkg-config , curl, geoip, libmaxminddb, libxml2, lmdb, lua, pcre -, ssdeep, valgrind, yajl +, ssdeep, yajl , nixosTests }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; - buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre ssdeep valgrind yajl ]; + buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre ssdeep yajl ]; outputs = [ "out" "dev" ]; From 2f5a6ba4e2bd7a3039b204d3d16efdeb847e9903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 May 2022 02:39:42 +0000 Subject: [PATCH 45/88] python310Packages.peaqevcore: 0.0.23 -> 0.0.24 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 4b11263017d..956a91cd5b7 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.0.23"; + version = "0.0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z59TJ+P7WNMcTyevi4etWUFUnBJXAVhDOnO4GXjjuR0="; + hash = "sha256-rAC0NXkK18DmPiZJbqSZh5O0i6KvMpWvaANWyK3zMXQ="; }; postPatch = '' From b796a456351bfedc7545c48ecbbd68e0dc5fc99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 19 May 2022 08:21:03 +0200 Subject: [PATCH 46/88] python3Packages.deepdiff: fixup after incorrect update Commit 53466092b (PR #173429) forgot to update the source hash, and that's why it had to skip the test fixed upstream. --- pkgs/development/python-modules/deepdiff/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index cba0ac56396..c0519332342 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "v${version}"; - hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk="; + hash = "sha256-7eagu6lef5bc/4KU3y067LFOGtH6whda1ocBuRHS/kI="; }; postPatch = '' @@ -49,11 +49,6 @@ buildPythonPackage rec { pyyaml ]; - disabledTests = [ - # Assertion issue with the decimal places - "test_get_numeric_types_distance" - ]; - meta = with lib; { description = "Deep Difference and Search of any Python object/data"; homepage = "https://github.com/seperman/deepdiff"; From 0707d32c010679d588c1338dbb3a4ccf8f3411c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 08:40:47 +0200 Subject: [PATCH 47/88] python310Packages.gcsfs: 2022.01.0 -> 2022.3.0 --- pkgs/development/python-modules/gcsfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 518226f34dd..82791db5bcc 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2022.01.0"; + version = "2022.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = version; - hash = "sha256-wNeK1GdjK9GKaaECcFeBLjFf/h3MbLI5e4MX0UNoTqE="; + hash = "sha256-+Bchwsa8Jj7WBWbzyH+GQuqZki4EltMryumKt4Pm1es="; }; propagatedBuildInputs = [ From 7fa1359f5617674195a92f2ab2ec669806014b0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 May 2022 07:05:32 +0000 Subject: [PATCH 48/88] python310Packages.whois: 0.9.14 -> 0.9.15 --- pkgs/development/python-modules/whois/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index b2875819646..7f51e2c61ef 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.14"; + version = "0.9.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DannyCork"; repo = "python-whois"; - rev = version; - sha256 = "1df4r2pr356y1c2ys6pzdl93fmx9ci4y75xphc95xn27zvqbpvix"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Pfogvo0s678KHO85r4yopEaL4n/2cIY1+CnQu3iB8xc="; }; propagatedBuildInputs = [ From e1016a44b53f20e43059a5997bdca11827488e4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 09:36:18 +0200 Subject: [PATCH 49/88] python310Packages.ttp: use ttp-templates from modules --- .../python-modules/ttp-templates/default.nix | 28 +++++------------ .../python-modules/ttp/default.nix | 20 ++++++------ .../python-modules/ttp/templates.nix | 31 ------------------- 3 files changed, 17 insertions(+), 62 deletions(-) delete mode 100644 pkgs/development/python-modules/ttp/templates.nix diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index 46db94782be..45548ee21c2 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, netmiko -, pytestCheckHook -, python , pythonOlder -, ttp }: buildPythonPackage rec { @@ -22,24 +18,14 @@ buildPythonPackage rec { hash = "sha256-Qx+z/srYgD67FjXzYrc8xtA99n8shWK7yWj/r/ETN2U="; }; - propagatedBuildInputs = [ - ttp - ]; + postPatch = '' + # Drop circular dependency on ttp + substituteInPlace setup.py \ + --replace '"ttp>=0.6.0"' "" + ''; - checkInputs = [ - netmiko - pytestCheckHook - ]; - - pythonImportsCheck = [ - "ttp_templates" - ]; - - pytestFlagsArray = [ - # The other tests requires data which is no part of the source - "test/test_ttp_templates_methods.py" - "test/test_yang_openconfig_lldp.py" - ]; + # Circular dependency on ttp + doCheck = false; meta = with lib; { description = "Template Text Parser Templates collections"; diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 2157af31811..a484ed9f76a 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -1,22 +1,20 @@ { lib , buildPythonPackage -, callPackage -, fetchFromGitHub , cerberus , configparser , deepdiff +, fetchFromGitHub , geoip2 , jinja2 +, netmiko , openpyxl -, tabulate -, yangson , pytestCheckHook , pyyaml +, tabulate +, ttp-templates +, yangson }: -let - ttp_templates = callPackage ./templates.nix { }; -in buildPythonPackage rec { pname = "ttp"; version = "0.8.4"; @@ -26,7 +24,7 @@ buildPythonPackage rec { owner = "dmulyalin"; repo = pname; rev = version; - sha256 = "sha256-vuKlddqm8KirqAJyvBPfRb5Nw9zo4Fl1bwbfVMhmH9g="; + hash = "sha256-vuKlddqm8KirqAJyvBPfRb5Nw9zo4Fl1bwbfVMhmH9g="; }; propagatedBuildInputs = [ @@ -37,7 +35,7 @@ buildPythonPackage rec { geoip2 jinja2 # n2g unpackaged - # netmiko unpackaged + netmiko # nornir unpackaged openpyxl tabulate @@ -51,7 +49,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pyyaml - ttp_templates + ttp-templates ]; disabledTestPaths = [ @@ -87,6 +85,8 @@ buildPythonPackage rec { "test_TTP_CACHE_FOLDER_env_variable_usage" # requires additional network setup "test_child_group_do_not_start_if_no_parent_started" + # Assertion Error + "test_in_threads_parsing" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/ttp/templates.nix b/pkgs/development/python-modules/ttp/templates.nix deleted file mode 100644 index 835548d0784..00000000000 --- a/pkgs/development/python-modules/ttp/templates.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "ttp-templates"; - version = "0.1.1"; - format = "setuptools"; - - src = fetchPypi { - pname = "ttp_templates"; - inherit version; - sha256 = "0vg7k733i8jqnfz8mpq8kzr2l7b7drk29zkzik91029f6w7li007"; - }; - - # drop circular dependency on ttp - postPatch = '' - substituteInPlace setup.py --replace '"ttp>=0.6.0"' "" - ''; - - # circular dependency on ttp - doCheck = false; - - meta = with lib; { - description = "Template Text Parser Templates"; - homepage = "https://github.com/dmulyalin/ttp_templates"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} From 063298cdb1e691acb04a684a3e1d711a248ba3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 19 May 2022 09:49:12 +0200 Subject: [PATCH 50/88] wimboot: Mark platforms correctly There is no Darwin support at all --- pkgs/tools/misc/wimboot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index 67df4056b5f..bc43d77bbfb 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Windows Imaging Format bootloader"; license = licenses.gpl2Plus; maintainers = with maintainers; [ das_j ajs124 ]; - platforms = platforms.x86; # Fails on aarch64 + platforms = [ "x86_64-linux" ]; }; } From e041b2350b1b0e2d1ea603aa70d8beb70a15a4a5 Mon Sep 17 00:00:00 2001 From: Anillc Date: Mon, 9 May 2022 10:18:46 +0800 Subject: [PATCH 51/88] rtrlib: init at 0.8.0 --- pkgs/development/libraries/rtrlib/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/rtrlib/default.nix diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/development/libraries/rtrlib/default.nix new file mode 100644 index 00000000000..bb0aec308ae --- /dev/null +++ b/pkgs/development/libraries/rtrlib/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, stdenv, cmake, libssh, openssl }: + +stdenv.mkDerivation rec { + pname = "rtrlib"; + version = "0.8.0"; + + src = fetchFromGitHub { + repo = pname; + owner = "rtrlib"; + rev = "v${version}"; + sha256 = "sha256-ISb4ojcDvXY/88GbFMrA5V5+SGE6CmE5D+pokDTwotQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libssh openssl ]; + + meta = with lib; { + description = "An open-source C implementation of the RPKI/Router Protocol client"; + homepage = "https://github.com/rtrlib/rtrlib"; + license = licenses.mit; + maintainers = with maintainers; [ Anillc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ed6a5e2c3e..6b5b6e67c84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20292,6 +20292,8 @@ with pkgs; rinutils = callPackage ../development/libraries/rinutils { }; + rtrlib = callPackage ../development/libraries/rtrlib { }; + kissfft = callPackage ../development/libraries/kissfft { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { From 5481179b6ae1ceb13bdeea9eff9708c2ee9907ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 11 May 2022 13:18:17 +0200 Subject: [PATCH 52/88] nearcore: 1.25.0 -> 1.26.0 --- .../blockchains/nearcore/default.nix | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index f9f0bd0c69b..99fce14eff9 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -1,32 +1,45 @@ { rustPlatform, lib, fetchFromGitHub -, zlib, elfutils, openssl -, cmake, python3, pkg-config, protobuf, perl, llvmPackages +, zlib, openssl +, pkg-config, protobuf, llvmPackages }: rustPlatform.buildRustPackage rec { - #https://github.com/near/nearcore pname = "nearcore"; - version = "1.25.0"; + version = "1.26.0"; + + # https://github.com/near/nearcore/tags src = fetchFromGitHub { owner = "near"; repo = "nearcore"; # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-7hiBqJLGIf+kNKJvMQ7KtGZm/SWLY3pT7YDlwbm3HDM="; + sha256 = "sha256-N3A+hy5I1/yJ3IN9gDw3m1IZ9qK8LNhn3fuXLMn23bg="; }; - cargoSha256 = "sha256-EGv4CibSHL9oTAdWK7d/SOzZWPcEB16hTWlWHjKU4wc="; + cargoSha256 = "sha256-g07liit048TSL73wFyDK+eKu33Z6fPJcJ+VeGgTtuS8="; + + postPatch = '' + substituteInPlace neard/build.rs \ + --replace 'get_git_version()?' '"nix:${version}"' + ''; + + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + CARGO_PROFILE_RELEASE_LTO = "thin"; + NEAR_RELEASE_BUILD = "release"; + + OPENSSL_NO_VENDOR = 1; # we want to link to OpenSSL provided by Nix # don't build SDK samples that require wasm-enabled rust - cargoBuildFlags = [ "-p" "neard" ]; + buildAndTestSubdir = "neard"; doCheck = false; # needs network - buildInputs = [ zlib elfutils openssl ]; + buildInputs = [ + zlib + openssl + ]; + nativeBuildInputs = [ - cmake - python3 pkg-config protobuf - perl ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; @@ -35,7 +48,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Reference client for NEAR Protocol"; homepage = "https://github.com/near/nearcore"; - license = licenses.mit; + license = licenses.gpl3; maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; }; From bd41737ab4b4f26ade987b95679df8955dc37402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 11 May 2022 14:32:02 +0200 Subject: [PATCH 53/88] nearcore: mark as linux only for now macos support is feasible but requires some testing: https://github.com/ZentriaMC/neard-nix/blob/master/neard.nix#L23 --- pkgs/applications/blockchains/nearcore/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 99fce14eff9..09d4546356c 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -50,6 +50,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/near/nearcore"; license = licenses.gpl3; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; + # only x86_64 is supported in nearcore because of sse4+ support, macOS might + # be also possible + platforms = [ "x86_64-linux" ]; }; } From 8d2b8d0da3814e7cec25fb31292e4ade6981cb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 11 May 2022 15:47:03 +0200 Subject: [PATCH 54/88] nearcore: switch to fat lto --- pkgs/applications/blockchains/nearcore/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 09d4546356c..a5f9368b377 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; - CARGO_PROFILE_RELEASE_LTO = "thin"; + CARGO_PROFILE_RELEASE_LTO = "fat"; NEAR_RELEASE_BUILD = "release"; OPENSSL_NO_VENDOR = 1; # we want to link to OpenSSL provided by Nix @@ -42,6 +42,9 @@ rustPlatform.buildRustPackage rec { protobuf ]; + # fat LTO requires ~3.4GB RAM + requiredSystemFeatures = [ "big-parallel" ]; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include"; From 3eac5383b103b82dd27d2a6f3cf2067de44d8dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 May 2022 11:00:59 +0200 Subject: [PATCH 55/88] nearcore: add mikroskeem as a maintainer --- pkgs/applications/blockchains/nearcore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index a5f9368b377..264d53fc56a 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { description = "Reference client for NEAR Protocol"; homepage = "https://github.com/near/nearcore"; license = licenses.gpl3; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 mikroskeem ]; # only x86_64 is supported in nearcore because of sse4+ support, macOS might # be also possible platforms = [ "x86_64-linux" ]; From f7846451a1e1c75038c5a18172874222fc2948ea Mon Sep 17 00:00:00 2001 From: Anillc Date: Mon, 9 May 2022 10:27:22 +0800 Subject: [PATCH 56/88] frr: support rpki --- pkgs/servers/frr/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index 302c5a472bd..5e5cd767002 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -23,6 +23,7 @@ , pcre2 , python3 , readline +, rtrlib # tests , nettools @@ -62,6 +63,7 @@ stdenv.mkDerivation rec { pcre2 python3 readline + rtrlib ] ++ lib.optionals stdenv.isLinux [ libcap ]; @@ -78,6 +80,7 @@ stdenv.mkDerivation rec { "--localstatedir=/run/frr" "--sbindir=$(out)/libexec/frr" "--sysconfdir=/etc/frr" + "--enable-rpki" ]; postPatch = '' From 6958412083e6484942056348616e8da51fda1bda Mon Sep 17 00:00:00 2001 From: Anillc Date: Mon, 9 May 2022 10:34:52 +0800 Subject: [PATCH 57/88] nixos/frr: add extraOptions option Support passing options to daemons. For example, bgpd needs '-M rpki' to enable rpki functions. --- nixos/modules/services/networking/frr.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix index 45a82b9450a..98452123f03 100644 --- a/nixos/modules/services/networking/frr.nix +++ b/nixos/modules/services/networking/frr.nix @@ -106,6 +106,14 @@ let TCP Port to bind to for the VTY interface. ''; }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra options for the daemon. + ''; + }; }; in @@ -196,7 +204,8 @@ in PIDFile = "frr/${daemon}.pid"; ExecStart = "${pkgs.frr}/libexec/frr/${daemon} -f /etc/frr/${service}.conf" + optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}" - + optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}"; + + optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}" + + " " + (concatStringsSep " " scfg.extraOptions); ExecReload = "${pkgs.python3.interpreter} ${pkgs.frr}/libexec/frr/frr-reload.py --reload --daemon ${daemonName service} --bindir ${pkgs.frr}/bin --rundir /run/frr /etc/frr/${service}.conf"; Restart = "on-abnormal"; }; From 9a62cabbc7ae0808f746bc47f3564b671a1326b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 19 May 2022 10:04:26 +0200 Subject: [PATCH 58/88] nix-update: 0.5.0 -> 0.5.1 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index fd3b4a5a3e4..dd6cb2e5605 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-D1N7ISLZJ3A8G9X5dvtCbRse5h0MRJoeZM3CHkFpqlE="; + sha256 = "sha256-d2S18cBkFJOIGFKrwj9U4bRvdPjrbuWfRUVug1JEw0s="; }; makeWrapperArgs = [ From 3e3d98cbb3327d46963f2fa6639e3d08b5dc8406 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 19 May 2022 08:20:50 +0000 Subject: [PATCH 59/88] drawio-headless: extract from pandoc-drawio-filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This wrapper is useful independently of pandoc-drawio-filter — it's useful in any other situation in which somebody might want to use draw.io diagrams in a build process. So, make it accessible from the top level to facilitate reuse. --- .../applications/graphics/drawio/headless.nix | 36 +++++++++++++++++++ .../misc/pandoc-drawio-filter/default.nix | 23 ++---------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/graphics/drawio/headless.nix diff --git a/pkgs/applications/graphics/drawio/headless.nix b/pkgs/applications/graphics/drawio/headless.nix new file mode 100644 index 00000000000..c70511fa652 --- /dev/null +++ b/pkgs/applications/graphics/drawio/headless.nix @@ -0,0 +1,36 @@ +{ lib, writeTextFile, runtimeShell, drawio, xvfb-run }: + +writeTextFile { + name = "${drawio.pname}-headless-${drawio.version}"; + + executable = true; + destination = "/bin/drawio"; + text = '' + #!${runtimeShell} + + # Electron really wants a configuration directory to not die with: + # "Error: Failed to get 'appData' path" + # so we give it some temp dir as XDG_CONFIG_HOME + tmpdir=$(mktemp -d) + + function cleanup { + rm -rf "$tmpdir" + } + trap cleanup EXIT + + # Drawio needs to run in a virtual X session, because Electron + # refuses to work and dies with an unhelpful error message otherwise: + # "The futex facility returned an unexpected error code." + XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@ + ''; + + meta = with lib; { + description = "xvfb wrapper around drawio"; + longDescription = '' + A wrapper around drawio for running in headless environments. + Runs drawio under xvfb-run, with configuration going to a temporary + directory. + ''; + maintainers = with maintainers; [ qyliss tfc ]; + }; +} diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/tools/misc/pandoc-drawio-filter/default.nix index 1279296143c..73dd658dfb1 100644 --- a/pkgs/tools/misc/pandoc-drawio-filter/default.nix +++ b/pkgs/tools/misc/pandoc-drawio-filter/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication -, drawio +, drawio-headless , fetchFromGitHub , lib , pandoc @@ -21,32 +21,13 @@ let sha256 = "sha256-2XJSAfxqEmmamWIAM3vZqi0mZjUUugmR3zWw8Imjadk="; }; - wrappedDrawio = writeScriptBin "drawio" '' - #!${runtimeShell} - - # Electron really wants a configuration directory to not die with: - # "Error: Failed to get 'appData' path" - # so we give it some temp dir as XDG_CONFIG_HOME - tmpdir=$(mktemp -d) - - function cleanup { - rm -rf "$tmpdir" - } - trap cleanup EXIT - - # Drawio needs to run in a virtual X session, because Electron - # refuses to work and dies with an unhelpful error message otherwise: - # "The futex facility returned an unexpected error code." - XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@ - ''; - pandoc-drawio-filter = buildPythonApplication { pname = "pandoc-drawio-filter"; inherit src version; propagatedBuildInputs = [ - wrappedDrawio + drawio-headless pandocfilters ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cec2a41cd0d..19e61fdaf88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25860,6 +25860,7 @@ with pkgs; drawing = callPackage ../applications/graphics/drawing { }; drawio = callPackage ../applications/graphics/drawio {}; + drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { }; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { From 8038d830fad2505f7312ee789d5c516a43527683 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 19 May 2022 11:23:06 +0200 Subject: [PATCH 60/88] ares: 127 -> 128 --- pkgs/applications/emulators/bsnes/ares/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index c1597fe2c6e..4cc449ee49f 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config +, wrapGAppsHook , SDL2 , alsa-lib , gtk3 @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ares"; - version = "127"; + version = "128"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${version}"; - sha256 = "0rhq39w41j9yr1fkyfmf4n6fjxnq1cglj98rp4wys12kwqv7smvx"; + sha256 = "sha256-Ojf1kyColBK0S3DwXjGaAZSl0ljhgiXkfKC11BL2fEc="; }; patches = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config + wrapGAppsHook ]; buildInputs = [ From 499c5770045137879e9c057e061e55caf92d4826 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 17 May 2022 21:32:44 +0300 Subject: [PATCH 61/88] neofetch: update old nixos logo --- pkgs/tools/misc/neofetch/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 64632986638..729243cc9a0 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -4,7 +4,7 @@ stdenvNoCC.mkDerivation rec { pname = "neofetch"; - version = "unstable-2020-12-10"; + version = "unstable-2021-12-10"; src = fetchFromGitHub { owner = "dylanaraps"; @@ -19,6 +19,12 @@ stdenvNoCC.mkDerivation rec { sha256 = "1fapdg9z79f0j3vw7fgi72b54aw4brn42bjsj48brbvg3ixsciph"; name = "avoid_overwriting_gio_extra_modules_env_var.patch"; }) + # https://github.com/dylanaraps/neofetch/pull/2114 + (fetchpatch { + url = "https://github.com/dylanaraps/neofetch/commit/c4eb4ec7783bb94cca0dbdc96db45a4d965956d2.patch"; + sha256 = "sha256-F6Q4dUtfmR28VxLbITiLFJ44FjG4T1Cvuz3a0nLisMs="; + name = "update_old_nixos_logo.patch"; + }) ]; strictDeps = true; From db4a8eaaadcbca414a33c2f671901757e7435255 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 17 May 2022 21:39:06 +0300 Subject: [PATCH 62/88] neofetch: split man output --- pkgs/tools/misc/neofetch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 729243cc9a0..9a6d03c6dca 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -27,6 +27,8 @@ stdenvNoCC.mkDerivation rec { }) ]; + outputs = [ "out" "man" ]; + strictDeps = true; buildInputs = [ bash ]; nativeBuildInputs = [ makeWrapper ]; From 2c0b81666dbe761e567444ea6f6f587aac9fd55d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 May 2022 23:55:05 +0200 Subject: [PATCH 63/88] wiki-js: 2.5.279 -> 2.5.282 ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.280 ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.281 ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.282 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 496bf02bb03..6da2e3b3d03 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.279"; + version = "2.5.282"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-4QYNKvAEeRSJS9lO30bI/SnM9rLmuvRMR/LsGT77wvY="; + sha256 = "sha256-cXNO8ChZ2FGAmTmcQDqnZrJpFynmdoocqFy59VCy1RE="; }; sourceRoot = "."; From 9306977ecb2a9ed771aeeafd48baf00432a49dd4 Mon Sep 17 00:00:00 2001 From: Eliza <4576666+elizagamedev@users.noreply.github.com> Date: Thu, 19 May 2022 12:03:11 +0000 Subject: [PATCH 64/88] mujmap: init at 0.1.1 (#172648) Co-authored-by: Fabian Affolter --- maintainers/maintainer-list.nix | 6 ++++ .../networking/mujmap/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/applications/networking/mujmap/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 574ce1a9897..23049710aac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3662,6 +3662,12 @@ githubId = 103082; name = "Ed Brindley"; }; + elizagamedev = { + email = "eliza@eliza.sh"; + github = "elizagamedev"; + githubId = 4576666; + name = "Eliza Velasquez"; + }; elliot = { email = "hack00mind@gmail.com"; github = "Eliot00"; diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix new file mode 100644 index 00000000000..247a8d58954 --- /dev/null +++ b/pkgs/applications/networking/mujmap/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, notmuch +, stdenv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "mujmap"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "elizagamedev"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA="; + }; + + cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI="; + + buildInputs = [ + notmuch + ] ++ lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Bridge for synchronizing email and tags between JMAP and notmuch"; + homepage = "https://github.com/elizagamedev/mujmap/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ elizagamedev ]; + mainProgram = "mujmap"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d99d208f71..b8e46eeafce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7767,6 +7767,10 @@ with pkgs; mtail = callPackage ../servers/monitoring/mtail { }; + mujmap = callPackage ../applications/networking/mujmap { + inherit (darwin.apple_sdk.frameworks) Security; + }; + multitail = callPackage ../tools/misc/multitail { }; mx-puppet-discord = callPackage ../servers/mx-puppet-discord { }; From 007e4597994f1205a09d34bf2f562f256fb792fb Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Thu, 19 May 2022 14:11:21 +0200 Subject: [PATCH 65/88] treefmt: 0.3.0 -> 0.4.1 (#173603) --- pkgs/development/tools/treefmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index f9cef54564f..2ffbd4a1bed 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "sha256-PTT87Na4KpyN6a7T49vHHhSqSOF6JSWr5/jiys1Uzko="; + hash = "sha256-+EcqrmjZR8pkBiIXpdJ/KfmTm719lgz7oC9tH7OhJKY="; }; - cargoSha256 = "sha256-Gvr6Zjd9Gvn2CyjNHlJaKPFYUViPezRwoDBeVelRlkU="; + cargoSha256 = "sha256-DXsKUeSmNUIKPsvrLxkg+Kp78rEfjmJQYf2pj1LWW38="; meta = { description = "one CLI to format the code tree"; From 6878885f3faa24e20eaf5823da7b966ec41dbc80 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 12 May 2022 20:29:54 +0200 Subject: [PATCH 66/88] =?UTF-8?q?ocamlPackages.genspio:=200.0.2=20?= =?UTF-8?q?=E2=86=92=200.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/genspio/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index 963cd1dab13..44742cba04a 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -1,27 +1,19 @@ { lib, fetchFromGitHub, buildDunePackage -, nonstd, sosa +, base, fmt }: buildDunePackage rec { pname = "genspio"; - version = "0.0.2"; - - useDune2 = false; + version = "0.0.3"; src = fetchFromGitHub { owner = "hammerlab"; repo = pname; rev = "${pname}.${version}"; - sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x"; + sha256 = "sha256:1788cnn10idp5i1hggg4pys7k0w8m3h2p4xa42jipfg4cpj7shaf"; }; - minimalOCamlVersion = "4.03"; - - propagatedBuildInputs = [ nonstd sosa ]; - - configurePhase = '' - ocaml please.mlt configure - ''; + propagatedBuildInputs = [ base fmt ]; doCheck = true; From 2dcb64eefab1e3841b98b8256a2685a4a80a1009 Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Thu, 19 May 2022 14:34:33 +0200 Subject: [PATCH 67/88] cpp-ipfs-api: 2017-01-04 -> 2022-01-30, unbreak build, rename to cpp-ipfs-client-api (#173197) Co-authored-by: Sandro --- .../libraries/cpp-ipfs-api/default.nix | 28 --------------- .../cpp-ipfs-http-client/default.nix | 35 +++++++++++++++++++ .../unvendor-nlohmann-json.patch | 27 ++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 64 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/cpp-ipfs-api/default.nix create mode 100644 pkgs/development/libraries/cpp-ipfs-http-client/default.nix create mode 100644 pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix deleted file mode 100644 index 315a477e72a..00000000000 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: - -stdenv.mkDerivation { - pname = "cpp-ipfs-api"; - version = "2017-01-04"; - - src = fetchFromGitHub { - owner = "vasild"; - repo = "cpp-ipfs-api"; - rev = "96a890f4518665a56581a2a52311eaa65928eac8"; - sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl ]; - propagatedBuildInputs = [ nlohmann_json ]; - - NIX_CFLAGS_COMPILE = [ - "-Wno-error=range-loop-construct" - ]; - - meta = with lib; { - description = "IPFS C++ API client library"; - homepage = "https://github.com/vasild/cpp-ipfs-api"; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/pkgs/development/libraries/cpp-ipfs-http-client/default.nix new file mode 100644 index 00000000000..44fcbe5463c --- /dev/null +++ b/pkgs/development/libraries/cpp-ipfs-http-client/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: + +stdenv.mkDerivation { + pname = "cpp-ipfs-http-client"; + version = "unstable-2022-01-30"; + + src = fetchFromGitHub { + owner = "vasild"; + repo = "cpp-ipfs-http-client"; + rev = "3cdfa7fc6326e49fc81b3c7ca43ce83bdccef6d9"; + sha256 = "sha256-/oyafnk4SbrvoCh90wkZXNBjknMKA6EEUoEGo/amLUo="; + }; + + patches = [ ./unvendor-nlohmann-json.patch ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '# Fetch "JSON for Modern C++"' "include_directories(${nlohmann_json}/include)" + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl ]; + propagatedBuildInputs = [ nlohmann_json ]; + + NIX_CFLAGS_COMPILE = [ + "-Wno-error=range-loop-construct" + ]; + + meta = with lib; { + description = "IPFS C++ API client library"; + homepage = "https://github.com/vasild/cpp-ipfs-http-client"; + license = licenses.mit; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch new file mode 100644 index 00000000000..e21b4e9a7a7 --- /dev/null +++ b/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch @@ -0,0 +1,27 @@ +--- source/CMakeLists.txt ++++ source/CMakeLists.txt +@@ -56,11 +56,6 @@ target_include_directories(${IPFS_API_LIBNAME} + ) + + # Fetch "JSON for Modern C++" +-include(FetchContent) +-message(STATUS "Fetching nlohmann/JSON") +-# Retrieve Nlohmann JSON +-FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz) +-FetchContent_MakeAvailable(json) + + # libcurl requires additional libs only for static Windows builds + if(WIN32) +@@ -71,12 +66,11 @@ set_target_properties(${IPFS_API_LIBNAME} PROPERTIES + SOVERSION ${PROJECT_VERSION_MAJOR} + VERSION ${PROJECT_VERSION} + ) +-target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS} nlohmann_json::nlohmann_json) ++target_link_libraries(${IPFS_API_LIBNAME} ${CURL_LIBRARIES} ${WINDOWS_CURL_LIBS}) + if(NOT DISABLE_INSTALL) + install(TARGETS ${IPFS_API_LIBNAME} DESTINATION lib) + install(FILES include/ipfs/client.h DESTINATION include/ipfs) + install(FILES include/ipfs/http/transport.h DESTINATION include/ipfs/http) +- install(FILES ${json_SOURCE_DIR}/include/nlohmann/json.hpp DESTINATION include/nlohmann) + endif() + # Tests, use "CTEST_OUTPUT_ON_FAILURE=1 make test" to see output from failed tests diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eb5340740ef..b926e36bc9a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -170,6 +170,7 @@ mapAliases ({ cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11 ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22 + cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 # these are for convenience, not for backward compat and shouldn't expire diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8e46eeafce..0a6746b7c8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16887,7 +16887,7 @@ with pkgs; cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; - cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; + cpp-ipfs-http-client = callPackage ../development/libraries/cpp-ipfs-http-client { }; cpp-netlib = callPackage ../development/libraries/cpp-netlib { boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found From 64a6ffb999dd286b627be8eb52773791e7795c2e Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Thu, 19 May 2022 15:39:42 +0300 Subject: [PATCH 68/88] xmldiff: add dependency and change buildInputs to propagatedBuildInputs (#172839) --- pkgs/tools/text/xml/xmldiff/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/xmldiff/default.nix b/pkgs/tools/text/xml/xmldiff/default.nix index 5814435e111..d9dbd70b648 100644 --- a/pkgs/tools/text/xml/xmldiff/default.nix +++ b/pkgs/tools/text/xml/xmldiff/default.nix @@ -2,6 +2,7 @@ , buildPythonApplication , fetchFromGitHub , lxml +, setuptools , six }: @@ -16,8 +17,9 @@ buildPythonApplication rec { hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE="; }; - buildInputs = [ + propagatedBuildInputs = [ lxml + setuptools six ]; @@ -36,6 +38,6 @@ buildPythonApplication rec { readable diffs in those situations. ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres anpryl ]; }; } From 7606327ad35d68a54a21625737786af8015542c7 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 19 May 2022 08:42:59 -0400 Subject: [PATCH 69/88] python3.pkgs.phik: fix build (#172751) Co-authored-by: Dmitry Bogatov Co-authored-by: Sandro --- pkgs/development/python-modules/phik/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index 2919fb5c733..2e0dc2b8b26 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -15,12 +15,14 @@ , ninja , numba , pybind11 +, scikit-build }: buildPythonPackage rec { pname = "phik"; version = "0.12.2"; disabled = !isPy3k; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -50,10 +52,13 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ninja + scikit-build ]; + pythonImportCheck = [ "phik" ]; + postInstall = '' - rm -r $out/bin + rm -r $out/bin ''; meta = with lib; { From 18a66b67671802b90a825aed954e0b0fef69b854 Mon Sep 17 00:00:00 2001 From: lom Date: Thu, 19 May 2022 06:45:42 -0600 Subject: [PATCH 70/88] noisetorch: mark insecure --- pkgs/applications/audio/noisetorch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index d08991a916b..067263032b0 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -33,6 +33,8 @@ buildGoModule rec { ''; meta = with lib; { + insecure = true; + knownVulnerabilities = [ "https://github.com/lawl/NoiseTorch/releases/tag/0.11.6" ]; description = "Virtual microphone device with noise supression for PulseAudio"; homepage = "https://github.com/lawl/NoiseTorch"; license = licenses.gpl3Plus; From ab3f2c921410b01ca9d956a11cde26ef32390227 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 19 May 2022 14:21:10 +0100 Subject: [PATCH 71/88] deno: 1.21.3 -> 1.22.0 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 4291af81f40..eff2af506c9 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.21.3"; + version = "1.22.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0LjY5XBtR9uoxLOOFRebbSuH9chSdH1/9rtsY15NdCM="; + sha256 = "sha256-gragdn3ToOz/We+iVOrX/Fx0g7Zbb7RT5C/2K1+/spc="; }; - cargoSha256 = "sha256-8YldzUO9Jysu0w2NvGWDIr2eIWcrX9ALUodYwIykt64="; + cargoSha256 = "sha256-+lNrkOCiC9WT0hbuUBCTaFCsVWJVbp/up2iov3MMt8o="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index e1a9b0de753..f736120c416 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.42.0"; + version = "0.42.1"; shas = { - x86_64-linux = "sha256-p8wC2r9+PKEabaHj0NF059TBSKOpE+rtZkqk1SXINzQ="; - aarch64-linux = "sha256-1mQQ5XmR+WcYW6BGfnUdsG4yzhwIal80Y5fWw4XAJ3g="; - x86_64-darwin = "sha256-a5Mu33gXn2X02WRdtO1hb9JRctmFTiCaLNhScz2D0J8="; - aarch64-darwin = "sha256-THEFn8nQDktXJlY1zpi2760KAS2eKEQ9O3Y+yqI2OYw="; + x86_64-linux = "sha256-rAqIkJ85l5eSojTowVZl5waK/fk00JI4fI1AY1ue/i4="; + aarch64-linux = "sha256-uGptQ5V4u6Vz5BI9xmMShB3gnIUjvA/LKeh+kj71XK8="; + x86_64-darwin = "sha256-Hcb4Vct9aTv4APJfNpydRY68jpEE3wZVctKhURohz4Y="; + aarch64-darwin = "sha256-OSrbI7pX9arCJt8ymRLEARo8admPDHvpDLqf3+iYzVQ="; }; } From eb4ae8d1f6ad7329a174a4014dd6d401d3699504 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 May 2022 14:58:12 +0100 Subject: [PATCH 72/88] adtool: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: ../../src/lib/libactive_directory.a(active_directory.o):/build/adtool-1.3.3/src/lib/active_directory.h:31: multiple definition of `system_config_file'; adtool.o:/build/adtool-1.3.3/src/tools/../../src/lib/active_directory.h:31: first defined here --- pkgs/tools/admin/adtool/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix index d7f6ffadaca..f1bc5851c79 100644 --- a/pkgs/tools/admin/adtool/default.nix +++ b/pkgs/tools/admin/adtool/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ openldap ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: ../../src/lib/libactive_directory.a(active_directory.o):/build/adtool-1.3.3/src/lib/active_directory.h:31: + # multiple definition of `system_config_file'; adtool.o:/build/adtool-1.3.3/src/tools/../../src/lib/active_directory.h:31: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + enableParallelBuilding = true; postInstall = '' From 624f5b70b99ea8983492eb060506c413a59ee0cf Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 19 May 2022 15:16:42 +0100 Subject: [PATCH 73/88] cargo-deny: 0.12.0 -> 0.12.1 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 2aef56fcc1d..ed625cb229e 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-8zJvVuEljCa63mQcgK3E3/SHica6DZbNys+PG7E2GtI="; + sha256 = "sha256-w64fdjKXiCaM+U28Hte+I0LPqmGKxbCVRUyhNWcVyTc="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-bMm/JWzVrgS8XHV1ZXeGQm79JUC7zL0h6v92tqajXfU="; + cargoSha256 = "sha256-K9Ab4L/wnpUqe+gLKhtHX4fOgWXv6ZL9faa58hzdq/0="; nativeBuildInputs = [ pkg-config ]; From a48f96780911ea828a05f95a57fe02c1e4fa5318 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 May 2022 15:18:04 +0100 Subject: [PATCH 74/88] brogue: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: src/brogue/Time.o:/build/brogue-1.7.5/src/brogue/IncludeGlobals.h:51: multiple definition of `messageArchive'; src/brogue/Architect.o:/build/brogue-1.7.5/src/brogue/IncludeGlobals.h:51: first defined here --- pkgs/games/brogue/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index d4f1f8faeeb..891c9a40ec1 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, ncurses, libtcod, makeDesktopItem }: stdenv.mkDerivation rec { pname = "brogue"; @@ -8,6 +8,15 @@ stdenv.mkDerivation rec { url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2"; sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/tmewett/BrogueCE/pull/63 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/tmewett/BrogueCE/commit/2c7ed0c48d9efd06bf0a2589ba967c0a22a8fa87.patch"; + sha256 = "19lr2fa25dh79klm4f4kqyyqq7w5xmw9z0fvylkcckqvcv7dwhp3"; + }) + ]; prePatch = '' sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \ From 3f00d294568effb1117614e7ddb14dea5246c102 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 19 May 2022 14:28:02 +0000 Subject: [PATCH 75/88] exploitdb: 2022-05-13 -> 2022-05-18 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 5fc46e66629..8ac6771f358 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-05-13"; + version = "2022-05-18"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-hSsVgH6iyfTrHwu/fNc00zhheys8mYYmuDAKJqSWGqo="; + sha256 = "sha256-E2QPeSlsJCRhnwgxr1NerLkSFbLLaTSLl8oeYsHQM+U="; }; nativeBuildInputs = [ makeWrapper ]; From 5d372d74c6ae325d433bcd3da611e86801b20bda Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 May 2022 15:28:01 +0100 Subject: [PATCH 76/88] bristol: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here --- pkgs/applications/audio/bristol/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 0c9248b5f0b..b96155cf688 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi"; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of + # `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preInstall = '' sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol From 7470efb0d391cb8f5d4a7800c3f63e63f410cf31 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 May 2022 15:56:05 +0100 Subject: [PATCH 77/88] ccl: pull upstream fix for -fno-common Without the change build fails on upstream gcc-10 as: ld: x86_print.o:/build/ccl/lisp-kernel/linuxx8664/../area.h:111: multiple definition of `tcr_area_lock'; pmcl-kernel.o:/build/ccl/lisp-kernel/linuxx8664/../area.h:111: first defined here --- pkgs/development/compilers/ccl/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 79e7d324ec9..761ae5ba019 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: +{ lib, stdenv, fetchurl, fetchpatch, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { @@ -59,6 +59,21 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; + patches = [ + # Pull upstream fiux for -fno-common toolchains: + # https://github.com/Clozure/ccl/pull/316 + (fetchpatch { + name = "fno-common-p1.patch"; + url = "https://github.com/Clozure/ccl/commit/185dc1a00e7492f8be98e5f93b561758423595f1.patch"; + sha256 = "0wqfds7346qdwdsxz3bl2p601ib94rdp9nknj7igj01q8lqfpajw"; + }) + (fetchpatch { + name = "fno-common-p2.patch"; + url = "https://github.com/Clozure/ccl/commit/997de91062d1f152d0c3b322a1e3694243e4a403.patch"; + sha256 = "10w6zw8wgalkdyya4m48lgca4p9wgcp1h44hy9wqr94dzlllq0f6"; + }) + ]; + buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; From ab9bd1e209f098af250aa354cea71344c06eae17 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 May 2022 16:13:05 +0100 Subject: [PATCH 78/88] cde: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: ../readelf-mini/libreadelf-mini.a(dwarf.o):/build/source/readelf-mini/dwarf.c:64: multiple definition of `do_wide'; ../readelf-mini/libreadelf-mini.a(readelf-mini.o):/build/source/readelf-mini/readelf-mini.c:170: first defined here --- pkgs/tools/package-management/cde/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index acebe472675..5e86e2affb3 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { patchShebangs . ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: ../readelf-mini/libreadelf-mini.a(dwarf.o):/build/source/readelf-mini/dwarf.c:64: + # multiple definition of `do_wide'; ../readelf-mini/libreadelf-mini.a(readelf-mini.o):/build/source/readelf-mini/readelf-mini.c:170: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installPhase = '' install -d $out/bin install -t $out/bin cde cde-exec @@ -36,7 +42,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; - # error: architecture aarch64 is not supported by strace + # error: architecture aarch64 is not supported by bundled strace badPlatforms = [ "aarch64-linux" ]; }; } From 5953a2f9abd69d1c27ef4afe45036c5dd1dfc418 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 May 2022 16:16:50 +0100 Subject: [PATCH 79/88] ddrutility: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: /build/ccltHly5.o:(.bss+0x119f8): multiple definition of `start_time'; /build/cc9evx3L.o:(.bss+0x10978): first defined here --- pkgs/tools/system/ddrutility/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix index 02c89b22989..ce5e16e4eb4 100644 --- a/pkgs/tools/system/ddrutility/default.nix +++ b/pkgs/tools/system/ddrutility/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { substituteInPlace makefile --replace /usr/local "" ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: /build/ccltHly5.o:(.bss+0x119f8): multiple definition of `start_time'; /build/cc9evx3L.o:(.bss+0x10978): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { From 27bfb7cfb90fd349e68cb785693d5985f29beed3 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 19 May 2022 09:39:10 -0600 Subject: [PATCH 80/88] alejandra: 1.2.0 -> 1.4.0 --- pkgs/tools/nix/alejandra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 62deef516d5..0e7f5e133ea 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-35hEJuMvRswOPKb9lbB9ZuHVe0eJN6WJc4T8Frn0hYQ="; + sha256 = "sha256-0AolxQtKj3Oek0WSbODDpPVO5Ih8PXHOA3qXEKPB4dQ="; }; - cargoSha256 = "sha256-SsIpggbRQPjpCYgCG4sSJ022MmMV4bJJ8UAHcJR74O8="; + cargoSha256 = "sha256-USI98hozlTaTj07tMbCQEWDgRkHsd4PFW1HUpKsNZJA="; passthru.tests = { version = testers.testVersion { package = alejandra; }; From 01353ba28a62319ee56f4ac719bd4c514948e7a6 Mon Sep 17 00:00:00 2001 From: Frido Friedemann Date: Thu, 19 May 2022 17:29:28 +0200 Subject: [PATCH 81/88] add -std=c++14 to CXXFLAGS to fix incompatibility of error handling with C++17 Standard --- pkgs/development/libraries/ucommon/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 7306243bca9..2ecf7729f4b 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; + # use C++14 Standard until error handling code gets updated upstream + CXXFLAGS = [ "-std=c++14" ]; + # disable flaky networking test postPatch = '' substituteInPlace test/stream.cpp \ From 1920be67a75a9067f1e86120e5551dc0a65fb9b7 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 19 May 2022 17:56:33 +0200 Subject: [PATCH 82/88] zoneminder: 1.36.10 -> 1.36.15 --- pkgs/servers/zoneminder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index b0828de006f..a698c2e9f7b 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -78,13 +78,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.10"; + version = "1.36.15"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "sha256-MmBnbVDitKOctPe2dNe1sMNNs/qEYGVq3UMJxAkLlCc="; + sha256 = "1qlsg7gd9kpjdbq9d5yrjmc7g1pbscrg4sws7xrdln1z8509sv50"; fetchSubmodules = true; }; From cfd919e70ca3361b2b0c71f2672a70c95d252b68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 18:07:47 +0200 Subject: [PATCH 83/88] python310Packages.dulwich: 0.20.38 -> 0.20.39 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index b10d29a5943..92b315e8309 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.38"; + version = "0.20.39"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-c0Z5DYc1yG+7xbcLZ08O+UCWweUJm6cnNJFigjmBf8g="; + hash = "sha256-VKPFHgTaF+8bhpiqpWEg+CLz5Qllhl5X36iTnP+rLB0="; }; LC_ALL = "en_US.UTF-8"; From f227fb7b605cf5321e61a12ea0c4fa9749562421 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 18:09:09 +0200 Subject: [PATCH 84/88] python310Packages.dulwich: 0.20.39 -> 0.20.40 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 92b315e8309..ea3511e843a 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.39"; + version = "0.20.40"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-VKPFHgTaF+8bhpiqpWEg+CLz5Qllhl5X36iTnP+rLB0="; + hash = "sha256-vtcO/gt91RpHvOqbmEqwamdddDi3izLaHLr891D7utc="; }; LC_ALL = "en_US.UTF-8"; From 34a1ff28e0e5e914a9111b6e44e5f1c17935be51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Thu, 19 May 2022 15:50:14 +0200 Subject: [PATCH 85/88] nixos/xmonad: adjust example to reflect v0.17.0 update of xmonad --- .../services/x11/window-managers/xmonad.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 68f97c2f504..66d11131391 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -128,33 +128,34 @@ in { [ ( (mod4Mask,xK_r), compileRestart True) , ( (mod4Mask,xK_q), restart "xmonad" True ) ] + compileRestart resume = do + dirs <- asks directories + whenX (recompile dirs True) $ do + when resume writeStateToFile + catchIO + ( do + args <- getArgs + executeFile (cacheDir dirs compiledConfig) False args Nothing + ) + + main = getDirectories >>= launch myConfig + -------------------------------------------- - {- version 0.17.0 -} + {- For versions before 0.17.0 use this instead -} -------------------------------------------- -- compileRestart resume = - -- dirs <- io getDirectories - -- whenX (recompile dirs True) $ + -- whenX (recompile True) $ -- when resume writeStateToFile -- *> catchIO -- ( do + -- dir <- getXMonadDataDir -- args <- getArgs - -- executeFile (cacheDir dirs compiledConfig) False args Nothing + -- executeFile (dir compiledConfig) False args Nothing -- ) -- - -- main = getDirectories >>= launch myConfig + -- main = launch myConfig -------------------------------------------- - compileRestart resume = - whenX (recompile True) $ - when resume writeStateToFile - *> catchIO - ( do - dir <- getXMonadDataDir - args <- getArgs - executeFile (dir compiledConfig) False args Nothing - ) - - main = launch myConfig ''; }; From 065085b340637fe4433c83dc4e055083867826df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Thu, 19 May 2022 18:11:39 +0200 Subject: [PATCH 86/88] rl-2205: mention changes to the xmonad haskell module --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index c0f36fcfd35..19aaf12f26a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -516,6 +516,15 @@ (ghc.withPackages.override { useLLVM = true; }) (p: []). + + + The update of the haskell package set brings with it a new + version of the xmonad module, which will + break your configuration if you use launch + as entrypoint. The example code the corresponding nixos module + was adjusted, you way want to have a look at it. + + The home-assistant module now requires diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 5902957a535..9261511e7b8 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -163,6 +163,10 @@ In addition to numerous new and upgraded packages, this release has the followin `useLLVM`. So instead of `(ghc.withPackages (p: [])).override { withLLVM = true; }`, one needs to use `(ghc.withPackages.override { useLLVM = true; }) (p: [])`. +- The update of the haskell package set brings with it a new version of the `xmonad` + module, which will break your configuration if you use `launch` as entrypoint. The + example code the corresponding nixos module was adjusted, you way want to have a look at it. + - The `home-assistant` module now requires users that don't want their configuration to be managed declaratively to set `services.home-assistant.config = null;`. This is required From 89190d67fdde06b8f69c8f53a77b3a49e91a55cf Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 19 May 2022 12:29:34 -0400 Subject: [PATCH 87/88] waypoint: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/cluster/waypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index df0ae08eede..038ab2c2bf7 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NRR/N61QdBF4jaioF7+X3xOdvaJ8COEzXL4hVHYSqW4="; + sha256 = "sha256-Pq1gGXROPHHMaOoQwx6cObvMF+SoilOROR4bwI0Y/GM="; }; - vendorSha256 = "sha256-57/MzO5TulGKMkGdQRoFNKIKF7upJiPazF0+Ovt/LG8="; + vendorSha256 = "sha256-Q8ookgQwecRuSrnQiIREBMDxK9NAWfHu+sIQeMO/T4w="; nativeBuildInputs = [ go-bindata installShellFiles ]; From d93a587732a895dba779e225128106ab2424aad2 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Thu, 19 May 2022 19:19:14 +0200 Subject: [PATCH 88/88] rt-tests: init at 2.3 (#172330) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mustafa Çalışkan <96225281+muscaln@users.noreply.github.com> --- maintainers/maintainer-list.nix | 6 ++++ pkgs/os-specific/linux/rt-tests/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/rt-tests/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23049710aac..b7e14de9bd5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10128,6 +10128,12 @@ githubId = 81340136; name = "polykernel"; }; + poelzi = { + email = "nix@poelzi.org"; + github = "poelzi"; + githubId = 66107; + name = "Daniel Poelzleithner"; + }; polyrod = { email = "dc1mdp@gmail.com"; github = "polyrod"; diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/os-specific/linux/rt-tests/default.nix new file mode 100644 index 00000000000..67e8c7b86a5 --- /dev/null +++ b/pkgs/os-specific/linux/rt-tests/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, makeWrapper +, fetchurl +, numactl +, python3 +}: + +stdenv.mkDerivation rec { + pname = "rt-tests"; + version = "2.3"; + + src = fetchurl { + url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz"; + sha256 = "Q+rNdpRdsmW2gcsrfwg12EzpvO6qlEP/Mb/OWQMNmr8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ numactl python3 ]; + + makeFlags = [ "prefix=$(out)" "DESTDIR=" "PYLIB=$(out)/${python3.sitePackages}" ]; + + postInstall = '' + wrapProgram "$out/bin/determine_maximum_mpps.sh" --prefix PATH : $out/bin + ''; + + meta = with lib; { + homepage = https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git; + description = "Suite of real-time tests - cyclictest, hwlatdetect, pip_stress, pi_stress, pmqtest, ptsematest, rt-migrate-test, sendme, signaltest, sigwaittest, svsematest"; + platforms = platforms.linux; + maintainers = with maintainers; [ poelzi ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 530adea4142..87d22dea5e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23667,6 +23667,8 @@ with pkgs; rtkit = callPackage ../os-specific/linux/rtkit { }; + rt-tests = callPackage ../os-specific/linux/rt-tests { }; + rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { };