From e5adc91d637c8a110a9d8bb37a68bb2984dca1aa Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 24 Nov 2021 14:16:50 +0000 Subject: [PATCH 01/34] qgis: 3.16.13 -> 3.16.14 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 4f62ccecbaf5..b602dd4a6ea8 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -56,14 +56,14 @@ let six ]; in mkDerivation rec { - version = "3.16.13"; + version = "3.16.14"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "13irzs89lknfxf2y7j931bh0zmqgiwifdbbzvwn8yxxr21gd68ac"; + sha256 = "sha256-3FUGSBdlhJhhpTPtYuzKOznsC7PJV3kRL9Il2Yryi1Q="; }; passthru = { From 2d0c11c034fd89678dcc717cd77819ac4437010c Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 26 Nov 2021 20:58:59 +0100 Subject: [PATCH 02/34] qgis: add erictapen as maintainer --- pkgs/applications/gis/qgis/unwrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index b602dd4a6ea8..0ec81c785b4b 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -123,6 +123,6 @@ in mkDerivation rec { homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix sikmir ]; + maintainers = with lib.maintainers; [ lsix sikmir erictapen ]; }; } From 3b74f9060768c5963bab33810f4c489f677351c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Nov 2021 14:39:24 +0100 Subject: [PATCH 03/34] linux_zen: 5.15.3-zen1 -> 5.15.5-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index a822f5d10805..8ff8b30809b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.3-zen1"; + modDirVersion = "5.15.5-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-GleOhTKLhnhepAlR+TkiCYcgEe5KfVvDKTPWP7/D8wQ="; + sha256 = "sha256-sEt6h29GY18+45jHheRd69eCw+EAzn/CVUK5XRqdZcA="; }; structuredExtraConfig = with lib.kernel; { From b04ef6a552bb910372578f45f62d746db917da06 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Tue, 30 Nov 2021 08:13:12 -0600 Subject: [PATCH 04/34] kstars: 3.5.5 -> 3.5.6 --- pkgs/applications/science/astronomy/kstars/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index c7e76b6ad923..b7b9fbeb14d3 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-cD31YFBnKvEPyBQils6qJxNKagDoIi8/Znfxj/Gsa0M="; + sha256 = "sha256-n+fGYLzQAGS8828hr7XE9qiTMyg99L+W7VRjd9aEkrQ="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From 3151b3d7174ef35219dd63896503990ae9623a04 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 30 Nov 2021 23:16:03 -0500 Subject: [PATCH 05/34] =?UTF-8?q?goverlay:=200.6.4=20=E2=86=92=200.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/goverlay/default.nix | 9 +++++++-- pkgs/tools/graphics/goverlay/find-xdg-data-files.patch | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index b8cd6df4751f..11fe1a20a195 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -20,6 +20,7 @@ , util-linux , vulkan-tools , which +, nix-update-script }: let @@ -36,13 +37,13 @@ let ''; in stdenv.mkDerivation rec { pname = "goverlay"; - version = "0.6.4"; + version = "0.7"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - sha256 = "sha256-xuv7u2lLQAB0Zmu7UHGXP/sJwcb8vHDf9hFL+pF+818="; + sha256 = "sha256-LdpgEfCNbf0/sY8v8D3KiapYEd23tVy4nQ7RuGwl7jM="; }; outputs = [ "out" "man" ]; @@ -102,6 +103,10 @@ in stdenv.mkDerivation rec { "--set QT_QPA_PLATFORM xcb" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "An opensource project that aims to create a Graphical UI to help manage Linux overlays"; homepage = "https://github.com/benjamimgois/goverlay"; diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch index 96970cd769a1..86f31a68dc70 100644 --- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -1,8 +1,8 @@ diff --git a/overlayunit.pas b/overlayunit.pas -index 8c2276d..a62e60a 100644 +index 537491b..744f604 100644 --- a/overlayunit.pas +++ b/overlayunit.pas -@@ -4913,7 +4913,7 @@ begin +@@ -5011,7 +5011,7 @@ begin //Determine Mangohud dependency status //locate MangoHud and store result in tmp folder @@ -11,7 +11,7 @@ index 8c2276d..a62e60a 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); -@@ -4922,7 +4922,7 @@ begin +@@ -5020,7 +5020,7 @@ begin CloseFile(mangohudVAR); // Read String and store value on mangohuddependencyVALUE based on result @@ -20,7 +20,7 @@ index 8c2276d..a62e60a 100644 mangohuddependencyVALUE := 1 else mangohuddependencyVALUE := 0; -@@ -4931,7 +4931,7 @@ begin +@@ -5029,7 +5029,7 @@ begin //Determine vkBasalt dependency staus //locate vkBasalt and store result in tmp folder @@ -29,7 +29,7 @@ index 8c2276d..a62e60a 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); -@@ -4940,7 +4940,7 @@ begin +@@ -5038,7 +5038,7 @@ begin CloseFile(vkbasaltVAR); // Read String and store value on vkbasaltdependencyVALUE based on result From 93ee1a9cb0cedc65b26c8ebd748c7045506c4e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Dec 2021 13:30:06 +0100 Subject: [PATCH 06/34] knot-resolver: 5.4.2 -> 5.4.3 https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.4.3 --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 420b09234547..26f35145b67c 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b"; + sha256 = "488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506"; }; outputs = [ "out" "dev" ]; From 0a78df519d30f904606448bfc253720c1ff3d5b5 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 2 Dec 2021 14:00:31 -0500 Subject: [PATCH 07/34] earthly: 0.5.24 -> 0.6.2 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 1cd5d9caf282..c6cc57e14c5c 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.24"; + version = "0.6.2"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-d4TCuFj7nbQDxTLCStrGj698iUYTH0mCqoCZeeOGNIE="; + sha256 = "sha256-a2NNpQvbhMY66nbk4RAXFb/o1qR5OXPm93ujzS2cxp4="; }; - vendorSha256 = "sha256-3o+jizVVHcPZ6nNT2nCF8fLDynnFccI2Y50kbXp2qAI="; + vendorSha256 = "sha256-0wyefhY/KR79K9DDI4/8EaA/DFI1rf6wxsBIAZo+rUI="; ldflags = [ "-s" "-w" From 89369e069d456a4fc4b3799967d00719433a5e24 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 2 Dec 2021 18:49:19 +0100 Subject: [PATCH 08/34] jadx: 1.2.0 -> 1.3.0 --- pkgs/tools/security/jadx/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 02533f7f6f5f..9749f93282ef 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - sha256 = "1w1wc81mkjcsgjbrihbsphxkcmwnfnf555pmlsd2vs2a04nki01y"; + hash = "sha256-dEtmn6d7B+0p3SOmnpJigBCDjfnyY1qazXdmwtvoWwE="; }; deps = stdenv.mkDerivation { @@ -21,6 +21,14 @@ let export GRADLE_USER_HOME=$(mktemp -d) export JADX_VERSION=${version} gradle --no-daemon jar + + # Apparently, Gradle won't cache the `compileOnlyApi` dependency + # `org.jetbrains:annotations:22.0.0` which is defined in + # `io.github.skylot:raung-common`. To make it available in the + # output, we patch `build.gradle` and run Gradle again. + substituteInPlace build.gradle \ + --replace 'org.jetbrains:annotations:23.0.0' 'org.jetbrains:annotations:22.0.0' + gradle --no-daemon jar ''; # Mavenize dependency paths @@ -31,9 +39,8 @@ let | sh ''; - outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "05fsycpd90dbak2vgdpd9cz08liq5j78ag9ry9y1s62ld776g0hz"; + outputHash = "sha256-t2kfih5JbIZvJMSHcCsTteDJ9MWJK/wUiqmHU5odMdY="; }; in stdenv.mkDerivation { inherit pname version src; From a99ea202552ebd447b835b2ccc98b8fcc4f64336 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 22:24:35 +0100 Subject: [PATCH 09/34] checkov: 2.0.614 -> 2.0.625 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index aabbcd07a535..7927a797656b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.614"; + version = "2.0.625"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-z1d1Zcq4x2wU/j4yWpaRwJXsUqy95Ai2uM18EHqxze0="; + sha256 = "sha256-Q2GaLHciqgsvnYAFdq6839OHcpxWM2m/H10CPmBj2vg="; }; nativeBuildInputs = with py.pkgs; [ From cfc39c0331813fd6f3db894a8591182160a53fbc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 22:28:44 +0100 Subject: [PATCH 10/34] kubescape: 1.0.131 -> 1.0.132 --- pkgs/tools/security/kubescape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index e68980cc9659..9534480b7dde 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.131"; + version = "1.0.132"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DcReo4pTdI8ssWH1IqD8gDUm4jQ0jBBJ+ltxSpdkxQE="; + sha256 = "sha256-hx11RCLEUW/2MKNIXz51wOyKC7zv0M3Wvblam/E3rdQ="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-SxJnYJyKFed1c+zgeeXQQhsKHlaDevJGMwqA5gPef3s="; + vendorSha256 = "sha256-GrQmWHdCk8Yl/ryS2zLQU8XCkjfS20qjlEScU8AQT0o="; ldflags = [ "-s" From b6b825ac0929b6c295b98cc677b7ccf38443c630 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 23:22:42 +0100 Subject: [PATCH 11/34] python3Packages.flux-led: 0.25.1 -> 0.25.10 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 1bfc96ff7217..58e271b10dc5 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.25.1"; + version = "0.25.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-+GgA7ma27dah8G/ITsy84jZHpktJHnGSMjzMfAvvuJg="; + sha256 = "sha256-WkLwiQNwueksPpuQ5aMBsenKyzUid1fbeOqEDAhfjkA="; }; propagatedBuildInputs = [ From e2738be13650e2f5ee498654a3a48b3b11f8dbab Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 3 Dec 2021 00:37:25 +0100 Subject: [PATCH 12/34] nix-output-monitor: 1.0.3.3 -> 1.0.4.0 --- pkgs/tools/nix/nix-output-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a94ae45ccea5..a0700e43c5b2 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.3"; + version = "1.0.4.0"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1x26s9gzcygn96600g0r1a1sxqav6c38iq981rhmc808mqlyxmp8"; + hash = "sha256-3EQgjrDX8C3qG6danuPRl2gnPlX1qZjxjrROrKitsS0="; rev = "v${version}"; }; isLibrary = true; From 3bf91048f85654c6dec62bbbf4e79a85beda3bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 2 Dec 2021 22:53:39 +0100 Subject: [PATCH 13/34] scala-cli: 0.0.8 -> 0.0.9 --- .../tools/build-managers/scala-cli/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 7d7e084a79ff..33f9811ab836 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.0.8"; + version = "0.0.9"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "14bf1zwvfq86vh00qlf8jf4sb82p9jakrmwqhnv9p0x13lq56xm5"; + sha256 = "sha256-1KwJuapqGhMEIMwrJp2LKlpYFtl+OP9DyaMtge9ZedI="; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "01dhcj6q9c87aqpz8vy1kwaa1qqq9bh43rkx2sabhnfrzj4vypjr"; + sha256 = "sha256-IDXO+MgFlnT7VPugcQr/IGLZeD/vWFqJ0D0zVIbTtk4="; }; }; in @@ -22,10 +22,10 @@ stdenv.mkDerivation { let asset = assets."${stdenv.hostPlatform.system}" or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); in - fetchurl { - url = "https://github.com/Virtuslab/scala-cli/releases/download/v${version}/${asset.asset}"; - sha256 = asset.sha256; - }; + fetchurl { + url = "https://github.com/Virtuslab/scala-cli/releases/download/v${version}/${asset.asset}"; + sha256 = asset.sha256; + }; unpackPhase = '' runHook preUnpack From c47f9914356d15e7d3ee6e9f57d7140502bc43bf Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 29 Nov 2021 21:46:27 -0800 Subject: [PATCH 14/34] top-level: add depsHostHost splicing This was originally made to throw because pkgsHostHost was unimplemented. Now that we have the full range of pkgs*, we can add this normally. --- pkgs/top-level/splice.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index a093442d3698..459baaca2e63 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -42,7 +42,7 @@ let valueBuildBuild = pkgsBuildBuild.${name} or {}; valueBuildHost = pkgsBuildHost.${name} or {}; valueBuildTarget = pkgsBuildTarget.${name} or {}; - valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splice."; + valueHostHost = pkgsHostHost.${name} or {}; valueHostTarget = pkgsHostTarget.${name} or {}; valueTargetTarget = pkgsTargetTarget.${name} or {}; augmentedValue = defaultValue @@ -53,7 +53,7 @@ let __spliced = (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) - // { hostHost = valueHostHost; } + // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; }) // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget; }); }; @@ -81,7 +81,7 @@ let pkgsBuildBuild = valueBuildBuild; pkgsBuildHost = valueBuildHost; pkgsBuildTarget = valueBuildTarget; - pkgsHostHost = {}; + pkgsHostHost = valueHostHost; pkgsHostTarget = valueHostTarget; pkgsTargetTarget = valueTargetTarget; # Don't be fancy about non-derivations. But we could have used used From 24d717393fef671609d270f3319d2db2c793ddf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 5 Nov 2021 00:28:01 +0100 Subject: [PATCH 15/34] bloop: add kubukoz as maintainer --- pkgs/development/tools/build-managers/bloop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 8710d390dea0..433427d6790e 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "A Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ tomahna ]; + maintainers = with maintainers; [ kubukoz tomahna ]; }; } From 305b7de42166f28b4fb0f7401c285d5772b34f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 5 Nov 2021 00:27:50 +0100 Subject: [PATCH 16/34] bloop: 1.4.9 -> 1.4.11 --- .../tools/build-managers/bloop/default.nix | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 433427d6790e..ebb4bb5f36c3 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -3,6 +3,7 @@ , coursier , autoPatchelfHook , installShellFiles +, makeWrapper , jre , lib , zlib @@ -10,76 +11,83 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.9"; + version = "1.4.11"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "0yh9k98c0cq9ksi3g6rb1q1qblnhcznrc5z1y9ps8cvwv2lx8ly4"; + sha256 = "CoF/1nggjaL17SWmWDcKicfgoyqpOSZUse8f+3TgD0E="; }; bloop-bash = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions"; - sha256 = "1ldxlqv353gvhdn4yq7z506ywvnjv6fjsi8wigwhzg89876pwsys"; + sha256 = "2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE="; }; bloop-fish = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions"; - sha256 = "1pa8h81l2498q8dbd83fzipr99myjwxpy8xdgzhvqzdmfv6aa4m0"; + sha256 = "oBKlzHa1fbzhf60jfzuXvqaUb/xuoLYawigRQQOCSN0="; }; bloop-zsh = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions"; - sha256 = "1xzg0qfkjdmzm3mvg82mc4iia8cl7b6vbl8ng4ir2xsz00zjrlsq"; + sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c="; }; bloop-coursier = stdenv.mkDerivation rec { name = "${pname}-coursier-${version}"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" - else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" - else throw "unsupported platform"; + else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin" + else throw "unsupported platform"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' + runHook preInstall + export COURSIER_CACHE=$(pwd) export COURSIER_JVM_CACHE=$(pwd) mkdir channel ln -s ${bloop-coursier-channel} channel/bloop.json - ${coursier}/bin/cs install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop + ${coursier}/bin/cs install --install-dir . --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop - # Remove binary part of the coursier launcher script to make derivation output hash stable - sed -i '5,$ d' $out/bloop - ''; + # Only keeping the binary, we'll wrap it ourselves + # This guarantees the output of this fixed-output derivation doesn't have references to itself + install -D -m 0755 .bloop.aux $out + + runHook postInstall + ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hxyzf430g95l6qz1qlq8wvizvy6j3a7a9crb3lcxd67cpbg3x7i" - else if stdenv.isDarwin && stdenv.isx86_64 then "0x5yqf3i8y6s5h27yr0jkpvj6ch25ckx2802dmaxlgq6gz0fx6w2" - else throw "unsupported platform"; + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0c02n779z4l7blzla5820bzfhblbp5nlizx9f8wns4miwnph357f" + else if stdenv.isDarwin && stdenv.isx86_64 then "1gy5k9ii86rxyv2v9if4n1clvmb1hi4ym32mp6miwgcjla10sv30" + else throw "unsupported platform"; }; dontUnpack = true; - nativeBuildInputs = [ autoPatchelfHook installShellFiles ]; + nativeBuildInputs = [ autoPatchelfHook installShellFiles makeWrapper ]; buildInputs = [ stdenv.cc.cc.lib zlib ]; propagatedBuildInputs = [ jre ]; installPhase = '' + runHook preInstall + export COURSIER_CACHE=$(pwd) export COURSIER_JVM_CACHE=$(pwd) - mkdir -p $out/bin - cp ${bloop-coursier}/bloop $out/bloop - cp ${bloop-coursier}/.bloop.aux $out/.bloop.aux - ln -s $out/bloop $out/bin/bloop + install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped - # patch the bloop launcher so that it works when symlinked - sed "s|\$(dirname \"\$0\")|$out|" -i $out/bloop + makeWrapper $out/.bloop-wrapped $out/bin/bloop \ + --set CS_NATIVE_LAUNCHER true \ + --set IS_CS_INSTALLED_LAUNCHER true #Install completions installShellCompletion --name bloop --bash ${bloop-bash} installShellCompletion --name _bloop --zsh ${bloop-zsh} installShellCompletion --name bloop.fish --fish ${bloop-fish} + + runHook postInstall ''; meta = with lib; { From a3401f6e3356cbf76050ed276f7b26d87766dc26 Mon Sep 17 00:00:00 2001 From: Philipp Dargel Date: Thu, 28 Oct 2021 20:46:09 +0200 Subject: [PATCH 17/34] OpenJDK: expose more versions Provide a way to access all JDK versions. --- .../from_md/release-notes/rl-2111.section.xml | 6 + .../manual/release-notes/rl-2111.section.md | 2 + .../openjdk/darwin/{default.nix => 16.nix} | 0 .../compilers/openjdk/darwin/17.nix | 81 +++++++++ pkgs/top-level/all-packages.nix | 111 ++---------- pkgs/top-level/java-packages.nix | 168 +++++++++++++++++- 6 files changed, 269 insertions(+), 99 deletions(-) rename pkgs/development/compilers/openjdk/darwin/{default.nix => 16.nix} (100%) create mode 100644 pkgs/development/compilers/openjdk/darwin/17.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index ed5ffe352323..96cb5187889f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -2023,6 +2023,12 @@ Superuser created successfully. hydrus manual. + + + More jdk and jre versions are now exposed via + java-packages.compiler. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 61bcd745a356..584bde952a2a 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -549,3 +549,5 @@ In addition to numerous new and upgraded packages, this release has the followin - RetroArch has been upgraded from version `1.8.5` to `1.9.13.2`. Since the previous release was quite old, if you're having issues after the upgrade, please delete your `$XDG_CONFIG_HOME/retroarch/retroarch.cfg` file. - hydrus has been upgraded from version `438` to `463`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates). + +- More jdk and jre versions are now exposed via `java-packages.compiler`. diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/16.nix similarity index 100% rename from pkgs/development/compilers/openjdk/darwin/default.nix rename to pkgs/development/compilers/openjdk/darwin/16.nix diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix new file mode 100644 index 000000000000..813702a2fbfd --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +let + # Details from https://www.azul.com/downloads/?version=java-17-lts&os=macos&package=jdk + # Note that the latest build may differ by platform + dist = { + x86_64-darwin = { + arch = "x64"; + zuluVersion = "17.30.15"; + jdkVersion = "17.0.1"; + sha256 = "sha256-CdZP5XY3O0MUQigRvIQC+7dwAXaCKw4eK/L/imytEOs="; + }; + + aarch64-darwin = { + arch = "aarch64"; + zuluVersion = "17.30.19"; + jdkVersion = "17.0.1"; + sha256 = "sha256-zhBCXOnO/fsj6+q+vAlEz7QVMRFKLVvYnjwZzFz6mRM="; + }; + }."${stdenv.hostPlatform.system}"; + + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation rec { + pname = "zulu${dist.zuluVersion}-ca-jdk"; + version = dist.jdkVersion; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + inherit (dist) sha256; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # fixupPhase is moving the man to share/man which breaks it because it's a + # relative symlink. + postFixup = '' + ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man + ''; + + passthru = { + home = jdk; + }; + + meta = import ./meta.nix lib; + }; +in +jdk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f38e73201b91..5287964eae9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12250,116 +12250,31 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - - openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; - - openjdk8-bootstrap = - if adoptopenjdk-hotspot-bin-8.meta.available then - adoptopenjdk-hotspot-bin-8 - else - callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; - - /* legacy jdk for use as needed by older apps */ - openjdk8 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/8.nix { } - else - callPackage ../development/compilers/openjdk/8.nix { - inherit (gnome2) GConf gnome_vfs; - }; - - openjdk8_headless = - if stdenv.isDarwin || stdenv.isAarch64 then - openjdk8 - else - openjdk8.override { headless = true; }; + inherit (javaPackages) openjfx11 openjfx15; + openjfx = openjfx15; + openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; + openjdk8 = javaPackages.compiler.openjdk8; + openjdk8_headless = javaPackages.compiler.openjdk8.headless; jdk8 = openjdk8; jdk8_headless = openjdk8_headless; jre8 = openjdk8.jre; jre8_headless = openjdk8_headless.jre; - openjdk11-bootstrap = - if adoptopenjdk-hotspot-bin-11.meta.available then - adoptopenjdk-hotspot-bin-11 - else - callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; - - openjdk11 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/11.nix { } - else - callPackage ../development/compilers/openjdk/11.nix { - openjfx = openjfx11; - inherit (gnome2) GConf gnome_vfs; - }; - - openjdk11_headless = - if stdenv.isDarwin then - openjdk11 - else - openjdk11.override { headless = true; }; - - openjdk17-bootstrap = - if adoptopenjdk-hotspot-bin-16.meta.available then - adoptopenjdk-hotspot-bin-16 - else - /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */ - callPackage ../development/compilers/openjdk/16.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk16-bootstrap = callPackage ../development/compilers/openjdk/15.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk15-bootstrap = callPackage ../development/compilers/openjdk/14.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix { - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { - stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ - openjfx = openjfx11; /* need this despite next line :-( */ - enableJavaFX = false; - headless = true; - inherit (gnome2) GConf gnome_vfs; - }; - }; - }; - }; - }; - + openjdk11-bootstrap = javaPackages.compiler.openjdk11-bootstrap; + openjdk11 = javaPackages.compiler.openjdk11; + openjdk11_headless = javaPackages.compiler.openjdk11.headless; jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - /* Latest JDK */ - openjdk17 = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin { } - else - callPackage ../development/compilers/openjdk/17.nix { - openjfx = openjfx15; - inherit (gnome2) GConf gnome_vfs; - }; - - openjdk17_headless = - if stdenv.isDarwin then - openjdk17 - else - openjdk17.override { headless = true; }; - + openjdk17-bootstrap = javaPackages.compiler.openjdk17-bootstrap; + openjdk17 = javaPackages.compiler.openjdk17; + openjdk17_headless = javaPackages.compiler.openjdk17.headless; jdk17 = openjdk17; jdk17_headless = openjdk17_headless; + openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap; + /* default JDK */ jdk = jdk17; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 7f1bb6e89a7c..cf6474f0da5b 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -5,8 +5,174 @@ with pkgs; let mavenbuild = callPackage ../development/java-modules/build-maven-package.nix { }; fetchMaven = callPackage ../development/java-modules/m2install.nix { }; + + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; + openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + in { - inherit mavenbuild fetchMaven; + inherit mavenbuild fetchMaven openjfx11 openjfx15; + + compiler = let + + gnomeArgs = { + inherit (gnome2) GConf gnome_vfs; + }; + + bootstrapArgs = gnomeArgs // { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + }; + + mkAdoptopenjdk = path-linux: path-darwin: let + package-linux = import path-linux { inherit lib; }; + package-darwin = import path-darwin { inherit lib; }; + package = if stdenv.isLinux + then package-linux + else package-darwin; + in rec { + inherit package-linux package-darwin; + + jdk-hotspot = callPackage package.jdk-hotspot {}; + jre-hotspot = callPackage package.jre-hotspot {}; + jdk-openj9 = callPackage package.jdk-openj9 {}; + jre-openj9 = callPackage package.jre-openj9 {}; + }; + + mkBootstrap = adoptopenjdk: path: args: + /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */ + if adoptopenjdk.jdk-hotspot.meta.available + then adoptopenjdk.jdk-hotspot + else callPackage path args; + + mkOpenjdk = path-linux: path-darwin: args: + if stdenv.isLinux + then mkOpenjdkLinuxOnly path-linux args + else let + openjdk = callPackage path-darwin {}; + in openjdk // { headless = openjdk; }; + + mkOpenjdkLinuxOnly = path-linux: args: let + openjdk = callPackage path-linux (gnomeArgs // args); + in openjdk // { + headless = openjdk.override { headless = true; }; + }; + + openjdkDarwinMissing = version: + abort "OpenJDK ${builtins.toString version} is currently not supported on Darwin by nixpkgs."; + + in rec { + + adoptopenjdk-8 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + + adoptopenjdk-11 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + + adoptopenjdk-13 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; + + adoptopenjdk-14 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix; + + adoptopenjdk-15 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; + + adoptopenjdk-16 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + + openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 + ../development/compilers/openjdk/bootstrap.nix + { version = "8"; }; + + openjdk11-bootstrap = mkBootstrap adoptopenjdk-11 + ../development/compilers/openjdk/bootstrap.nix + { version = "10"; }; + + openjdk13-bootstrap = mkBootstrap adoptopenjdk-13 + ../development/compilers/openjdk/12.nix + (bootstrapArgs // { + /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ + stdenv = gcc8Stdenv; + }); + + openjdk14-bootstrap = mkBootstrap adoptopenjdk-14 + ../development/compilers/openjdk/13.nix + (bootstrapArgs // { + inherit openjdk13-bootstrap; + }); + + openjdk15-bootstrap = mkBootstrap adoptopenjdk-15 + ../development/compilers/openjdk/14.nix + (bootstrapArgs // { + inherit openjdk14-bootstrap; + }); + + openjdk16-bootstrap = mkBootstrap adoptopenjdk-16 + ../development/compilers/openjdk/15.nix + (bootstrapArgs // { + inherit openjdk15-bootstrap; + }); + + openjdk17-bootstrap = mkBootstrap adoptopenjdk-16 + ../development/compilers/openjdk/16.nix + (bootstrapArgs // { + inherit openjdk16-bootstrap; + }); + + openjdk8 = mkOpenjdk + ../development/compilers/openjdk/8.nix + ../development/compilers/openjdk/darwin/8.nix + { }; + + openjdk11 = mkOpenjdk + ../development/compilers/openjdk/11.nix + ../development/compilers/openjdk/darwin/11.nix + { openjfx = openjfx11; }; + + openjdk12 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/12.nix { + /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ + stdenv = gcc8Stdenv; + openjfx = openjfx11; + }; + + openjdk13 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/13.nix { + inherit openjdk13-bootstrap; + openjfx = openjfx11; + }; + + openjdk14 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/14.nix { + inherit openjdk14-bootstrap; + openjfx = openjfx11; + }; + + openjdk15 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/15.nix { + inherit openjdk15-bootstrap; + openjfx = openjfx15; + }; + + openjdk16 = mkOpenjdk + ../development/compilers/openjdk/16.nix + ../development/compilers/openjdk/darwin/16.nix + { + inherit openjdk16-bootstrap; + openjfx = openjfx15; + }; + + openjdk17 = mkOpenjdk + ../development/compilers/openjdk/17.nix + ../development/compilers/openjdk/darwin/17.nix + { + inherit openjdk17-bootstrap; + openjfx = openjfx15; + }; + }; mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { }); From 2f89af4d34762bded3ed3c64179f2e7fc06428d3 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Fri, 3 Dec 2021 03:06:02 +0100 Subject: [PATCH 18/34] nfd: init at 0.7.1 (#144010) * nfd: init at version 0.7.1 - Add NFD derivation - Link NFD derivation as a top-level package * Applied revision suggestions * Add fetchSubmodules NFD uses websocket++ 0.8.1-hotfix in their stable release so that it can be built with boost 175. ndn-cxx is built with boost 169 in nixpkgs, although it could use the newest version, so I'm matching the same version. * Fixed tests and cleanup * Fix typo in repo revision * Add fetch submodules NFD build script requires the complete websocket++ source in the build directory. I could not build it reusing the packages websocket++. * Call to pre and post check hooks Co-authored-by: Ryan Burns <52847440+r-burns@users.noreply.github.com> * Default to fetch NFD submodules * Fix license Co-authored-by: Ryan Burns <52847440+r-burns@users.noreply.github.com> * Switch to lib.optional for parameter string Co-authored-by: Sandro * Change prefix as per nix defaults * Removed redundant prefix environment variable * Homepage to HTTPS Co-authored-by: Sandro Co-authored-by: Ryan Burns <52847440+r-burns@users.noreply.github.com> Co-authored-by: Sandro --- pkgs/servers/nfd/default.nix | 55 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/servers/nfd/default.nix diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix new file mode 100644 index 000000000000..5be17fc7b49e --- /dev/null +++ b/pkgs/servers/nfd/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, boost +, fetchFromGitHub +, libpcap +, ndn-cxx +, openssl +, pkg-config +, sphinx +, systemd +, wafHook +, websocketpp +, withSystemd ? stdenv.isLinux +, withWebSocket ? true +}: + +stdenv.mkDerivation rec { + pname = "nfd"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "named-data"; + repo = lib.toUpper pname; + rev = "NFD-${version}"; + sha256 = "1l9bchj8c68r6qw4vr1kc96jgxl0vpqa2vjkvy1xmhz92sivr6gi"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config sphinx wafHook ]; + buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; + + wafConfigureFlags = [ + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" + ] ++ lib.optional (!withWebSocket) "--without-websocket"; + + doCheck = true; + checkPhase = '' + runHook preCheck + build/unit-tests-core + # build/unit-tests-daemon # 3 tests fail + build/unit-tests-rib + build/unit-tests-tools + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://named-data.net/"; + description = "Named Data Neworking (NDN) Forwarding Daemon"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.bertof ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5287964eae9c..a61a562dbd61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15790,6 +15790,8 @@ with pkgs; ndn-tools = callPackage ../tools/networking/ndn-tools { }; + nfd = callPackage ../servers/nfd { }; + cddlib = callPackage ../development/libraries/cddlib {}; cdk = callPackage ../development/libraries/cdk {}; From 78a189600d533105d16d5195f9293f5254126979 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 23:28:30 +0100 Subject: [PATCH 19/34] python3Packages.sendgrid: 6.9.1 -> 6.9.2 --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index bb84ba6b21c7..99367f97b8dd 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.1"; + version = "6.9.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-u7qakmJ9pKV1zonILEvMHxzMF6EaY+ZJUfh5s3TTH5w="; + sha256 = "sha256-eqmYuVW912E8hiVReLAoclmNDc2+gOIcUo9lRUx9AwM="; }; propagatedBuildInputs = [ From 322365c68beb02f53280117346580854573a3fc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 23:34:12 +0100 Subject: [PATCH 20/34] python3Packages.pytenable: 1.4.0 -> 1.4.2 --- pkgs/development/python-modules/pytenable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index e36e4f178b8c..af3c2c9b6514 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "sha256-JdI0nAX/leTnYgGId2ct04u1a+z7eU2UY6pk2cUM4fg="; + sha256 = "sha256-qljoJ+nYFVS5VHr/M4mITtO9Czuyb4HLzVjhprhyJIs="; }; propagatedBuildInputs = [ From 6cbce58b9d4dec01cae59168c85d25e6e4b87456 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 22:05:58 +0100 Subject: [PATCH 21/34] python3Packages.qcs-api-client: 0.20.3 -> 0.20.4 --- pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 50d88458a4d6..0bdde93a159d 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.20.3"; + version = "0.20.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3PzjCdH0Mxw1GvtqvEMyAaYt96QX0zoXwK3azF2ey+U="; + sha256 = "sha256-bw/NvB4YkdAfm8YyWlLPC4Z0GH9Ez9M9yIjgubiyskw="; }; propagatedBuildInputs = [ From c3338bcdc4634d846354b3a24e6b0ad45d3c6a83 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Dec 2021 06:40:09 +1000 Subject: [PATCH 22/34] .github/workflows/editorconfig.yml: allow PRs to skip check Intended for treewide reformatting PRs so we don't hit the API ratelimit. --- .github/workflows/editorconfig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 01a6d736c137..445f0fcbaf8f 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -11,7 +11,7 @@ on: jobs: tests: runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip editorconfig]')" steps: - name: Get list of changed files from PR env: From 6c4f2d7399ffca3a7eb6f00b9a6ec5b264c23109 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 22:36:27 +0100 Subject: [PATCH 23/34] python3Packages.sqlmap: 1.5.11 -> 1.5.12 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 66fa42e74013..429ebc9e0d61 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.11"; + version = "1.5.12"; src = fetchPypi { inherit pname version; - sha256 = "196021f0eff1699853675ee80e13bc856c9f1a088d93a0ac023651d2a3f62cf5"; + sha256 = "sha256-9FplToUd4CIkYZ88+Lat+joniZzRZDOfifH5z4sH8RM="; }; postPatch = '' From 37f81936fadac1d5dd0c4467e550cacc7aa713be Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 30 Nov 2021 15:46:33 +1100 Subject: [PATCH 24/34] python3Packages.bx-python: 0.8.11 -> 0.8.12 --- pkgs/development/python-modules/bx-python/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index aa1e3d1d8648..db5d0166f552 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy27, numpy, cython, zlib, six +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, numpy, cython, zlib, six , python-lzo, nose }: buildPythonPackage rec { pname = "bx-python"; - version = "0.8.11"; - disabled = isPy27; + version = "0.8.12"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "v${version}"; - sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm"; + sha256 = "sha256-bOoD2dY6Zf4HRMqZcGSot1owu/5VEkF6wpuMTzVUlFU="; }; nativeBuildInputs = [ cython ]; From a79ca33d94fb577cbd30bb8c641fa020098f915a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Dec 2021 14:04:44 -0600 Subject: [PATCH 25/34] yosys: 0.10+1 -> 0.11+52, with abc update Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/abc/default.nix | 10 +++++----- pkgs/development/compilers/yosys/default.nix | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index cbcd452033ca..fe73f4f4d6e2 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2020.11.24"; + version = "2021.11.12"; src = fetchFromGitHub { - owner = "yosyshq"; - repo = "abc"; - rev = "4f5f73d18b137930fb3048c0b385c82fa078db38"; - sha256 = "0z1kp223kix7i4r7mbj2bzawkdzc55nsgc41m85dmbajl9fsj1m0"; + owner = "yosyshq"; + repo = "abc"; + rev = "f6fa2ddcfc89099726d60386befba874c7ac1e0d"; + hash = "sha256-0rvMPZ+kL0m/GjlCLx3eXYQ0osQ2wQiS3+csqPl3U9s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 56e0dc3b57d6..4101f06a3480 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.10+1"; + version = "0.11+52"; src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "yosys"; - rev = "7a7df9a3b4996b17bb774377483b15de49aa3d9b"; - sha256 = "sha256-gi/Q6loIQ75NTbS9b/Q8sdrl9NGBDae2+AAGHVYB0WI="; + owner = "YosysHQ"; + repo = "yosys"; + rev = "2be110cb0ba645f95f62ee01b6a6fa46a85d5b26"; + hash = "sha256-A1QKu6SbtpJJPF8/LA5SMUP3/+n5giM6rOYdc6vkl90="; }; enableParallelBuilding = true; From 5b253be5913facf6e4958db2f04c3e31923b5300 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Dec 2021 14:05:39 -0600 Subject: [PATCH 26/34] nextpnr: 2021.09.27 -> 2021.11.24, with apycula update Signed-off-by: Austin Seipp --- pkgs/development/compilers/nextpnr/default.nix | 6 +++--- pkgs/development/python-modules/apycula/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 07d301187a8e..ed64d9e6a66d 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nextpnr"; - version = "2021.09.27"; + version = "2021.11.24"; # tagged as 0.1, but we'll keep tracking HEAD srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "9d8d3bdbc48133ff7758c9c5293e5904bc6e5ba7"; - sha256 = "sha256-5Axo8qX2+ATqQ170QqfhRwYfCRQLCKBW1kc89x9XljE="; + rev = "fd2d4a8f999947ece42f791e19ddc4c2d8b823f2"; + sha256 = "sha256-bGh3svJeVRJO0rTnSYoTndeQrTENx6j9t+GCGX4RX4k="; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 0f86c103c27d..53851ded566d 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.0.1a11"; + version = "0.0.1a12"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - sha256 = "0fwk1pgphpgj0lazjy40ii08xq2qi6bvrfc30rwfj52yff1s9akn"; + hash = "sha256-TFb1C1GaMAK+ckEeXDxSyO2Cgx5dmq62daoSnAiAFmI="; }; nativeBuildInputs = [ setuptools-scm ]; From 2a295f42c84df1a413295e580945d7c334c9b6b0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 Dec 2021 14:05:49 -0600 Subject: [PATCH 27/34] symbiyosys: 2021.09.13 -> 2021.11.30 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/symbiyosys/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 87bd1e2e6370..b9bf480f7e6d 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "symbiyosys"; - version = "2021.09.13"; + version = "2021.11.30"; src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "SymbiYosys"; - rev = "15278f13467bea24a7300e23ebc5555b9261facf"; - sha256 = "sha256-gp9F4MaGgD6XfD7AjuB/LmMVcxFurqWHEiXPeyzlQzk="; + owner = "YosysHQ"; + repo = "SymbiYosys"; + rev = "b409b1179e36d2a3fff66c85b7d4e271769a2d9e"; + hash = "sha256-S7of2upntiMkSdh4kf1RsrjriS31Eh8iEcVvG36isQg="; }; buildInputs = [ ]; From 31ea056e676c29b1f996098165a76ce0bafe1124 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 3 Dec 2021 00:13:08 -0500 Subject: [PATCH 28/34] =?UTF-8?q?poke:=201.3=20=E2=86=92=201.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/poke/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index a24666741e14..cdfacaf92ede 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,13 +19,15 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs="; + sha256 = "sha256-zgVN8pVgySEjATJwPuRJ/hMLbiWrA6psx5a7QBUGqiQ="; }; + outputs = [ "out" "dev" "info" "lib" "man" ]; + postPatch = '' patchShebangs . ''; @@ -46,7 +48,9 @@ in stdenv.mkDerivation rec { ++ lib.optional textStylingSupport gettext ++ lib.optional (!isCross) dejagnu; - configureFlags = lib.optionals guiSupport [ + configureFlags = [ + "--datadir=${placeholder "lib"}/share" + ] ++ lib.optionals guiSupport [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-tkinclude=${tk.dev}/include" @@ -57,6 +61,10 @@ in stdenv.mkDerivation rec { doCheck = !isCross; checkInputs = lib.optionals (!isCross) [ dejagnu ]; + postInstall = '' + moveToOutput share/emacs "$out" + ''; + meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; From 6bad84a25da85dd16a2c9badd2ed893ad231210f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Dec 2021 13:25:15 +1000 Subject: [PATCH 29/34] shellcheck: drop removeAttrs workaround for hydraPlatforms No longer necessary, resolved by 6496069ddaa38504450897831579b44798cab454 --- pkgs/development/tools/shellcheck/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 13cfc93cfc67..e85b596607b1 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -21,9 +21,7 @@ let pname = "shellcheck"; version = bin.version; - inherit (ShellCheck) src; - - meta = builtins.removeAttrs ShellCheck.meta [ "hydraPlatforms" ]; + inherit (ShellCheck) meta src; nativeBuildInputs = [ pandoc ]; From 3baeba2654c87ae9488cbbcc522777634a39041f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 3 Dec 2021 10:39:42 +0200 Subject: [PATCH 30/34] gnuradio: 3.9.3.0 -> 3.9.4.0 --- pkgs/applications/radio/gnuradio/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d92af80701b1..61aafb63b5db 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "3"; + minor = "4"; patch = "0"; } }: let - sourceSha256 = "sha256-jVfExv1CcnlOaaj/XtnfhWAHnQsshZJ1l/zXo0uovdo="; + sourceSha256 = "sha256-O+37CyF0IVPdUB1e68HsaXD0T2VsOLPXOpLNlRYEXUk="; featuresInfo = { # Needed always basic = { @@ -79,6 +79,9 @@ let native = [ doxygen ]; cmakeEnableFlag = "DOXYGEN"; }; + man-pages = { + cmakeEnableFlag = "MANPAGES"; + }; python-support = { pythonRuntime = [ python.pkgs.six ]; native = [ @@ -269,11 +272,6 @@ stdenv.mkDerivation rec { patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch - (fetchpatch { - # https://github.com/gnuradio/gnuradio/pull/5225 - url = "https://github.com/gnuradio/gnuradio/commit/4cef46e3ea0faf04e05ca1a5846cd1568fa51bb2.patch"; - sha256 = "sha256-6AlGbtD1S0c3I9JSoLTMP4YqwDU17i2j+XRkuR+QTuc="; - }) ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must From daeb62345c192b887ad8fe53f1607a1e02365dd1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 1 Dec 2021 14:23:58 +0000 Subject: [PATCH 31/34] lzlib: init at 1.10 --- pkgs/development/libraries/lzlib/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/lzlib/default.nix diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix new file mode 100644 index 000000000000..098336dfbd12 --- /dev/null +++ b/pkgs/development/libraries/lzlib/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, texinfo }: + +stdenv.mkDerivation rec { + pname = "lzlib"; + version = "1.10"; + outputs = [ "out" "info" ]; + + nativeBuildInputs = [ texinfo ]; + + src = fetchurl { + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-HWq3gApbQ+Vv0gYH/Sz9qeVQNQ3JX1vrakzhT4W0EEM="; + }; + + makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; + doCheck = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/${pname}.html"; + description = + "Data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a61a562dbd61..8d6b5858c6b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18542,6 +18542,8 @@ with pkgs; lyra = callPackage ../development/libraries/lyra { }; + lzlib = callPackage ../development/libraries/lzlib { }; + lzo = callPackage ../development/libraries/lzo { }; opencl-clang = callPackage ../development/libraries/opencl-clang { }; From 7fff1e9c0c77a22c83504bf9ba63c3c949bd66f0 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 1 Dec 2021 14:24:35 +0000 Subject: [PATCH 32/34] tarlz: init at 0.11 --- pkgs/tools/archivers/tarlz/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/archivers/tarlz/default.nix diff --git a/pkgs/tools/archivers/tarlz/default.nix b/pkgs/tools/archivers/tarlz/default.nix new file mode 100644 index 000000000000..d5b53c5eaaaa --- /dev/null +++ b/pkgs/tools/archivers/tarlz/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl, lzip, lzlib, texinfo }: + +stdenv.mkDerivation rec { + pname = "tarlz"; + version = "0.11"; + outputs = [ "out" "man" "info" ]; + + nativeBuildInputs = [ lzip texinfo ]; + buildInputs = [ lzlib ]; + + src = fetchurl { + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; + sha256 = "sha256-PalRMerepfYDSaDs4irck+1v5Gy/vlB9CyU6omWUXlk="; + }; + + enableParallelBuilding = true; + makeFlags = [ "CXX:=$(CXX)" ]; + doCheck = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/${pname}.html"; + description = + "Massively parallel combined implementation of the tar archiver and the lzip compressor"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d6b5858c6b2..7674300b4e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9915,6 +9915,8 @@ with pkgs; target-isns = callPackage ../os-specific/linux/target-isns { }; + tarlz = callPackage ../tools/archivers/tarlz { }; + tarsnap = callPackage ../tools/backup/tarsnap { }; tarsnapper = callPackage ../tools/backup/tarsnapper { }; From b5b74c914e135834ee3d88c76a3db9f563ed4ca7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 3 Dec 2021 12:22:31 +0100 Subject: [PATCH 33/34] m17n_lib: fix m17n-db support --- pkgs/tools/inputmethods/m17n-lib/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 2ca60bca3e74..cc290ab0eca9 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { strictDeps = true; # reconf needed to sucesfully cross-compile - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ m17n_db ]; + nativeBuildInputs = [ + autoreconfHook pkg-config + # requires m17n-db tool at build time + m17n_db + ]; # Fails parallel build due to missing intra-package depends: # https://savannah.nongnu.org/bugs/index.php?61377 From 2db21cf063d49cf7c1265959c1799c8cc64da538 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 26 Nov 2021 16:50:20 +0000 Subject: [PATCH 34/34] =?UTF-8?q?coqPackages.equations:=201.2.4=20?= =?UTF-8?q?=E2=86=92=201.3=20(for=20Coq=208.13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/equations/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index e6d5e11fcc5f..f563d1728744 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = switch coq.coq-version [ { case = "8.14"; out = "1.3-8.14"; } - { case = "8.13"; out = "1.2.4+coq8.13"; } + { case = "8.13"; out = "1.3-8.13"; } { case = "8.12"; out = "1.2.4+coq8.12"; } { case = "8.11"; out = "1.2.4+coq8.11"; } { case = "8.10"; out = "1.2.1+coq8.10-2"; } @@ -44,6 +44,8 @@ with lib; mkCoqDerivation { release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3"; release."1.2.4+coq8.13".rev = "v1.2.4-8.13"; release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q"; + release."1.3-8.13".rev = "v1.3-8.13"; + release."1.3-8.13".sha256 = "1jwjbkkkk4bwf6pz4zzz8fy5bb17aqyf4smkja59rgj9ya6nrdhg"; release."1.3-8.14".rev = "v1.3-8.14"; release."1.3-8.14".sha256 = "19bj9nncd1r9g4273h5qx35gs3i4bw5z9bhjni24b413hyj55hkv";