From b449745eee6040765b387ad7cef30d2dc813ad70 Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 13 Jan 2023 10:41:57 +0800 Subject: [PATCH 01/11] i2p: 1.9.0 -> 2.1.0 --- pkgs/tools/networking/i2p/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index e835007fdc5b..6cc64a171d53 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,12 +1,23 @@ -{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which, java-service-wrapper }: +{ lib +, stdenv +, ps +, coreutils +, fetchurl +, jdk +, jre +, ant +, gettext +, which +, java-service-wrapper +}: stdenv.mkDerivation rec { pname = "i2p"; - version = "1.9.0"; + version = "2.1.0"; src = fetchurl { url = "https://files.i2p-projekt.de/${version}/i2psource_${version}.tar.bz2"; - sha256 = "sha256-V/YYFQmMNVk9ft4wX5i5AVxMYTxyIxrQhOaAaj4qo3E="; + sha256 = "sha256-gwmMEncgTFVpKEsys37xN2VrJ7/hXvkD7KLafCaSiNE="; }; buildInputs = [ jdk ant gettext which ]; @@ -47,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://geti2p.net"; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # source bundles dependencies as jars + binaryBytecode # source bundles dependencies as jars ]; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; From b44466985da11a7a91376e58537373892d9adf3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 21:10:41 +0000 Subject: [PATCH 02/11] fvwm3: 1.0.5 -> 1.0.6a --- pkgs/applications/window-managers/fvwm/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index 2e458c84f5f6..a0cddeff23ac 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fvwm3"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-/2Ssl/sgKCXbUCtKj2WIcvEC3B16h5/1Jp87AggKxJo="; + hash = "sha256-uYkIuMzhaWeCZm5aJF4oBYD72OLgwCBuUhDqpg6HQUM="; }; nativeBuildInputs = [ From d5d188d9e62809b5f88411a15ff89c47a2787f65 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 20 Jan 2023 07:55:25 -0800 Subject: [PATCH 03/11] cargo-spellcheck: 0.12.2 -> 0.12.3 --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 585833ef4696..13023a83efb7 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8HZBenv2bL6D8TXzjklEFUAnqk7LkYXjtEwxpTbbzr4="; + sha256 = "sha256-XFbpRESpx3ALpWcS29yFXv8vjizc1srHazvDy0jxF94="; }; - cargoSha256 = "sha256-zCk+b7jcR7yDpBUVfKXIozQkcsB+73HosdCmZW9abkA="; + cargoSha256 = "sha256-2DoBvkriSUtgxzZgwt3leEVaqqzfpRNC0YB5sekhje4="; buildInputs = lib.optional stdenv.isDarwin Security; From 5ce55991d5b1d4cf7a90d11131a8b431d7267520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20H=C3=B6ner?= Date: Sun, 20 Nov 2022 21:27:58 +0100 Subject: [PATCH 04/11] zydis: split `zycore` into separate derivation This commit splits the Zycore dependency that was previously pulled in via `fetchSubmodules` into a separate derivation. The package previously didn't install the Zycore headers and CMake configs, making it impossible to actually compile any code that uses Zydis because Zydis includes Zycore headers. --- pkgs/development/libraries/zydis/default.nix | 30 +++++++++++++++++--- pkgs/development/libraries/zydis/zycore.nix | 25 ++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/zydis/zycore.nix diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix index 901d32b39595..c1b2c760dd2d 100644 --- a/pkgs/development/libraries/zydis/default.nix +++ b/pkgs/development/libraries/zydis/default.nix @@ -1,9 +1,16 @@ { lib , stdenv , fetchFromGitHub +, callPackage , cmake +, python3 }: +let + zycore = callPackage ./zycore.nix { + inherit stdenv fetchFromGitHub cmake; + }; +in stdenv.mkDerivation rec { pname = "zydis"; version = "4.0.0"; @@ -12,14 +19,29 @@ stdenv.mkDerivation rec { owner = "zyantific"; repo = "zydis"; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-WSBi8HUVj/JR0/0pBoEaUKD0kOk41gSW5ZW74fn8b4k="; + hash = "sha256-/no/8FNa5LlwhZMSMao4/cwZk6GlamLjqr+isbh6tEI="; }; - nativeBuildInputs = [ - cmake + nativeBuildInputs = [ cmake ]; + buildInputs = [ zycore ]; + cmakeFlags = [ + "-DZYAN_SYSTEM_ZYCORE=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + doCheck = true; + checkInputs = [ python3 ]; + checkPhase = '' + pushd ../tests + python3 ./regression.py test ../build/ZydisInfo + python3 ./regression_encoder.py \ + ../build/Zydis{Fuzz{ReEncoding,Encoder},TestEncoderAbsolute} + popd + ''; + + passthru = { inherit zycore; }; + meta = with lib; { homepage = "https://zydis.re/"; description = "Fast and lightweight x86/x86-64 disassembler library"; diff --git a/pkgs/development/libraries/zydis/zycore.nix b/pkgs/development/libraries/zydis/zycore.nix new file mode 100644 index 000000000000..c0ad668d1227 --- /dev/null +++ b/pkgs/development/libraries/zydis/zycore.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zycore"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "zyantific"; + repo = "zycore-c"; + rev = "v${version}"; + hash = "sha256-kplUgrYecymGxz92tEU6H+NNtcN/Ao/tmmqdVo2c7HA="; + }; + + nativeBuildInputs = [ cmake ]; + + # The absolute paths set by the Nix CMake build manager confuse + # Zycore's config generation (which appends them to the package path). + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; +} From 08fc58fc600807d1dbb6519263504f7fc41d8461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20H=C3=B6ner?= Date: Sun, 20 Nov 2022 21:28:18 +0100 Subject: [PATCH 05/11] zydis: add athre0z as a maintainer --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/libraries/zydis/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3f534813908c..030de4b76eee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1330,6 +1330,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + athre0z = { + email = "joel@zyantific.com"; + github = "athre0z"; + githubId = 6553158; + name = "Joel Höner"; + }; atila = { name = "Átila Saraiva"; email = "atilasaraiva@gmail.com"; diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix index c1b2c760dd2d..38e94e741737 100644 --- a/pkgs/development/libraries/zydis/default.nix +++ b/pkgs/development/libraries/zydis/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://zydis.re/"; description = "Fast and lightweight x86/x86-64 disassembler library"; license = licenses.mit; - maintainers = with maintainers; [ jbcrail AndersonTorres ]; + maintainers = with maintainers; [ jbcrail AndersonTorres athre0z ]; platforms = platforms.all; }; } From c4961615c7b65e4186076ae3bf521eb40ad48f91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 17:54:06 +0000 Subject: [PATCH 06/11] erlang: 24.3.4.7 -> 24.3.4.8 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 2f1a548c88bb..58df443f96ac 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.7"; - sha256 = "sha256-cOtoSlK3S2irPX8vQ81rPXBH3aWriyoUmidUyaFs11E="; + version = "24.3.4.8"; + sha256 = "sha256-NwnGqFEhVi96fEPLKoAqJgvWNZEsRGtE/3HP0eRthuA="; } From 3cec8c7fd583228877080ec7a015e100e48a4001 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 18 Jan 2023 07:12:50 +1000 Subject: [PATCH 07/11] nixVersions.nix_2_13: init at 2.13.1 https://github.com/NixOS/nix/releases/tag/2.13.0 https://github.com/NixOS/nix/releases/tag/2.13.1 --- pkgs/tools/package-management/nix/common.nix | 4 ++++ pkgs/tools/package-management/nix/default.nix | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 95fbd0782b79..72978db577a6 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -11,6 +11,7 @@ let atLeast25 = lib.versionAtLeast version "2.5pre"; atLeast27 = lib.versionAtLeast version "2.7pre"; atLeast210 = lib.versionAtLeast version "2.10pre"; + atLeast213 = lib.versionAtLeast version "2.13pre"; in { stdenv , autoconf-archive @@ -37,6 +38,7 @@ in , libsodium , lowdown , mdbook +, mdbook-linkcheck , nlohmann_json , openssl , perl @@ -83,6 +85,8 @@ self = stdenv.mkDerivation { ] ++ lib.optionals (atLeast24 && enableDocumentation) [ (lib.getBin lowdown) mdbook + ] ++ lib.optionals (atLeast213 && enableDocumentation) [ + mdbook-linkcheck ] ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d0bff934ee61..d8dba67d39b0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -106,6 +106,11 @@ in lib.makeExtensible (self: { ]; }; + nix_2_13 = common { + version = "2.13.1"; + sha256 = "sha256-uXh4+xjJUHQSCg+LHh6+SSYtMdjKQiTXMZ4uZFwzdq4="; + }; + stable = self.nix_2_12; unstable = self.stable; From 956bc25a803ac00394f2a6d98b7a901ab3065dcf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 18 Jan 2023 07:13:51 +1000 Subject: [PATCH 08/11] nixVersions.stable: 2.12 -> 2.13 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d8dba67d39b0..514843790c21 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -111,7 +111,7 @@ in lib.makeExtensible (self: { sha256 = "sha256-uXh4+xjJUHQSCg+LHh6+SSYtMdjKQiTXMZ4uZFwzdq4="; }; - stable = self.nix_2_12; + stable = self.nix_2_13; unstable = self.stable; }) From 37a44ff3a0415ab84fe52e9c78ad4bafd227737b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 18 Jan 2023 07:18:19 +1000 Subject: [PATCH 09/11] nixos/nix-fallback-paths: 2.12.0 -> 2.13.1 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 3eca901bdbf7..aa5861107be2 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/h88w1442c7hzkbw8sgpcsbqp4lhz6l5p-nix-2.12.0"; - i686-linux = "/nix/store/j23527l1c3hfx17nssc0v53sq6c741zs-nix-2.12.0"; - aarch64-linux = "/nix/store/zgzmdymyh934y3r4vqh8z337ba4cwsjb-nix-2.12.0"; - x86_64-darwin = "/nix/store/wnlrzllazdyg1nrw9na497p4w0m7i7mm-nix-2.12.0"; - aarch64-darwin = "/nix/store/7n5yamgzg5dpp5vb6ipdqgfh6cf30wmn-nix-2.12.0"; + x86_64-linux = "/nix/store/vggs4ndlda1bhnldjrs4nm5a2walsnl6-nix-2.13.1"; + i686-linux = "/nix/store/5g6w3p8l8k2mfghxrg48w7fcqbmr3c2p-nix-2.13.1"; + aarch64-linux = "/nix/store/pkbg60qv1w387c80g4xnb6w06461vw3i-nix-2.13.1"; + x86_64-darwin = "/nix/store/jahjn6dvlw5kygqhg6da1b2ydcdak4lx-nix-2.13.1"; + aarch64-darwin = "/nix/store/2qalrx6py8r640wqsldmdf2zsaf8cpsg-nix-2.13.1"; } From 204168e060f02b3a4611061621768d0929eadba5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 18 Jan 2023 08:05:45 +1000 Subject: [PATCH 10/11] nix-eval-jobs: pin to nix_2_12 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 718e941b508c..75ded916919d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37476,7 +37476,9 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { + nix = nixVersions.nix_2_12; # fails to build with 2.13 + }; nix-doc = callPackage ../tools/package-management/nix-doc { }; From fb95bbd0b9f0cb3426f66ea4a319cac1544e4d0d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 20 Jan 2023 20:50:58 +0000 Subject: [PATCH 11/11] fossil: fix cross Co-authored-by: Artturi --- pkgs/applications/version-management/fossil/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ea06107ed7ca..174094dedea4 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,6 +3,7 @@ , tcl , libiconv , fetchurl +, buildPackages , zlib , openssl , readline @@ -23,6 +24,9 @@ stdenv.mkDerivation rec { sha256 = "1knff50rr8f39myxj50fprb9ya87cslmwz7zzfya56l33r7i7jh3"; }; + # required for build time tool `./tools/translate.c` + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline which ed ]