From 561eefecdbbfc15efc5c90988d9685b0be551f9a Mon Sep 17 00:00:00 2001 From: Magnus Viernickel Date: Wed, 20 Mar 2024 13:15:42 +0100 Subject: [PATCH 01/74] fused-effects: jailbreak and unbreak dependents --- .../haskell-modules/configuration-common.nix | 9 +++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 6 ------ .../haskell-modules/hackage-packages.nix | 19 ++++++++----------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec0545a89281..78eef4126147 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,6 +204,15 @@ self: super: { # Too strict bounds on optparse-applicative weeder = lib.warnIf (lib.versionAtLeast super.weeder.version "2.8.0") "jailbreak on weeder may be obsolete" doJailbreak super.weeder; + # test dependency has incorrect upper bound but still supports the newer dependency + # https://github.com/fused-effects/fused-effects/issues/451 + # https://github.com/fused-effects/fused-effects/pull/452 + fused-effects = doJailbreak super.fused-effects; + + # support for transformers >= 0.6 + fused-effects-random = doJailbreak super.fused-effects-random; + fused-effects-readline = doJailbreak super.fused-effects-readline; + # Allow scotty < 0.21 # For < 0.22 add https://github.com/taffybar/taffybar/commit/71fe820d892a85e49ad2f2843eac0a59e01f3fd4 taffybar = appendPatches [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3d63f4c2ae13..71867acc3ec1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1872,7 +1872,6 @@ broken-packages: - funpat # failure in job https://hydra.nixos.org/build/233222123 at 2023-09-02 - funspection # failure in job https://hydra.nixos.org/build/233227352 at 2023-09-02 - fused-effects-exceptions # failure in job https://hydra.nixos.org/build/233203744 at 2023-09-02 - - fused-effects # failure in job https://hydra.nixos.org/build/252724943 at 2024-03-16 - fused-effects-mwc-random # failure in job https://hydra.nixos.org/build/233253228 at 2023-09-02 - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02 - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d315bce3bf6b..865e22e358ce 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1488,10 +1488,6 @@ dont-distribute-packages: - funion - funnyprint - funsat - - fused-effects-lens - - fused-effects-optics - - fused-effects-random - - fused-effects-readline - fused-effects-squeal - fwgl-glfw - fwgl-javascript @@ -2113,7 +2109,6 @@ dont-distribute-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples - - hinit - hinvaders - hinze-streams - hipbot @@ -2813,7 +2808,6 @@ dont-distribute-packages: - monad-metrics-extensible - monad-state - monad-stlike-stm - - monadic-bang - monadiccp-gecode - monarch - monetdb-mapi diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 03301c25a7da..f27f38f07f58 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22741,6 +22741,7 @@ self: { ]; description = "A binding to the X11 graphics library"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.slotThe ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -22812,6 +22813,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft and some Xrender parts"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.slotThe ]; }) {inherit (pkgs.xorg) libXft;}; "X11-xshape" = callPackage @@ -112887,8 +112889,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench transformers ]; description = "A fast, flexible, fused effect system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fused-effects-exceptions" = callPackage @@ -112920,7 +112920,6 @@ self: { testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-mwc-random" = callPackage @@ -112954,7 +112953,6 @@ self: { libraryHaskellDepends = [ base fused-effects optics-core ]; description = "Bridge between the optics and fused-effects ecosystems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-random" = callPackage @@ -112966,7 +112964,6 @@ self: { libraryHaskellDepends = [ base fused-effects random transformers ]; description = "Random number generation for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-readline" = callPackage @@ -112986,7 +112983,6 @@ self: { testHaskellDepends = [ base ]; description = "A readline-like effect and carrier for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-resumable" = callPackage @@ -147987,7 +147983,6 @@ self: { ]; description = "Generic project initialization tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hi"; maintainers = [ lib.maintainers.poscat ]; }) {}; @@ -161284,6 +161279,7 @@ self: { description = "Utility functions for working with html-parse"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.slotThe ]; }) {}; "html-presentation-text" = callPackage @@ -205054,7 +205050,6 @@ self: { testHaskellDepends = [ base ghc ghc-boot ghc-paths transformers ]; description = "GHC plugin to desugar ! into do-notation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "monadic-recursion-schemes" = callPackage @@ -222219,6 +222214,7 @@ self: { description = "Utility functions for working with optparse-applicative"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.slotThe ]; broken = true; }) {}; @@ -328099,7 +328095,7 @@ self: { mainProgram = "xmonad"; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328132,7 +328128,7 @@ self: { mainProgram = "xmonad"; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328179,7 +328175,7 @@ self: { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328286,6 +328282,7 @@ self: { description = "Third party extensions for xmonad with wacky dependencies"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + maintainers = [ lib.maintainers.slotThe ]; }) {}; "xmonad-screenshot" = callPackage From 8944725b1e4512c00f5cc2a2c79d6030713e7175 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 22:13:09 +0000 Subject: [PATCH 02/74] subxt: 0.34.0 -> 0.35.0 --- pkgs/development/tools/subxt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index 2090fe1aacac..e8ec817ffe57 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-1SkAYJ6YdZeaD3c1pekd/nwTEI9Zt/2fmA3Y7PPLxoE="; + hash = "sha256-zNgk8muBxKA3YLP42EIuGSZOyUKRNTvzDvLks3IGHZk="; }; - cargoHash = "sha256-a3LPvPCQklmrtC9XpxARgYeL4bmj2vFsLbiRGjNUGio="; + cargoHash = "sha256-2aekzHVmAVWfJH7dQOlyiR6r3NESsu5W7B6osAOBUWY="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; From 088d5a98c6346a3f9956a81e68e86a216f47ffb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 00:21:22 +0000 Subject: [PATCH 03/74] glasskube: 0.0.4 -> 0.1.0 --- pkgs/by-name/gl/glasskube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index e9130bb321da..07942acbd6ba 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glasskube"; - version = "0.0.4"; + version = "0.1.0"; src = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-+5SinF85bU113C9B025DM83v8ApaXqLV4n1P9zZP3ns="; + hash = "sha256-iJjO4V2sK3e/SpDZ5Lfw7gILgZrI4CGg0wLLVKthGUE="; }; - vendorHash = "sha256-DBqO2EyB1TydsdK2GWJoFGGgTS+E62GogysPX4WtzYU="; + vendorHash = "sha256-iFWcTzZP0DKJ9hrmfUWR4U/VX2zsR+3uojI+GRI2R3I="; CGO_ENABLED = 0; From ed061a50724ef618a18af645e7d50ad34f069167 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 01:12:12 +0000 Subject: [PATCH 04/74] libnabo: 1.1.0 -> 1.1.1 --- pkgs/development/libraries/libnabo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index c6268ea3ee7e..90ed45178d1f 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.1"; pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; repo = "libnabo"; rev = version; - sha256 = "sha256-KWqNJWdyFFe5zAs1HzGnIshGXkBAKjnbEmBZXxty99E="; + sha256 = "sha256-EVbvNwj1aRhRr5PhF6Kkb/UTn4JzF174WX1C+tvBv2Q="; }; nativeBuildInputs = [ cmake ]; From 9a3cd10ad14b60a39f72d8814fade22bd5ab017c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 12:19:29 +0000 Subject: [PATCH 05/74] blueprint-compiler: 0.10.0 -> 0.12.0 --- pkgs/development/compilers/blueprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 14a901d785fe..c37d5c91c276 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-pPrQc2ID84N+50j/A6VAJAOK+D1hjaokhFckOnOaeTw="; + hash = "sha256-pvYSFCiYynH3E6QOTu4RfG+6eucq++yiRu75qucSlZU="; }; nativeBuildInputs = [ From 51adef6fc88c061726ac9f93e52c57f45da1ee81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 12:24:49 +0000 Subject: [PATCH 06/74] yaru-theme: 23.10.0 -> 24.04.0 --- pkgs/data/themes/yaru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 4810bfd55e32..bedf4482f74a 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "23.10.0"; + version = "24.04.0"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-+Szk77QeoM4PwusxKflTh83h16qz6Es6UwDXpbydJUE="; + hash = "sha256-KvpA86YL6toVklRPu4hP3j3w+Q0h/n6mZRZgk3HvMfc="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From 3585b62658d9389dbaac1997bca37a37b8711279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 17:39:27 +0000 Subject: [PATCH 07/74] vitess: 18.0.2 -> 19.0.1 --- pkgs/development/tools/database/vitess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index aa0fa687fb82..6ace9ba59251 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "18.0.2"; + version = "19.0.1"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-CKhnP6sTw7rNzqMhJpwuYhoc5F3MNnL58JxnoKPHyl0="; + hash = "sha256-UDqSCAJObKh65/mDupuWzkYfqJyd6XZCi+qA7NwIO9M="; }; - vendorHash = "sha256-FwgKsv5fQSWKa2K2djEwd7lnbE2qtADoiIokR9U5t1k="; + vendorHash = "sha256-YrgWrk+67Vx9L+uFLipyuousj5DQIleqyxbUSqalZyw="; buildInputs = [ sqlite ]; From eca35aef770c2c00d1aefc853af120ae4b448c1d Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Fri, 2 Feb 2024 15:19:54 +0100 Subject: [PATCH 08/74] vulkan-cts: 1.3.7.3 -> 1.3.8.1 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.8.0 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.8.1 --- pkgs/tools/graphics/vulkan-cts/default.nix | 4 +-- pkgs/tools/graphics/vulkan-cts/sources.nix | 34 +++++++++------------- pkgs/tools/graphics/vulkan-cts/update.sh | 2 +- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 497fd13df341..58444354666f 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.7.3"; + version = "1.3.8.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-YtfUnrqWZwPMkLr3ovJz8Xr2ES1piW0yB+rBAaiQKoQ="; + hash = "sha256-lDMaJjAusK+Hva4BZnrXNmuGdSL04rh1W9PYsjxF3c8="; }; prePatch = '' diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index 3e42e9c4ed7a..e0a197188d66 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -1,25 +1,18 @@ # Autogenerated from vk-cts-sources.py { fetchurl, fetchFromGitHub }: rec { - ESExtractor = fetchFromGitHub { - owner = "Igalia"; - repo = "ESExtractor"; - rev = "v0.3.3"; - hash = "sha256-qqhDv08cLQlLaEj0qfghByK+IohdvQdI2ePfUNFEArQ="; - }; - amber = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "933ecb4d6288675a92eb1650e0f52b1d7afe8273"; - hash = "sha256-v9z4gv/mTjaCkByZn6uDpMteQuIf0FzZXeKyoXfFjXo="; + rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc"; + hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg="; }; glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3"; - hash = "sha256-4SoET76fCfutttK00JGCKVQUn0ivGdTw6GhndvxbIDU="; + rev = "9fd0fcd737f1369e89fb3aa8b2e62bad57ac46c6"; + hash = "sha256-A3IFW3kOuOGj4AfpdDfAHIySDLdIB9IK+wk8TSBcPrk="; }; jsoncpp = fetchFromGitHub { @@ -32,36 +25,35 @@ rec { nvidia-video-samples = fetchFromGitHub { owner = "Igalia"; repo = "vk_video_samples"; - rev = "138bbe048221d315962ddf8413aa6a08cc62a381"; - hash = "sha256-ftHhb5u3l7WbgEu6hHynBnvNbVOn5TFne915M17jiAQ="; + rev = "ce80453dadeea7b1a6409434f3358ef1e46e4ae7"; + hash = "sha256-zgHMaUA7rdLbmkX8lr4p2TW9g1RDyBmUs5rK++wmUjE="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c"; - hash = "sha256-gcKwML5ItccAhX+QtR9G86h0JnaiVQEmOQzQpL005dg="; + rev = "d3c2a6fa95ad463ca8044d7fc45557db381a6a64"; + hash = "sha256-POd/TnbVzq/Xyi0O4hU24Qk4LDD5Af2kHJgQ+wPVDsg="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0"; - hash = "sha256-gju6hJSIWOswGnRxKeJZsU1jgp3HSZAf7wFRxswY+Js="; + rev = "f9184c6501f7e349e0664d281ac93b1db9c1e5ad"; + hash = "sha256-BDnKOUIWZVGPPwmQsMqF1yWy80dl75kdaoztUMnlrqc="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0"; - hash = "sha256-bJ2C1+zjvLiYp5A5AHTevFPU9Yka99imqLwH+uApuoY="; + rev = "d99193d3fcc4b2a0dacc0a9d7e4951ea611a3e96"; + hash = "sha256-pfPErjZ4jSxEg+OgFcELyvqrS0Hm3QWQ3WhQ9T3rJbQ="; }; prePatch = '' - mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs + mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs - cp -r ${ESExtractor} external/ESExtractor/src cp -r ${amber} external/amber/src cp -r ${glslang} external/glslang/src cp -r ${jsoncpp} external/jsoncpp/src diff --git a/pkgs/tools/graphics/vulkan-cts/update.sh b/pkgs/tools/graphics/vulkan-cts/update.sh index 300fe230264e..11081d8708dc 100755 --- a/pkgs/tools/graphics/vulkan-cts/update.sh +++ b/pkgs/tools/graphics/vulkan-cts/update.sh @@ -3,7 +3,7 @@ set -euo pipefail -rawVersion="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/KhronosGroup/VK-GL-CTS/releases" | jq -r 'map(select(.tag_name | startswith("vulkan-cts-"))) | .[0].tag_name')" +rawVersion="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -s "https://api.github.com/repos/KhronosGroup/VK-GL-CTS/releases" | jq -r 'map(select(.tag_name | startswith("vulkan-cts-"))) | .[0].tag_name')" basedir="$(git rev-parse --show-toplevel)" cd "$basedir" From f0991413e3348dcc13dac2c0c34566e1620b8749 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 19:19:58 +0000 Subject: [PATCH 09/74] spleen: 2.0.2 -> 2.1.0 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index e97d8416610c..ef9e2956b924 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-+TDrAolKoG61CuqqELAEICVNcjIPoow6QPFXqMKUN1U="; + hash = "sha256-i0fFbxpuuFj7z540UwVXQEsC+7NFXjjmT7hEc/0MNy8="; }; nativeBuildInputs = [ xorg.mkfontscale ]; From 009ccf2ce760d27ead3b97faa264e25fb52a6ac7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 19:20:10 +0000 Subject: [PATCH 10/74] questdb: 7.3.10 -> 7.4.0 --- pkgs/servers/nosql/questdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 01d86bdb02ef..73822139302a 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.10"; + version = "7.4.0"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-diltorfAnyrXZwohrsZHA91AXuSZolxDUajfmOaD5lM="; + hash = "sha256-XpMLT6oBoZv7V69l7XLm7B/ioeNHSqKkl+4UAsMcYao="; }; nativeBuildInputs = [ From d2ccd0b5be5e7d3682d5cccde00025bd7c4b6c13 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Wed, 6 Mar 2024 21:16:44 +0000 Subject: [PATCH 11/74] aprx: init at 2.9.1-unstable-2021-09-21 --- pkgs/by-name/ap/aprx/package.nix | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/ap/aprx/package.nix diff --git a/pkgs/by-name/ap/aprx/package.nix b/pkgs/by-name/ap/aprx/package.nix new file mode 100644 index 000000000000..79cefac7545a --- /dev/null +++ b/pkgs/by-name/ap/aprx/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, perl +}: + +stdenv.mkDerivation { + pname = "aprx"; + version = "2.9.1-unstable-2021-09-21"; + + src = fetchFromGitHub { + owner = "PhirePhly"; + repo = "aprx"; + rev = "2c84448fe6d897980234961a87ee4c1d4fad69ec"; + sha256 = "sha256-01PB7FaG8GmPm1U15/3g1CfQwdYmf3ThZFdVh2zUAl4="; + }; + + nativeBuildInputs = [ perl ]; + + env.NIX_CFLAGS_COMPILE = toString ([ + "-fcommon" + "-O2" + ] ++ lib.optional stdenv.cc.isClang "-Wno-error=implicit-int"); + + configureFlags = [ + "--with-erlangstorage" + "--sbindir=$(out)/bin" + "--sysconfdir=$(out)/etc" + "--mandir=$(out)/share/man" + ]; + + makeFlags = [ "INSTALL=install" ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man8 $out/etc + ''; + + meta = with lib; { + description = "A multitalented APRS i-gate / digipeater"; + homepage = "http://thelifeofkenneth.com/aprx"; + license = licenses.bsd3; + maintainers = with maintainers; [ sarcasticadmin ]; + mainProgram = "aprx"; + platforms = platforms.unix; + }; +} From faede06ebb62811a43c34e379ac698efacc49d2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 03:40:29 +0000 Subject: [PATCH 12/74] libcloudproviders: 0.3.5 -> 0.3.6 --- pkgs/development/libraries/libcloudproviders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 5977ea33bd24..6161ea78174d 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "libcloudproviders"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor version}/libcloudproviders-${version}.tar.xz"; - sha256 = "uYdFbt2vcVup1iOqK8UBqxtpff/rEaqng6Y3J13xhto="; + sha256 = "O3URCzpP3vTFxaRA5IcB/gVNKuBh0VbIkTa7W6BedLc="; }; outputs = [ "out" "dev" "devdoc" ]; From d41c24a011f28471a7cfbc13f338297c27fd7e61 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 23 Mar 2024 10:03:51 +0100 Subject: [PATCH 13/74] gpg-tui: 0.10.0 -> 0.11.0 Signed-off-by: Matthias Beyer --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 64a273784540..33084d155ea2 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-zTFWIIqIDMI77lg2CB1ug+GeKPVIT1OQ1p80x6tLgGg="; + hash = "sha256-aHmLcWiDy5GMbcKi285tfBggNmGkpVAoZMm4dt8LKak="; }; - cargoHash = "sha256-5qLrmU/SfUfiQOOpECTEn8K142STnbhqE3XbJFxKPZg="; + cargoHash = "sha256-rtBvo2nX4A6K/TBl6xhW8huLXdR6xDUhzMB3KRXRYMs="; nativeBuildInputs = [ gpgme # for gpgme-config From cff3d4db9700d3722bd39153195b93511f08277d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 23 Mar 2024 10:11:13 +0100 Subject: [PATCH 14/74] gpg-tui: Add meta.mainProgram Signed-off-by: Matthias Beyer --- pkgs/tools/security/gpg-tui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 33084d155ea2..ba07ffb9e67f 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -54,5 +54,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda matthiasbeyer ]; + mainProgram = "gpg-tui"; }; } From 768b6a7b81063b283084ceeb711f975012ac51a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 18:41:26 +0000 Subject: [PATCH 15/74] fits-cloudctl: 0.12.16 -> 0.12.17 --- pkgs/tools/admin/fits-cloudctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 0bdfbacab571..2e508323d75e 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.16"; + version = "0.12.17"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - hash = "sha256-5Uf4glKRbxlC7ZdBW51Ter9SBt5rwas+eD4KYWOqPss="; + hash = "sha256-nKVCYgecrjCfAx+9aiFJYq2m/E1yFh1Ie2vK4HqusUo="; }; - vendorHash = "sha256-GFMnBd5HmjFcMhayL1enQuNxXyVdLb6RLakHNxguXks="; + vendorHash = "sha256-xcwJ1tEOCF9BGjcWZPVY/IZkNc2TUtufa7zQfIU4CQQ="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; From 960c144f167f46380ff1d7808f65696ac6bd0d3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 22:43:54 +0000 Subject: [PATCH 16/74] kubectl-view-secret: 0.11.0 -> 0.12.0 --- .../networking/cluster/kubectl-view-secret/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix index 695d63db8165..7f22523e46bc 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-view-secret"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "elsesiy"; repo = pname; rev = "v${version}"; - hash = "sha256-IdbJQ3YCIPcp09/NORWGezqjbwktObN7TuQdq5uAN4A="; + hash = "sha256-5X5rOoERx6HoG3cOBpYm12anMXXDjTtHZzQOOlJeJSs="; }; - vendorHash = "sha256-Q6OosaHDzq9a2Nt18LGiGJ1C2i1/BRYGaNEBeK0Ohiw="; + vendorHash = "sha256-oQvmS05nev+ypfkKAlTN+JbzPux5iAzHsojW8SxtB70="; subPackages = [ "./cmd/" ]; From 93c638d405d1d6bd86eabcd3eec8497e2bc77895 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 00:19:04 +0000 Subject: [PATCH 17/74] fsverity-utils: 1.5 -> 1.6 --- pkgs/os-specific/linux/fsverity-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fsverity-utils/default.nix b/pkgs/os-specific/linux/fsverity-utils/default.nix index 232fc1470465..7d0f1f48e7e5 100644 --- a/pkgs/os-specific/linux/fsverity-utils/default.nix +++ b/pkgs/os-specific/linux/fsverity-utils/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fsverity-utils"; - version = "1.5"; + version = "1.6"; outputs = [ "out" "lib" "dev" ] ++ lib.optional enableManpages "man"; src = fetchzip { url = "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git/snapshot/fsverity-utils-v${version}.tar.gz"; - sha256 = "sha256-ygBOkp2PBe8Z2ak6SXEJ6HHuT4NRKmIsbJDHcY+h8PQ="; + sha256 = "sha256-FZN4MKNmymIXZ2Q0woA0SLzPf4SaUJkj4ssKPsY4xXc="; }; patches = lib.optionals (!enableShared) [ From 8c7aa803dac4761781e423752c36aa5da173786d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 02:46:40 +0000 Subject: [PATCH 18/74] stylelint: 16.2.1 -> 16.3.0 --- pkgs/development/tools/analysis/stylelint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix index 1149bed3fd5f..fcaaa35fa401 100644 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "stylelint"; - version = "16.2.1"; + version = "16.3.0"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-ncJ5oCXe23+an2nFOafMEypFUkwRVW3hZf5pWCKkBNE="; + hash = "sha256-N3M+PhoUjCB+5ouOPDI9m4vPnEoI6+Gk8DBNOquFCqY="; }; - npmDepsHash = "sha256-0+jrfXoM6yqkd43lot3JPB+HBTz3XXzqAulGketRsxU="; + npmDepsHash = "sha256-GRGYDt/qkHZrr7tSM3mPAiBLqUZ0FN1DdDHeBAtNG5w="; dontNpmBuild = true; From f182ef3a4f7735594d7b46dfa000878d5aaa2611 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 11:16:08 +0000 Subject: [PATCH 19/74] cloudfoundry-cli: 8.7.8 -> 8.7.9 --- .../networking/cluster/cloudfoundry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 5f1259b351b8..bd640845331f 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.8"; + version = "8.7.9"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-86FY7SfVZ9aEC72VP7KWj3p+wbAyLXLYtugP+Iv0G80="; + sha256 = "sha256-uFYeiw2hdX25mUBdudNCC4ZuFEoWyfghWmQR8IsQy+w="; }; - vendorHash = "sha256-Y46d8g4KoS5DjMMnX8YjgJYg6ax891vlgH9INZZflJI="; + vendorHash = "sha256-lvSo8kl2du6Sv7zY3uheXaO6Qg+nblW0jpp2q8+1vyk="; subPackages = [ "." ]; From d347f29dc76687d92a49540698f774c4204609b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 23:36:05 +0000 Subject: [PATCH 20/74] pachyderm: 2.9.0 -> 2.9.2 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 1e381c7470fb..1c123a937451 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-5xC0D7XB1db3mxUkzIyvmVIxOlL8XX8Vxpmtf60BQNM="; + hash = "sha256-/9j7umcIffG5jAaUW/jmIX5CUD9dUq5/ZKhzbKx0Kw4="; }; - vendorHash = "sha256-EW8DURf6URPQQMakHnRuF9Xh5iKh2y4cz6XYgXQwJM4="; + vendorHash = "sha256-6iwiepmzxZ4cGsPeHQDNFd2VuhmjTAX9kBdjaQPBMKU="; subPackages = [ "src/server/cmd/pachctl" ]; From b5244c47aa0c32f2477585216b6f4c153c1b1d9b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 24 Mar 2024 23:37:52 +0000 Subject: [PATCH 21/74] questdb: mark with sourceProvenance binaryBytecode --- pkgs/servers/nosql/questdb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 73822139302a..45a94eef2b3b 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "high-performance, open-source SQL database for applications in financial services, IoT, machine learning, DevOps and observability"; homepage = "https://questdb.io/"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.asl20; maintainers = [ lib.maintainers.jacfal ]; platforms = lib.platforms.linux; From 014105ee385a6580a05e51f31a71da25c3f6c67a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Mar 2024 01:19:25 +0000 Subject: [PATCH 22/74] fortran-fpm: 0.10.0 -> 0.10.1 --- pkgs/tools/package-management/fortran-fpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/fortran-fpm/default.nix b/pkgs/tools/package-management/fortran-fpm/default.nix index 0945b0c67e32..40e92dd68e84 100644 --- a/pkgs/tools/package-management/fortran-fpm/default.nix +++ b/pkgs/tools/package-management/fortran-fpm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "fortran-fpm"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/fortran-lang/fpm/releases/download/v${version}/fpm-${version}.F90"; - sha256 = "sha256-SOVj23Sva5OW6+Sme9NxIQ4uqMbis8wjDmgYPOdQlCI="; + sha256 = "sha256-dVPQW2DCp+iJojuhCgeEFVFpugG/x+DKhG986QuE4co="; }; dontUnpack = true; From 54bd4c46e960771f9c427c20bacada7712dbd4f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Mar 2024 06:06:54 +0000 Subject: [PATCH 23/74] sq: 0.47.4 -> 0.48.3 --- pkgs/development/tools/sq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 97e31162b773..2fe418b2ea49 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.47.4"; + version = "0.48.3"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - hash = "sha256-vOp1F87kg9ydr9caGefcYrRJY5foEbKkpMK0eCUzQpQ="; + hash = "sha256-22N8DEaLmGBA3Rx6VzxplUK9UAydo/gx4EsQzzaRHNE="; }; - vendorHash = "sha256-G623vH7pWpJbPvC8sR1xl6x3pcuBUvQwEj1RENuHnI8="; + vendorHash = "sha256-p0r7TuWFpV81Rnxqdj+UJec60EmvVQISURe43SpOpw0="; proxyVendor = true; From a7266560fdc4601698670a20f424df2fc39c2427 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Mar 2024 01:40:54 +0000 Subject: [PATCH 24/74] pgbackrest: 2.50 -> 2.51 --- pkgs/tools/backup/pgbackrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index a2c727332554..6450840668f3 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.50"; + version = "2.51"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-RjkTg80LAUndSVfTrol9hvgNOG6PMC+OkMVjdtjpdbI="; + sha256 = "sha256-o6UROI+t35lHSFeRMLh0nIkmLMdcclpkKNzjkw/z56Q="; }; nativeBuildInputs = [ pkg-config ]; From 3ed9a873daa4364fbcf9f6c63145ae5eea53cebe Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 25 Mar 2024 14:04:07 -0400 Subject: [PATCH 25/74] pgbackrest: build with meson --- pkgs/tools/backup/pgbackrest/default.nix | 45 +++++++++++++++++++----- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index 6450840668f3..02933fcc63ef 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -1,16 +1,21 @@ { lib , stdenv , fetchFromGitHub +, meson +, ninja +, python3 , pkg-config -, postgresql -, openssl -, lz4 +, libbacktrace , bzip2 +, lz4 +, postgresql , libxml2 -, zlib -, zstd , libyaml +, zlib +, libssh2 +, zstd }: + stdenv.mkDerivation rec { pname = "pgbackrest"; version = "2.51"; @@ -22,11 +27,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-o6UROI+t35lHSFeRMLh0nIkmLMdcclpkKNzjkw/z56Q="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql openssl lz4 bzip2 libxml2 zlib zstd libyaml ]; + strictDeps = true; - postUnpack = '' - sourceRoot+=/src + nativeBuildInputs = [ + meson + ninja + python3 + pkg-config + ]; + + buildInputs = [ + libbacktrace + bzip2 + lz4 + postgresql + libxml2 + libyaml + zlib + libssh2 + zstd + ]; + + installPhase = '' + runHook preInstall + + install -Dm555 -t "$out/bin" src/pgbackrest + + runHook postInstall ''; meta = with lib; { From 489c200664e393e68ad5756a4c9c5f7c42899af7 Mon Sep 17 00:00:00 2001 From: pongo1231 Date: Thu, 29 Feb 2024 13:10:39 +0100 Subject: [PATCH 26/74] distrobox: 1.6.0.1 -> 1.7.1 --- .../distrobox/always-mount-nix.patch | 137 ------------------ .../virtualization/distrobox/default.nix | 7 +- 2 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 pkgs/applications/virtualization/distrobox/always-mount-nix.patch diff --git a/pkgs/applications/virtualization/distrobox/always-mount-nix.patch b/pkgs/applications/virtualization/distrobox/always-mount-nix.patch deleted file mode 100644 index c5df13294e92..000000000000 --- a/pkgs/applications/virtualization/distrobox/always-mount-nix.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/distrobox-create b/distrobox-create -index 64e9911..136659d 100755 ---- a/distrobox-create -+++ b/distrobox-create -@@ -74,6 +74,10 @@ unshare_ipc=0 - unshare_netns=0 - unshare_process=0 - unshare_devsys=0 -+ -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Use cd + dirname + pwd so that we do not have relative paths in mount points - # We're not using "realpath" here so that symlinks are not resolved this way - # "realpath" would break situations like Nix or similar symlink based package -@@ -98,6 +102,7 @@ version="1.6.0.1" - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-enter b/distrobox-enter -index 6d8998a..bb05437 100755 ---- a/distrobox-enter -+++ b/distrobox-enter -@@ -75,10 +75,14 @@ skip_workdir=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-generate-entry b/distrobox-generate-entry -index 3243691..6a7910a 100755 ---- a/distrobox-generate-entry -+++ b/distrobox-generate-entry -@@ -45,10 +45,14 @@ icon_default="${HOME}/.local/share/icons/terminal-distrobox-icon.svg" - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-list b/distrobox-list -index aaec85e..235e529 100755 ---- a/distrobox-list -+++ b/distrobox-list -@@ -44,10 +44,14 @@ verbose=0 - version="1.6.0.1" - container_manager="autodetect" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-rm b/distrobox-rm -index 702c1dd..2e37538 100755 ---- a/distrobox-rm -+++ b/distrobox-rm -@@ -54,10 +54,14 @@ rm_home=0 - response_rm_home="N" - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-stop b/distrobox-stop -index fd17cc1..e0dbc8f 100755 ---- a/distrobox-stop -+++ b/distrobox-stop -@@ -52,10 +52,14 @@ non_interactive=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-upgrade b/distrobox-upgrade -index ab5e96f..dc8d295 100755 ---- a/distrobox-upgrade -+++ b/distrobox-upgrade -@@ -39,10 +39,14 @@ rootful=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 912117a016ed..4d5317201ad0 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.6.0.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-UWrXpb20IHcwadPpwbhSjvOP1MBXic5ay+nP+OEVQE4="; + hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng="; }; dontConfigure = true; @@ -16,9 +16,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; - # https://github.com/89luca89/distrobox/pull/1080 - patches = [ ./always-mount-nix.patch ]; - installPhase = '' runHook preInstall From 848565e6e11564392ab707c7103d1b9996eb749d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Mar 2024 02:40:31 +0000 Subject: [PATCH 27/74] linuxKernel.packages.linux_6_8.akvcam: 1.2.5 -> 1.2.6 --- pkgs/os-specific/linux/akvcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index ddf9fed60bfd..ca36850bdcc6 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "sha256-SzyamP6kcJI/GEeFp3uf1APdoBtwoUj0/9Otwtmygvs="; + sha256 = "sha256-8jQxBvWRE9Bsh0oz76gO7o+ROm6Z5QGAIe3WERIouUw="; }; sourceRoot = "${src.name}/src"; From d79b9ff7628744bf42bf9a995979406c7d3721fc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 26 Mar 2024 18:01:34 +0100 Subject: [PATCH 28/74] koreader: 2023.04 -> 2024.03.1 Diff: https://github.com/koreader/koreader/compare/v2023.04...v2024.03.1 --- pkgs/applications/misc/koreader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 857ca1d26a8e..b9eea1c602cb 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -14,15 +14,15 @@ let in stdenv.mkDerivation rec { pname = "koreader"; - version = "2023.04"; + version = "2024.03.1"; src = if stdenv.isAarch64 then fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - sha256 = "sha256-uuspjno0750hQMIB5HEhbV63wCna2izKOHEGIg/X0bU="; + hash = "sha256-9Bu+mWfJuPaH5nV71JMrcGipiZWfcf19KfVauCW92+I="; } else fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-tRUeRB1+UcWT49dchN0YDvd0L5n1YRdtMSFc8yy6m5o="; + hash = "sha256-EZ3iqp0A2BZwI343nvvp71RGQx6FPesUBy4Lha4Yz4U="; }; src_repo = fetchFromGitHub { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "koreader"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-c3j6hs0W0H2jDg6JVfU6ov7r7kucbqrQqf9PAvYBcJ0="; + sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc="; }; sourceRoot = "."; From 1c24f2780eb5f403335b216d4d1cc19635bec96e Mon Sep 17 00:00:00 2001 From: illustris Date: Tue, 19 Mar 2024 22:59:53 +0530 Subject: [PATCH 29/74] spark: 3.5.0->3.5.1 --- .../networking/cluster/spark/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 80f642f9360b..d3c0e1fd3f20 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -62,10 +62,18 @@ let }); in { + # A note on EOL and removing old versions: + # According to spark's versioning policy (https://spark.apache.org/versioning-policy.html), + # minor releases are generally maintained with bugfixes for 18 months. But it doesn't + # make sense to remove a given minor version the moment it crosses this threshold. + # For example, spark 3.3.0 was released on 2022-06-09. It would have to be removed on 2023-12-09 if + # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08). + # A better policy is to keep these versions around, and clean up EOL versions just before + # a new NixOS release. spark_3_5 = spark rec { pname = "spark"; - version = "3.5.0"; - hash = "sha256-f+a4a23aOM0GCDoZlZ7WNXs0Olzyh3yMtO8ZmEoYvZ4="; + version = "3.5.1"; + hash = "sha256-ez6Hm8Ss3nl4mxOHyh67ugYH81/thNRMCja6MQ+9Tpg="; }; spark_3_4 = spark rec { pname = "spark"; From 7eb422e7eef5f06a103ad6303de9e29c496919fe Mon Sep 17 00:00:00 2001 From: nat Date: Wed, 27 Mar 2024 20:43:15 +0100 Subject: [PATCH 30/74] uefisettings: unstable-2024-02-20 -> 0-unstable-2024-03-26 --- pkgs/by-name/ue/uefisettings/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix index 9fd585340f96..f23f5d472a19 100644 --- a/pkgs/by-name/ue/uefisettings/package.nix +++ b/pkgs/by-name/ue/uefisettings/package.nix @@ -5,19 +5,25 @@ rustPlatform.buildRustPackage { name = "uefisettings"; - version = "unstable-2024-02-20"; + version = "0-unstable-2024-03-26"; src = fetchFromGitHub { owner = "linuxboot"; repo = "uefisettings"; - rev = "eae8b8b622b7ac3c572eeb3b3513ed623e272fcc"; - hash = "sha256-zLgrxYBj5bEMZRw5sKWqKuV3jQOJ6dnzbzpoqE0OhKs="; + rev = "f90aed759b9c2217bea336e37ab5282616ece390"; + hash = "sha256-Cik8uVdzhMmgXfx23axkUJBg8zd5afMgYvluN0BJsdo="; }; cargoHash = "sha256-FCQ/1E6SZyVOOAlpqyaDWEZx0y0Wk3Caosvr48VamAA="; - # Tests expect filesystem access to directories like /proc - doCheck = false; + checkFlags = [ + # Expects filesystem access to /proc and rootfs + "--skip=hii::efivarfs::tests::test_get_current_mount_flags_for_proc" + "--skip=hii::efivarfs::tests::test_get_current_mount_flags_for_root" + # Expects FHS + "--skip=ilorest::blobstore::Transport" + "--skip=ilorest::chif::IloRestChif" + ]; meta = with lib; { description = "CLI tool to read/get/extract and write/change/modify BIOS/UEFI settings."; From 08c8996686466d2d29559acca2774c52d406aad7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 19:43:04 +0000 Subject: [PATCH 31/74] upx: 4.2.2 -> 4.2.3 --- pkgs/tools/compression/upx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c9a516705b0e..3a2c6394f90a 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "upx"; repo = "upx"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-0x7SUW+rB5HNRoRkCQIwfOIMpu+kOifxA7Z3SUlY/ME="; + hash = "sha256-3+aOadTqQ1apnrXt2I27j8P6iJF96W90YjxVTPmRhs0="; }; nativeBuildInputs = [ cmake ]; From 149d01aec57946be7b10ec7e324211ab6a63ab6f Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 28 Mar 2024 13:38:59 -0700 Subject: [PATCH 32/74] git-upstream: init at 1.1.0 --- pkgs/by-name/gi/git-upstream/package.nix | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/gi/git-upstream/package.nix diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix new file mode 100644 index 000000000000..26d63852b61f --- /dev/null +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: let + pname = "git-upstream"; + version = "1.1.0"; +in + rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "9999years"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Pq0Z1WwrTP7dCwk6V/E0zu9sLLWr3kNuT3aJRZuRzhI="; + }; + + cargoHash = "sha256-jNpleFrOvt1m2TXTeBXfhTSjWNpCknNoKooF2xsO46w="; + + meta = with lib; { + homepage = "https://github.com/9999years/git-upstream"; + description = "A shortcut for `git push --set-upstream`"; + license = [licenses.mit]; + maintainers = [maintainers._9999years]; + mainProgram = "git-upstream"; + }; + + passthru.updateScript = nix-update-script {}; + } From 90d9ce0e26a39d72be0789fb01d788abc41f7071 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Mar 2024 15:03:54 -0300 Subject: [PATCH 33/74] cue: internalize writeCueValidator via passthru A small step to by-name migration. --- pkgs/development/tools/cue/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index ee9af03bb888..fd82fc9df869 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -4,6 +4,7 @@ , installShellFiles , testers , cue +, callPackage }: buildGoModule rec { @@ -38,9 +39,14 @@ buildGoModule rec { $out/bin/cue eval - <<<'a: "all good"' > /dev/null ''; - passthru.tests.version = testers.testVersion { - package = cue; - command = "cue version"; + passthru = { + writeCueValidator = callPackage ./validator.nix { }; + tests = { + version = testers.testVersion { + package = cue; + command = "cue version"; + }; + }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 039950c8bc9e..fa0a34e2ab76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3680,7 +3680,7 @@ with pkgs; cue = callPackage ../development/tools/cue { }; - writeCueValidator = callPackage ../development/tools/cue/validator.nix { }; + inherit (cue) writeCueValidator; cuelsp = callPackage ../development/tools/cuelsp { }; From 1861d88ec84e9a918480ec36eedaaa789fa3b964 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Mar 2024 15:43:10 -0300 Subject: [PATCH 34/74] cue: move custom installCheckPhase to passthru.tests As recommended by the Nixpkgs documentation, custom tests are better served by passthru.tests, whilst installCheckPhase is recommended for tests that come from the upstream. --- pkgs/development/tools/cue/default.nix | 7 +------ pkgs/development/tools/cue/tests/001-all-good.nix | 11 +++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/cue/tests/001-all-good.nix diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index fd82fc9df869..6f86bd745a24 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -27,21 +27,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; postInstall = '' - # Completions installShellCompletion --cmd cue \ --bash <($out/bin/cue completion bash) \ --fish <($out/bin/cue completion fish) \ --zsh <($out/bin/cue completion zsh) ''; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/cue eval - <<<'a: "all good"' > /dev/null - ''; - passthru = { writeCueValidator = callPackage ./validator.nix { }; tests = { + test-001-all-good = callPackage ./tests/001-all-good.nix { }; version = testers.testVersion { package = cue; command = "cue version"; diff --git a/pkgs/development/tools/cue/tests/001-all-good.nix b/pkgs/development/tools/cue/tests/001-all-good.nix new file mode 100644 index 000000000000..d9919cd7fee4 --- /dev/null +++ b/pkgs/development/tools/cue/tests/001-all-good.nix @@ -0,0 +1,11 @@ +{ lib +, cue +, runCommand +}: + +runCommand "cue-test-001-all-good-${cue.version}" { + nativeBuildInputs = [ cue ]; + meta.timeout = 10; +} '' + cue eval - <<<'a: "all good"' > $out + '' From 4653fbade9b5b242da3deedf9430f2c40685709a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Mar 2024 15:49:50 -0300 Subject: [PATCH 35/74] cue: migrate to by-name --- .../tools/cue/default.nix => by-name/cu/cue/package.nix} | 0 .../tools => by-name/cu}/cue/tests/001-all-good.nix | 0 pkgs/{development/tools => by-name/cu}/cue/validator.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{development/tools/cue/default.nix => by-name/cu/cue/package.nix} (100%) rename pkgs/{development/tools => by-name/cu}/cue/tests/001-all-good.nix (100%) rename pkgs/{development/tools => by-name/cu}/cue/validator.nix (100%) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/by-name/cu/cue/package.nix similarity index 100% rename from pkgs/development/tools/cue/default.nix rename to pkgs/by-name/cu/cue/package.nix diff --git a/pkgs/development/tools/cue/tests/001-all-good.nix b/pkgs/by-name/cu/cue/tests/001-all-good.nix similarity index 100% rename from pkgs/development/tools/cue/tests/001-all-good.nix rename to pkgs/by-name/cu/cue/tests/001-all-good.nix diff --git a/pkgs/development/tools/cue/validator.nix b/pkgs/by-name/cu/cue/validator.nix similarity index 100% rename from pkgs/development/tools/cue/validator.nix rename to pkgs/by-name/cu/cue/validator.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa0a34e2ab76..71b1e419aa93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3678,8 +3678,6 @@ with pkgs; cudd = callPackage ../development/libraries/cudd { }; - cue = callPackage ../development/tools/cue { }; - inherit (cue) writeCueValidator; cuelsp = callPackage ../development/tools/cuelsp { }; From fac20e14d7c9af30d9a2fd60d5f98ae472d4633c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 29 Mar 2024 20:59:47 +0100 Subject: [PATCH 36/74] usql: 0.17.5 -> 0.18.1 https://github.com/xo/usql/releases/tag/v0.18.0 https://github.com/xo/usql/releases/tag/v0.18.1 https://github.com/xo/usql/compare/v0.17.5...v0.18.1 --- pkgs/by-name/us/usql/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 21a5bc99e67b..27ea4e6bb9e3 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,28 +11,24 @@ buildGoModule rec { pname = "usql"; - version = "0.17.5"; + version = "0.18.1"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-Lh5CProffPB/GEYvU1h7St8zgmnS1QOjBgvdUXlsGzc="; + hash = "sha256-2/qB05LQGw4XjnODn0dzuTVqkc9X6YACJ45z+/juHXk="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-IdqSTwQeMRjB5sE53VvTVAXPyIyN+pMj4XziIT31rV0="; + vendorHash = "sha256-PFXULlYMSUoJ23jDA3CTImiUAlcoqHoh1zq+749qO2g="; proxyVendor = true; - # Exclude broken genji, hive & impala drivers (bad group) + # Exclude drivers from the bad group # These drivers break too often and are not used. # - # See https://github.com/xo/usql/pull/347 - # excludedPackages = [ - "genji" - "hive" "impala" ]; From 3030b58d8a1ea3869e05113bb7b93b2f83f0d6a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 20:47:57 +0000 Subject: [PATCH 37/74] libblockdev: 3.0.4 -> 3.1.1 --- pkgs/development/libraries/libblockdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 7b317ecec5a5..8ec4b709b162 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.0.4"; + version = "3.1.1"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${finalAttrs.version}-1"; - hash = "sha256-9tPI8FyHQ9i7p4HLrxiseIH8Y5uqnlsNjcZ1qIHCcRY="; + hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; }; outputs = [ "out" "dev" "devdoc" ]; From aa7ffdd1e5c1bf27b773e02e579b5492c082dd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:33:18 -0700 Subject: [PATCH 38/74] nextcloud26: 26.0.12 -> 26.0.13 Changelog: https://nextcloud.com/changelog/#26-0-13 --- pkgs/servers/nextcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6745fc87dda8..65f1c72eba4b 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -43,13 +43,13 @@ let }; in { nextcloud26 = generic { - version = "26.0.12"; - hash = "sha256-fuTAIAJB9pRfMd0Ewh19FmY0Vj4MuH1iMkkS1BiTI0w="; + version = "26.0.13"; + hash = "sha256-CjYt96EjM0j5nRhT/X558GZ7VSwUXcRQEvq1SsMcea4="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.7"; + version = "27.1.8"; hash = "sha256-hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s="; packages = nextcloud27Packages; }; From 2264eda25431b453264a7cc5afa1b69163b7e341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:33:22 -0700 Subject: [PATCH 39/74] nextcloud27: 27.1.7 -> 27.1.8 Changelog: https://nextcloud.com/changelog/#27-1-8 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 65f1c72eba4b..c5494b22f103 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -50,12 +50,12 @@ in { nextcloud27 = generic { version = "27.1.8"; - hash = "sha256-hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s="; + hash = "sha256-Ciy5vRKCnlOq8XNUPsrQFPCeganXL6YeTEYNhOO47fs="; packages = nextcloud27Packages; }; nextcloud28 = generic { - version = "28.0.3"; + version = "28.0.4"; hash = "sha256-ntQTwN4W9bAzzu/8ypnA1h/GmNvrjbhRrJrfnu+VGQY="; packages = nextcloud28Packages; }; From 51c9db4e57ef5b10a5ca829e214f82c19c0f1262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:34:01 -0700 Subject: [PATCH 40/74] nextcloud28: 28.0.3 -> 28.0.4 Changelog: https://nextcloud.com/changelog/#28-0-4 --- pkgs/servers/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c5494b22f103..3b549e194d88 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -56,7 +56,7 @@ in { nextcloud28 = generic { version = "28.0.4"; - hash = "sha256-ntQTwN4W9bAzzu/8ypnA1h/GmNvrjbhRrJrfnu+VGQY="; + hash = "sha256-m/7O4eEvukjEnppxyqgcS6ELKIR4f6t11kzP0SKhMBk="; packages = nextcloud28Packages; }; From 9119e4c9dee5efeaaf9c455d9108b21e078f3907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:34:39 -0700 Subject: [PATCH 41/74] nextcloudPackages: update --- pkgs/servers/nextcloud/packages/26.json | 12 ++++++------ pkgs/servers/nextcloud/packages/27.json | 16 ++++++++-------- pkgs/servers/nextcloud/packages/28.json | 24 ++++++++++++------------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 7531577da7c2..d795245939df 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "19j2iqn3fjlzcswgbxwvxggzqc3aili8br4vjpr8dd9h1rzm453y", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.7/groupfolders-v14.0.7.tar.gz", - "version": "14.0.7", + "sha256": "1icpj855ib6cx7b57njvhdkcwgd4jmndm3gwh8qgq0mvdlkqpmd0", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.8/groupfolders-v14.0.8.tar.gz", + "version": "14.0.8", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -190,9 +190,9 @@ ] }, "notes": { - "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", - "version": "4.9.2", + "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index f0b30f3d2c32..acf8763b62d2 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "0p3g19cmfjn1zql6cr3bv0cvfj078vh6ian024iwvc6ir8fmsni0", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.5/groupfolders-v15.3.5.tar.gz", - "version": "15.3.5", + "sha256": "00pjva8hc36mnawvbpsi6lizzdhclp30z92vaz8j24xmhf21yvh9", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.6/groupfolders-v15.3.6.tar.gz", + "version": "15.3.6", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -150,8 +150,8 @@ ] }, "maps": { - "sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz", - "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz", + "sha256": "1gyxg5xp4mpdrw8630nqcf5yk8cs7a0kvfik2q01p05d533phc4d", + "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0/maps-1.2.0.tar.gz", "version": "1.2.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -190,9 +190,9 @@ ] }, "notes": { - "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", - "version": "4.9.2", + "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index 52a4c241fd55..ef885c7b7a0e 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -60,9 +60,9 @@ ] }, "end_to_end_encryption": { - "sha256": "1h9is67lbnvgnv6n9p07si0qcp6hgymlq7f07z8s2ckf04p0nzad", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.4/end_to_end_encryption-v1.14.4.tar.gz", - "version": "1.14.4", + "sha256": "04b2hj96gpb4sf1w5r1sxa4fmxrk36vr3pia8i5w2pfi6fbhd9mc", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.5/end_to_end_encryption-v1.14.5.tar.gz", + "version": "1.14.5", "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", "homepage": "https://github.com/nextcloud/end_to_end_encryption", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "00237wdfn7yj31mjpv6crnk0lrazy9iljfcpxjhy4g91d8sc3f5d", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.4/groupfolders-v16.0.4.tar.gz", - "version": "16.0.4", + "sha256": "0cg81d75dg96zp09jy4yzg65v14wf99c2snnj304v4dia410c8a3", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.5/groupfolders-v16.0.5.tar.gz", + "version": "16.0.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -160,9 +160,9 @@ ] }, "notes": { - "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", - "version": "4.9.2", + "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -200,9 +200,9 @@ ] }, "polls": { - "sha256": "1a5fyx1wvgwm2mjqmg5kah3x2y77zw8ly1zvcx6m4x50s113rkbi", - "url": "https://github.com/nextcloud/polls/releases/download/v6.1.6/polls.tar.gz", - "version": "6.1.6", + "sha256": "0gym2sx9lx6nvyby9pj1xml4n9fa7q91rl1i33kb70fclv622ca3", + "url": "https://github.com/nextcloud/polls/releases/download/v7.0.0/polls.tar.gz", + "version": "7.0.0", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ From 26425f36033dd75741d5b1451791b02a165f1277 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 29 Mar 2024 23:07:32 -0400 Subject: [PATCH 42/74] consul: 1.18.0 -> 1.8.1 --- .../co/consul/package.nix} | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) rename pkgs/{servers/consul/default.nix => by-name/co/consul/package.nix} (72%) diff --git a/pkgs/servers/consul/default.nix b/pkgs/by-name/co/consul/package.nix similarity index 72% rename from pkgs/servers/consul/default.nix rename to pkgs/by-name/co/consul/package.nix index 7b29967c91b1..523edd32333e 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -1,8 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + nix-update-script, +}: buildGoModule rec { pname = "consul"; - version = "1.18.0"; + version = "1.18.1"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -16,16 +22,17 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Xhh6Rrcv/FoBjzhWR59gQ/R4A3ynqWYS8djNe3CnGCE="; + hash = "sha256-r1xdz1rjvbvB93hRpvTNQwSqQLOJwqMhqCiXdIttY10="; }; - passthru.tests.consul = nixosTests.consul; - # This corresponds to paths with package main - normally unneeded but consul # has a split module structure in one repo - subPackages = ["." "connect/certgen"]; + subPackages = [ + "." + "connect/certgen" + ]; - vendorHash = "sha256-pNFjLXjtgsK8fjCCmjYclZw1GM4BfyzkTuaRCRIMJ3c="; + vendorHash = "sha256-DcpEHJ88Ehz5m+ddMd44mYTz0agwYhoels5jWJzu1EM="; doCheck = false; @@ -35,13 +42,26 @@ buildGoModule rec { "-X github.com/hashicorp/consul/version.VersionPrerelease=" ]; + passthru = { + tests = { + inherit (nixosTests) consul; + }; + + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Tool for service discovery, monitoring and configuration"; changelog = "https://github.com/hashicorp/consul/releases/tag/v${version}"; homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsl11; - maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick]; + maintainers = with maintainers; [ + pradeepchhetri + vdemeester + nh2 + techknowlogick + ]; mainProgram = "consul"; }; } From 41bf8e94ed8d4ad2470a187654b3fa2b67ac0ac7 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 29 Mar 2024 23:07:59 -0400 Subject: [PATCH 43/74] consul: add adamcstephens as maintainer --- pkgs/by-name/co/consul/package.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 523edd32333e..1a5eb769016d 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -57,6 +57,7 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.bsl11; maintainers = with maintainers; [ + adamcstephens pradeepchhetri vdemeester nh2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3bab087bf0a..963448a3daca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4709,8 +4709,6 @@ with pkgs; protobuf = protobuf_21; }; - consul = callPackage ../servers/consul { }; - consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; consul-template = callPackage ../tools/system/consul-template { }; From 4c1ccd8a9fc1d45d572de34e76853274aef4e0c8 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 30 Mar 2024 02:07:49 -0500 Subject: [PATCH 44/74] wormhole-william: allow local networking in darwin sandbox This is needed for the tests to pass with the sandbox enabled. --- pkgs/tools/networking/wormhole-william/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix index e08c0e51a58a..aeecc73e64d9 100644 --- a/pkgs/tools/networking/wormhole-william/default.nix +++ b/pkgs/tools/networking/wormhole-william/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorHash = "sha256-oJz7HgtjuP4ooXdpofIKaDndGg4WqVZgbT8Yb1AyaMs="; + __darwinAllowLocalNetworking = true; + preCheck = '' # wormhole_test.go:692: failed to establish connection substituteInPlace wormhole/wormhole_test.go \ From 10c0931872d7055bbca97b3b715626dec35c34c2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 30 Mar 2024 14:33:37 +0100 Subject: [PATCH 45/74] vencord: 1.7.3 -> 1.7.4 Signed-off-by: Sefa Eyeoglu --- .../ve}/vencord/package-lock.json | 35 ++++++++----------- .../ve/vencord/package.nix} | 8 ++--- pkgs/{misc => by-name/ve}/vencord/update.sh | 0 pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 19 insertions(+), 28 deletions(-) rename pkgs/{misc => by-name/ve}/vencord/package-lock.json (99%) rename pkgs/{misc/vencord/default.nix => by-name/ve/vencord/package.nix} (89%) rename pkgs/{misc => by-name/ve}/vencord/update.sh (100%) diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/by-name/ve/vencord/package-lock.json similarity index 99% rename from pkgs/misc/vencord/package-lock.json rename to pkgs/by-name/ve/vencord/package-lock.json index 5accca8740bf..6c301b195570 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.7.3", + "version": "1.7.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.7.3", + "version": "1.7.4", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -824,9 +824,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz", - "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==", + "version": "18.19.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.28.tgz", + "integrity": "sha512-J5cOGD9n4x3YGgVuaND6khm5x07MMdAKkRyXnjVR6KFhLMNh2yONGiP7Z+4+tBOt5mK+GvDTiacTOVGGpqiecw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -845,31 +845,24 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.69", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.69.tgz", - "integrity": "sha512-W1HOMUWY/1Yyw0ba5TkCV+oqynRjG7BnteBB+B7JmAK7iw3l2SW+VGOxL+akPweix6jk2NNJtyJKpn4TkpfK3Q==", + "version": "18.2.73", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.73.tgz", + "integrity": "sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==", "dev": true, "dependencies": { "@types/prop-types": "*", - "@types/scheduler": "*", "csstype": "^3.0.2" } }, "node_modules/@types/react-dom": { - "version": "18.2.22", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.22.tgz", - "integrity": "sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==", + "version": "18.2.23", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.23.tgz", + "integrity": "sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==", "dev": true, "dependencies": { "@types/react": "*" } }, - "node_modules/@types/scheduler": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", - "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==", - "dev": true - }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", @@ -4968,9 +4961,9 @@ "dev": true }, "node_modules/table": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz", - "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==", + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", + "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", "dev": true, "dependencies": { "ajv": "^8.0.1", diff --git a/pkgs/misc/vencord/default.nix b/pkgs/by-name/ve/vencord/package.nix similarity index 89% rename from pkgs/misc/vencord/default.nix rename to pkgs/by-name/ve/vencord/package.nix index 3a3ea19b7c04..5a227196cee7 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.7.3"; - gitHash = "caa14ec"; + version = "1.7.4"; + gitHash = "bdef47e"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-BsM7Gt1NEsZu/rxK58+Tix1xIJr6RvgbdjxVnro2soA="; + hash = "sha256-Ub8VzeTkka0oq0CYN/UHjOIH2y3F7Oy9QZpTi6glehI="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-XRVxF0dW0HIsLtijvxM/feW6rI/c4LsnA6Tmrp51arE="; + npmDepsHash = "sha256-/iUNvTk51aoh0TmDXgFG425I37xFuIddkrceF0pNBcE="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/misc/vencord/update.sh b/pkgs/by-name/ve/vencord/update.sh similarity index 100% rename from pkgs/misc/vencord/update.sh rename to pkgs/by-name/ve/vencord/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5b454bfcb0e..37c4b0a18a49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25048,9 +25048,7 @@ with pkgs; vcg = callPackage ../development/libraries/vcg { }; - vencord = callPackage ../misc/vencord { }; - - vencord-web-extension = callPackage ../misc/vencord { buildWebExtension = true; }; + vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; }; vid-stab = callPackage ../development/libraries/vid-stab { inherit (llvmPackages) openmp; From 1a0acec61c41714d9b8b680f2321deb448cc0687 Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Sat, 30 Mar 2024 15:45:48 +0100 Subject: [PATCH 46/74] helix: 23.10 -> 24.03 --- pkgs/applications/editors/helix/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 323218f9437b..698b4f8a1b16 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,29 +1,18 @@ -{ fetchpatch, fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: +{ fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "23.10"; + version = "24.03"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = "sha256-PH4n+zm5ShwOrzzQm0Sn8b8JzAW/CF8UzzKZYE3e2WA="; + hash = "sha256-1myVGFBwdLguZDPo1jrth/q2i5rn5R2+BVKIkCCUalc="; stripRoot = false; }; - patches = [ - # Fixes implicit int error in rescript grammar when building with clang 16. - # https://github.com/nkrkv/tree-sitter-rescript/pull/227. - (fetchpatch { - url = "https://github.com/nkrkv/tree-sitter-rescript/commit/ea93cbf7d9c52f925ed296b4714737e8088f3a19.patch"; - hash = "sha256-gpGPiy+yEs+dMJEnE5O3WC7iSB/6PLJYBYRcdTx//+o="; - extraPrefix = "runtime/grammars/sources/rescript/"; - stripLen = 1; - }) - ]; - - cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs="; + cargoHash = "sha256-THzPUVcmboVJHu3rJ6rev3GrkNilZRMlitCx7M1+HBE="; nativeBuildInputs = [ git installShellFiles makeWrapper ]; From c14ac40d8e526c07d67171861b98be76c95f4791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=9B=81=20Cryolitia?= Date: Sun, 31 Mar 2024 00:16:02 +0800 Subject: [PATCH 47/74] labelImg: 1.8.3 -> 1.8.6 Co-Authored-By: Fabian Freihube --- .../machine-learning/labelimg/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 244eaa05d695..190e56131f10 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,21 +1,33 @@ -{ lib, python3Packages, fetchFromGitHub, qt5 }: +{ lib +, python3Packages +, fetchFromGitHub +, fetchpatch +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "labelImg"; - version = "1.8.3"; + version = "1.8.6"; src = fetchFromGitHub { owner = "tzutalin"; repo = "labelImg"; rev = "v${version}"; - sha256 = "07v106fzlmxrbag4xm06m4mx9m0gckb27vpwsn7sap1bbgc1pap5"; + hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; }; nativeBuildInputs = with python3Packages; [ pyqt5 qt5.wrapQtAppsHook ]; + patches = [ + # fixes https://github.com/heartexlabs/labelImg/issues/838 + # can be removed after next upstream version bump + (fetchpatch { + url = "https://github.com/heartexlabs/labelImg/commit/5c38b6bcddce895d646e944e3cddcb5b43bf8b8b.patch"; + hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; + }) + ]; propagatedBuildInputs = with python3Packages; [ pyqt5 lxml - sip4 ]; preBuild = '' make qt5py3 From 8ce3c897a6e2bfca885ce71fff434667b9f471d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=9B=81=20Cryolitia?= Date: Sun, 31 Mar 2024 00:33:13 +0800 Subject: [PATCH 48/74] labelImg: re-format with `nixfmt-rfc-style` --- .../machine-learning/labelimg/default.nix | 99 ++++++++++--------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 190e56131f10..21174305b9e3 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,50 +1,51 @@ -{ lib -, python3Packages -, fetchFromGitHub -, fetchpatch -, qt5 +{ + lib, + python3Packages, + fetchFromGitHub, + fetchpatch, + qt5, }: - python3Packages.buildPythonApplication rec { - pname = "labelImg"; - version = "1.8.6"; - src = fetchFromGitHub { - owner = "tzutalin"; - repo = "labelImg"; - rev = "v${version}"; - hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; - }; - nativeBuildInputs = with python3Packages; [ - pyqt5 - qt5.wrapQtAppsHook - ]; - patches = [ - # fixes https://github.com/heartexlabs/labelImg/issues/838 - # can be removed after next upstream version bump - (fetchpatch { - url = "https://github.com/heartexlabs/labelImg/commit/5c38b6bcddce895d646e944e3cddcb5b43bf8b8b.patch"; - hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; - }) - ]; - propagatedBuildInputs = with python3Packages; [ - pyqt5 - lxml - ]; - preBuild = '' - make qt5py3 - ''; - postInstall = '' - cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs - ''; - dontWrapQtApps = true; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - meta = with lib; { - description = "A graphical image annotation tool and label object bounding boxes in images"; - mainProgram = "labelImg"; - homepage = "https://github.com/tzutalin/labelImg"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.cmcdragonkai ]; - }; - } +python3Packages.buildPythonApplication rec { + pname = "labelImg"; + version = "1.8.6"; + src = fetchFromGitHub { + owner = "tzutalin"; + repo = "labelImg"; + rev = "v${version}"; + hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; + }; + nativeBuildInputs = with python3Packages; [ + pyqt5 + qt5.wrapQtAppsHook + ]; + patches = [ + # fixes https://github.com/heartexlabs/labelImg/issues/838 + # can be removed after next upstream version bump + (fetchpatch { + url = "https://github.com/heartexlabs/labelImg/commit/5c38b6bcddce895d646e944e3cddcb5b43bf8b8b.patch"; + hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; + }) + ]; + propagatedBuildInputs = with python3Packages; [ + pyqt5 + lxml + ]; + preBuild = '' + make qt5py3 + ''; + postInstall = '' + cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs + ''; + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + meta = with lib; { + description = "A graphical image annotation tool and label object bounding boxes in images"; + mainProgram = "labelImg"; + homepage = "https://github.com/tzutalin/labelImg"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.cmcdragonkai ]; + }; +} From 13b0f4682558ef551d1115881f5603417fbd8dee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 10:17:46 -0700 Subject: [PATCH 49/74] dcgm: use pkgs.autoAddDriverRunpath --- pkgs/os-specific/linux/dcgm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dcgm/default.nix b/pkgs/os-specific/linux/dcgm/default.nix index cc9e26d2b707..a7f3511b3f4b 100644 --- a/pkgs/os-specific/linux/dcgm/default.nix +++ b/pkgs/os-specific/linux/dcgm/default.nix @@ -1,6 +1,7 @@ { lib , gcc11Stdenv , fetchFromGitHub +, autoAddDriverRunpath , catch2 , cmake , cudaPackages_10_2 @@ -108,7 +109,7 @@ in gcc11Stdenv.mkDerivation rec { # autoAddDriverRunpath does not actually depend on or incur any dependency # of cudaPackages. It merely adds an impure, non-Nix PATH to the RPATHs of # executables that need to use cuda at runtime. - cudaPackages_12.autoAddDriverRunpath + autoAddDriverRunpath cmake git From 611761a4d8ba48a66ba8a3e58226de8eba145093 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 10:25:06 -0700 Subject: [PATCH 50/74] prometheus-dcgm-exporter: use pkgs.autoAddDriverRunpath --- pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix index 7c4d2cfae06e..f71cd1776bd4 100644 --- a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, cudaPackages +, autoAddDriverRunpath , dcgm , linuxPackages }: @@ -48,7 +48,7 @@ buildGoModule rec { vendorHash = "sha256-Fjvx15e/psxoqoS6c6GhiQfe7g2aI40EmPR26xLhrzg="; nativeBuildInputs = [ - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; # Tests try to interact with running DCGM service. From e31bb0051f1788b1c7b00b2fb18c44b4b4095156 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 10:26:13 -0700 Subject: [PATCH 51/74] lammps: use pkgs.autoAddDriverRunpath --- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 4c2a80c2f1b7..b881d339300c 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -7,7 +7,7 @@ , blas , lapack , cmake -, cudaPackages +, autoAddDriverRunpath , pkg-config # Available list of packages can be found near here: # @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config # Although not always needed, it is needed if cmakeFlags include # GPU_API=cuda, and it doesn't users that don't enable the GPU package. - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; passthru = { From 076cdf587baf32098b44eb198b4aeb7e8ebd086a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 17:34:26 +0000 Subject: [PATCH 52/74] php81Extensions.blackfire: 1.92.10 -> 1.92.13 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 14b293b37e61..748a153624ab 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.10"; + version = "1.92.13"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-U2vcgqnpz1+pS4aE3usj/ktrbnXw70+xpedx1LkbTvI="; - "8.2" = "sha256-rX57nPA6Fduzv5t/lGYnIPXSbW8ddlpQrDDqj3CUzQ0="; - "8.3" = "sha256-DXlMHZvGZMdzVRVe7Mv80sGHwUkWcr99hsWl7VnOrb0="; + "8.1" = "sha256-QpvnhIvjhm5tqOP72T2yVxV92M3ty/iDICaWsOVFpNg="; + "8.2" = "sha256-NhNbhOGRlhGvTcG4uZwTASWqLp7PQnfDW48GzROxkII="; + "8.3" = "sha256-Gn3M0ANj05QoAZB6W3HWj4zNCDya7lqa+OTv57fnEQ8="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-Czua15eOomeIwaVll6THoKWlg2KSoj8TZn/kmpik8no="; - "8.2" = "sha256-oFqbLJUD8IlhdM3qT1zZUqPs/eikDJB7UqEc5RdPWGk="; - "8.3" = "sha256-/ueCOSPGdLDUQpaPOkiOkk1+xKYAFQoRPVUjrbGjkgI="; + "8.1" = "sha256-zhCjSPTO/RGcc+qvkYlEeV+9ulIXpA0dCMRlSWwj8ys="; + "8.2" = "sha256-J+zdMC4q+MHmwADivqdEfSq8h/KeD5TAanCJKZLuEog="; + "8.3" = "sha256-GGNje7mg1uaLN3zrDXG/igLW9+nhxvPp7nIYW6aJBa4="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-F3bxCPvlXnBNXcp1ia47HdEfrronRqftTUQkvV2yeew="; - "8.2" = "sha256-dLUfo13RILacTgHhfLvzFOz8OvwO+Nv6L6hQ7XE2o5c="; - "8.3" = "sha256-NO6n3euYq0Ind6oxLaSRmj6FkmeWJme+ZcIfumQtEgE="; + "8.1" = "sha256-C2ie8tp3F0sr+edYbUBVw0b1YJtnjyneC8/+x6LWENg="; + "8.2" = "sha256-Ku1pulSErVMvBtiNvLgRw2NpE/bEOkjZ5TY7F/PYJto="; + "8.3" = "sha256-/U/qf7Aqxssvcnc06+K5JeG96Ab09zRvUYcwhSAW4b8="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-DNkRaUD+/MsK8K1i48LnekooKjYen/SRMcYNgVTxRfU="; - "8.2" = "sha256-4MwsaqFozn6ybkjDIj+FUQv42I5YyV7gKXyTmNuLdRg="; - "8.3" = "sha256-KZR0oO53S1cdao6JQJKsNGIUk7bqR1xYcJeXUL7RW6g="; + "8.1" = "sha256-OdqG7G3TzuCVzBA0Xf+It05S6XaVlEd+ugM+gk70OiE="; + "8.2" = "sha256-/nCBQzimhcCrzNuwSVybHBmZZJImm75jKGqh2oXyyZA="; + "8.3" = "sha256-C2SxPYYXewU6PekQ3m1MBiPMPS5tE53gda2Qo7rZ1YQ="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-6rglM9HYhNdN4kumAOQibYt95oa5imgnfkhYDuC3Iso="; - "8.2" = "sha256-+Mi+xWdWYFwrKPL9szo4C0jZn+FMPSmdKiVAiH9MxtY="; - "8.3" = "sha256-0CwhF/z0phPYuOSZ0PRTG90DjjXKFKFEtAovCHYtRFw="; + "8.1" = "sha256-W3reCFcN/bM3hrUeekJLG5qntH/Wvfb+JVly5+g2YEY="; + "8.2" = "sha256-d2YSmyV0mq7KBqoD4Bwdh3izh6hcKTBf6kP+q3QVnfI="; + "8.3" = "sha256-JiCw8Lew2laxOyb+2aSDqlZz2MafFwYwV46dqceEcBk="; }; }; }; From 66b556fa4818725854d2ee85e2b5ae33409a5ef1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 11:19:45 -0700 Subject: [PATCH 53/74] cudaPackages.nccl: use pkgs.autoAddDriverRunpath --- pkgs/development/cuda-modules/nccl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix index e3d10b79386f..fe99b31e12a8 100644 --- a/pkgs/development/cuda-modules/nccl/default.nix +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -6,13 +6,13 @@ fetchFromGitHub, python3, which, + autoAddDriverRunpath, cudaPackages, # passthru.updateScript gitUpdater, }: let inherit (cudaPackages) - autoAddDriverRunpath backendStdenv cuda_cccl cuda_cudart From 46f73d4d2fa173108692a6fec8d4c57f46092fd0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 11:24:01 -0700 Subject: [PATCH 54/74] jaxlib-bin: use pkgs.autoAddDriverRunpath --- pkgs/development/python-modules/jaxlib/bin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index e2260aec4b14..54abdfe48c34 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -5,6 +5,7 @@ # See `python3Packages.jax.passthru` for CUDA tests. { absl-py +, autoAddDriverRunpath , autoPatchelfHook , buildPythonPackage , config @@ -23,7 +24,7 @@ }: let - inherit (cudaPackagesGoogle) autoAddDriverRunpath cudaVersion; + inherit (cudaPackagesGoogle) cudaVersion; version = "0.4.24"; From 6a4ceb7cd72597b99d4099a5f202fa5ae2c082be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 11:31:48 -0700 Subject: [PATCH 55/74] python3Packages.tensorrt: use pkgs.autoAddDriverRunpath --- pkgs/development/python-modules/tensorrt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix index 58a3e64d5610..2f3606d8562e 100644 --- a/pkgs/development/python-modules/tensorrt/default.nix +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -1,5 +1,6 @@ { lib , python +, autoAddDriverRunpath , buildPythonPackage , autoPatchelfHook , unzip @@ -22,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ unzip autoPatchelfHook - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; preUnpack = '' From a696dbb65960f52ff06de47f87fe7d96aaa4a8bb Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 30 Mar 2024 11:55:47 -0700 Subject: [PATCH 56/74] nixos-rebuild: use `substitute` rather than `substituteAll` No change in produced output. --- .../linux/nixos-rebuild/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 4849ff75c54a..17a9bc51732c 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -1,5 +1,5 @@ { callPackage -, substituteAll +, substitute , runtimeShell , coreutils , gnused @@ -14,19 +14,25 @@ let fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix; in -substituteAll { +substitute { name = "nixos-rebuild"; src = ./nixos-rebuild.sh; dir = "bin"; isExecutable = true; - inherit runtimeShell nix; - nix_x86_64_linux = fallback.x86_64-linux; - nix_i686_linux = fallback.i686-linux; - nix_aarch64_linux = fallback.aarch64-linux; - path = lib.makeBinPath [ coreutils gnused gnugrep jq util-linux ]; + + substitutions = [ + "--subst-var-by" "runtimeShell" runtimeShell + "--subst-var-by" "nix" nix + "--subst-var-by" "nix_x86_64_linux" fallback.x86_64-linux + "--subst-var-by" "nix_i686_linux" fallback.i686-linux + "--subst-var-by" "nix_aarch64_linux" fallback.aarch64-linux + "--subst-var-by" "path" (lib.makeBinPath [ coreutils gnused gnugrep jq util-linux ]) + ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' installManPage ${./nixos-rebuild.8} From 48f469c09b93f7bff61d64500006fc037fba8d88 Mon Sep 17 00:00:00 2001 From: Alex Valiushko Date: Fri, 29 Mar 2024 15:49:38 -0700 Subject: [PATCH 57/74] picat: 3.3p3 -> 3.6 --- pkgs/development/compilers/picat/default.nix | 33 +++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index f52eed6ddf8d..a723e314b3ca 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -2,18 +2,20 @@ let ARCH = { - i686-linux = "linux32"; - x86_64-linux = "linux64"; + x86_64-linux = "linux64"; aarch64-linux = "linux64"; + x86_64-cygwin = "cygwin64"; + x86_64-darwin = "mac64"; + aarch64-darwin = "mac64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation { pname = "picat"; - version = "3.3p3"; + version = "3.6"; src = fetchurl { - url = "http://picat-lang.org/download/picat333_src.tar.gz"; - hash = "sha256-LMmAHCGKgon/wNbrXTUH9hiHyGVwwSDpB1236xawzXs="; + url = "http://picat-lang.org/download/picat36_src.tar.gz"; + hash = "sha256-DjP1cjKxRLxMjiHmYX42+kaG5//09IrPIc1O75gLA6k="; }; buildInputs = [ zlib ]; @@ -23,15 +25,30 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; enableParallelBuilding = true; - buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH"; - installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat"; + buildPhase = '' + cd emu + make -j $NIX_BUILD_CORES -f Makefile.$ARCH + ''; + installPhase = '' + mkdir -p $out/bin $out/share + cp picat $out/bin/ + cp -r ../doc $out/share/doc + cp -r ../exs $out/share/examples + ''; meta = with lib; { description = "Logic-based programming langage"; mainProgram = "picat"; homepage = "http://picat-lang.org/"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-cygwin" + "x86_64-darwin" + "aarch64-darwin" + ]; maintainers = with maintainers; [ earldouglas thoughtpolice ]; }; } + From 74484f9aa1f867a6cfdcfabaf22a9971a4bc33ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 20:13:31 +0000 Subject: [PATCH 58/74] cockpit: 313 -> 314 --- pkgs/by-name/co/cockpit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index db977bafe822..9ad68d2bf1e2 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "313"; + version = "314"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-k/JbvotOcVs2OXwGOrnjY0xYRRgvk61p0o7VQTTPqz4="; + hash = "sha256-6iLfUqzBG/pvGNnzMJzMQqnNjPvKJtTHHCSBWtSwwFM="; fetchSubmodules = true; }; From bd0aef53c3d539e7bcfafb41e6203cb2ec2ab5d1 Mon Sep 17 00:00:00 2001 From: Casey Stark Date: Fri, 29 Mar 2024 21:49:56 -0500 Subject: [PATCH 59/74] maintainers: add starkca90 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f5dbcb02b57d..802365b0f6fd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18714,6 +18714,12 @@ githubId = 6362238; name = "Christoph Honal"; }; + starkca90 = { + email = "starkca90@gmail.com"; + github = "starkca90"; + githubId = 2060836; + name = "Casey Stark"; + }; starsep = { email = "nix@starsep.com"; github = "starsep"; From 37f758195529993adfae7642e16afac5eb610b96 Mon Sep 17 00:00:00 2001 From: Casey Stark Date: Fri, 29 Mar 2024 21:29:15 -0500 Subject: [PATCH 60/74] lens: 2023.5.310801 -> 2024.3.191333 & refactor https://k8slens.dev/blog/announcing-lens-2024 Refactor to make overlays possible --- .../networking/cluster/lens/common.nix | 22 ---------- .../networking/cluster/lens/darwin.nix | 33 ++++++-------- .../networking/cluster/lens/default.nix | 44 +++++++++++++++++-- .../networking/cluster/lens/linux.nix | 19 ++------ 4 files changed, 57 insertions(+), 61 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/lens/common.nix diff --git a/pkgs/applications/networking/cluster/lens/common.nix b/pkgs/applications/networking/cluster/lens/common.nix deleted file mode 100644 index e14a176bf464..000000000000 --- a/pkgs/applications/networking/cluster/lens/common.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl }: -let - build = "2023.5.310801-latest"; -in -{ - pname = "lens-desktop"; - version = "6.5.2"; - sources = { - x86_64-darwin = fetchurl { - sha256 = "sha256-AGU1kOQEYBAGqWaxftqSNVdPEblPDujKSBjMeaVNx6M="; - url = "https://api.k8slens.dev/binaries/Lens-${build}.dmg"; - }; - aarch64-darwin = fetchurl { - sha256 = "sha256-Xx+6GPAfjioTrqfFS7cFh6deraR+TtqLlwLbVQxfN8g="; - url = "https://api.k8slens.dev/binaries/Lens-${build}-arm64.dmg"; - }; - x86_64-linux = fetchurl { - sha256 = "sha256-DPgeAhM8k6RXg1Qw2bqJFLPh5q2o7Va6EAe/InQNXLg="; - url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - }; - }; -} diff --git a/pkgs/applications/networking/cluster/lens/darwin.nix b/pkgs/applications/networking/cluster/lens/darwin.nix index e8f17422ec1f..9b9b752b877b 100644 --- a/pkgs/applications/networking/cluster/lens/darwin.nix +++ b/pkgs/applications/networking/cluster/lens/darwin.nix @@ -1,27 +1,20 @@ -{ lib, stdenv, undmg, fetchurl }: -let - common = import ./common.nix { inherit fetchurl; }; - inherit (stdenv.hostPlatform) system; -in -stdenv.mkDerivation rec { - inherit (common) pname version; - src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); +{ stdenv, pname, version, src, meta, undmg }: - appName = "Lens"; +stdenv.mkDerivation { + inherit pname version src meta; - sourceRoot = "${appName}.app"; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; - buildInputs = [ undmg ]; installPhase = '' - mkdir -p "$out/Applications/${appName}.app" - cp -R . "$out/Applications/${appName}.app" + runHook preInstall + + mkdir -p "$out/Applications" + cp -R "Lens.app" "$out/Applications/Lens.app" + + runHook postInstall ''; - meta = with lib; { - description = "The Kubernetes IDE"; - homepage = "https://k8slens.dev/"; - license = licenses.lens; - maintainers = with maintainers; [ dbirks ]; - platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - }; + dontFixup = true; } diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 455065b07036..3e32f8778f74 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -1,5 +1,41 @@ -{ stdenv, callPackage }: -if stdenv.isDarwin then - callPackage ./darwin.nix { } +{ stdenv +, callPackage +, fetchurl +, lib }: + +let + + pname = "lens-desktop"; + version = "2024.3.191333"; + + sources = { + x86_64-linux = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; + hash = "sha256-OywOjXzeW/5uyt50JrutiLgem9S1CrlwPFqfK6gUc7U="; + }; + x86_64-darwin = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg"; + hash = "sha256-yf+WBcOdOM3XsfiXJThVws2r84vG2jwfNV1c+sq6A4s="; + }; + aarch64-darwin = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; + hash = "sha256-hhd8MnwKWpvG7UebkeEoztS45SJVnpvvJ9Zy+y5swik="; + }; + }; + + src = fetchurl { + inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash; + }; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://k8slens.dev/"; + license = licenses.lens; + maintainers = with maintainers; [ dbirks RossComputerGuy starkca90 ]; + platforms = builtins.attrNames sources; + }; + +in if stdenv.isDarwin then + callPackage ./darwin.nix { inherit pname version src meta; } else - callPackage ./linux.nix { } + callPackage ./linux.nix { inherit pname version src meta; } diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index 8a21ceb432da..b54285fdafcc 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,19 +1,16 @@ -{ lib, fetchurl, appimageTools, makeWrapper, nss_latest, stdenv }: +{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }: let - common = import ./common.nix { inherit fetchurl; }; - inherit (stdenv.hostPlatform) system; - - inherit (common) pname version; - src = common.sources.${stdenv.hostPlatform.system} or (throw "Source for ${pname} is not available for ${system}"); name = "${pname}-${version}"; appimageContents = appimageTools.extractType2 { inherit name src; }; + in + appimageTools.wrapType2 { - inherit name src; + inherit name src meta; extraInstallCommands = '' @@ -29,12 +26,4 @@ appimageTools.wrapType2 { ''; extraPkgs = _: [ nss_latest ]; - - meta = with lib; { - description = "The Kubernetes IDE"; - homepage = "https://k8slens.dev/"; - license = licenses.lens; - maintainers = with maintainers; [ dbirks RossComputerGuy ]; - platforms = [ "x86_64-linux" ]; - }; } From 81d3babe25249ee63d8061bd04b76647c543c06c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:32:06 -0700 Subject: [PATCH 61/74] Avoid top-level `with ...;` in pkgs/games/arx-libertatis/default.nix --- pkgs/games/arx-libertatis/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index de597163a3d1..334219a28901 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -8,7 +8,15 @@ , gdb ? null }: -with lib; +let + inherit (lib) + licenses + maintainers + optionals + optionalString + platforms + ; +in stdenv.mkDerivation rec { pname = "arx-libertatis"; From 8f49dedbcb7e91154c5ff134288859ecbd9e1fb4 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:32:35 -0700 Subject: [PATCH 62/74] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/default.nix --- pkgs/games/dwarf-fortress/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 55157950c4f2..777866d8fb0e 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -32,9 +32,16 @@ # changes on later launches, but consider extending the wrapper with your # desired options instead. -with lib; - let + inherit (lib) + attrNames + getAttr + importJSON + listToAttrs + recurseIntoAttrs + replaceStrings + ; + callPackage = newScope self; # The latest Dwarf Fortress version. Maintainers: when a new version comes @@ -43,14 +50,14 @@ let latestVersion = "0.47.05"; # Converts a version to a package name. - versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; + versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}"; dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); }; # A map of names to each Dwarf Fortress package we know about. - df-games = lib.listToAttrs (map + df-games = listToAttrs (map (dfVersion: { name = versionToName dfVersion; value = @@ -83,10 +90,10 @@ let jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; }) - (lib.attrNames self.df-hashes)); + (attrNames self.df-hashes)); self = rec { - df-hashes = lib.importJSON ./game.json; + df-hashes = importJSON ./game.json; # Aliases for the latest Dwarf Fortress and the selected Therapist install dwarf-fortress = getAttr (versionToName latestVersion) df-games; From 751f1fc693e6a9684cd604f24cccc5f81ca96f66 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:34:15 -0700 Subject: [PATCH 63/74] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/dfhack/default.nix --- pkgs/games/dwarf-fortress/dfhack/default.nix | 29 ++++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 914ccbb6ab33..12d097c71415 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -18,9 +18,20 @@ , dfVersion }: -with lib; - let + inherit (lib) + getAttr + hasAttr + isAttrs + licenses + maintainers + optional + optionals + optionalString + platforms + versionOlder + ; + dfhack-releases = { "0.44.10" = { dfHackRelease = "0.44.10-r2"; @@ -62,7 +73,7 @@ let }; release = - if lib.isAttrs dfVersion + if isAttrs dfVersion then dfVersion else if hasAttr dfVersion dfhack-releases then getAttr dfVersion dfhack-releases @@ -112,20 +123,20 @@ in fetchSubmodules = true; }; - patches = lib.optional (lib.versionOlder version "0.44.12-r3") (fetchpatch { + patches = optional (versionOlder version "0.44.12-r3") (fetchpatch { name = "fix-stonesense.patch"; url = "https://github.com/DFHack/stonesense/commit/f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae.patch"; extraPrefix = "plugins/stonesense/"; stripLen = 1; hash = "sha256-wje6Mkct29eyMOcJnbdefwBOLJko/s4JcJe52ojuW+8="; - }) ++ lib.optional (lib.versionOlder version "0.47.04-r1") (fetchpatch { + }) ++ optional (versionOlder version "0.47.04-r1") (fetchpatch { name = "fix-protobuf.patch"; url = "https://github.com/DFHack/dfhack/commit/7bdf958518d2892ee89a7173224a069c4a2190d8.patch"; hash = "sha256-p+mKhmYbnhWKNiGPMjbYO505Gcg634n0nudqH0NX3KY="; }); # gcc 11 fix - CXXFLAGS = lib.optionalString (lib.versionOlder version "0.47.05-r3") "-fpermissive"; + CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive"; # As of # https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4, @@ -142,7 +153,7 @@ in nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] - ++ lib.optionals enableStoneSense [ allegro5 libGLU libGL ]; + ++ optionals enableStoneSense [ allegro5 libGLU libGL ]; preConfigure = '' # Trick build system into believing we have .git @@ -151,7 +162,7 @@ in ''; cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] - ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; + ++ optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; # dfhack expects an unversioned libruby.so to be present in the hack # subdirectory for ruby plugins to function. @@ -161,7 +172,7 @@ in passthru = { inherit dfVersion; }; - meta = with lib; { + meta = { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; homepage = "https://github.com/DFHack/dfhack/"; license = licenses.zlib; From bb2713d671d55aaa33c96c36aaa2001694f97886 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:35:25 -0700 Subject: [PATCH 64/74] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/game.nix --- pkgs/games/dwarf-fortress/game.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 7ce837b7b0b5..8d351cdbbd0d 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -13,9 +13,20 @@ , df-hashes }: -with lib; - let + inherit (lib) + attrNames + elemAt + getAttr + getLib + hasAttr + licenses + maintainers + makeLibraryPath + optionalString + splitVersion + ; + libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; # Map Dwarf Fortress platform names to Nixpkgs platform names. From 1ed3d42bc10eceed4f9ce8443ef773b1704dc52e Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:36:16 -0700 Subject: [PATCH 65/74] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/lazy-pack.nix --- pkgs/games/dwarf-fortress/lazy-pack.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 17037dbdb278..dcaa8102ae98 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -25,9 +25,16 @@ , enableSound ? true }: -with lib; - let + inherit (lib) + getAttr + hasAttr + licenses + maintainers + optional + platforms + ; + dfGame = versionToName dfVersion; dwarf-fortress = if hasAttr dfGame df-games @@ -43,10 +50,10 @@ buildEnv { enableIntro enableTruetype enableFPS enableTextMode enableSound; }) ] - ++ lib.optional enableDwarfTherapist dwarf-therapist - ++ lib.optional enableLegendsBrowser legends-browser; + ++ optional enableDwarfTherapist dwarf-therapist + ++ optional enableLegendsBrowser legends-browser; - meta = with lib; { + meta = { description = "An opinionated wrapper for Dwarf Fortress"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; From 118bbb8bcc34d280a8c5bcea50f7742b2b4a4526 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:38:33 -0700 Subject: [PATCH 66/74] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/themes/default.nix --- pkgs/games/dwarf-fortress/themes/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index d2e2ec5fd19b..ad033b043a46 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -1,6 +1,15 @@ { lib, fetchFromGitHub, ... }: -with builtins; +let + inherit (lib) + importJSON + licenses + listToAttrs + maintainers + platforms + readFile + ; +in listToAttrs (map (v: { @@ -11,11 +20,11 @@ listToAttrs (map repo = v.name; rev = v.version; sha256 = v.sha256; - meta = with lib; { + meta = { platforms = platforms.all; maintainers = [ maintainers.matthewbauer maintainers.shazow ]; license = licenses.free; }; }; }) - (fromJSON (readFile ./themes.json))) + (importJSON ./themes.json)) From 7a546620b231bc271f6a4396c40159dae0a1b23c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:39:12 -0700 Subject: [PATCH 67/74] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/twbt/default.nix --- pkgs/games/dwarf-fortress/twbt/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 68a5b923aaf4..3c582a67770e 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -5,9 +5,15 @@ , dfVersion }: -with lib; - let + inherit (lib) + getAttr + hasAttr + licenses + maintainers + platforms + ; + twbt-releases = { "0.44.10" = { twbtRelease = "6.49"; @@ -75,7 +81,7 @@ stdenvNoCC.mkDerivation rec { cp -a *.png $art/data/art/ ''; - meta = with lib; { + meta = { description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; From 71488a1fb6d2afbc6f90ff622e5ee151628fe2db Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:39:44 -0700 Subject: [PATCH 68/74] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/unfuck.nix --- pkgs/games/dwarf-fortress/unfuck.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 9b7de93ecd7d..3aeee27d87a5 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -19,9 +19,16 @@ , pkg-config }: -with lib; - let + inherit (lib) + getAttr + hasAttr + licenses + maintainers + platforms + versionOlder + ; + unfuck-releases = { "0.43.05" = { unfuckRelease = "0.43.05"; @@ -106,7 +113,7 @@ stdenv.mkDerivation { libGL ] # switched to gtk3 in 0.47.05 - ++ (if lib.versionOlder release.unfuckRelease "0.47.05" then [ + ++ (if versionOlder release.unfuckRelease "0.47.05" then [ gtk2 ] else [ gtk3 @@ -124,7 +131,7 @@ stdenv.mkDerivation { passthru = { inherit dfVersion; }; - meta = with lib; { + meta = { description = "Unfucked multimedia layer for Dwarf Fortress"; homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; From 75d2271a90e2fc6f1ececc3e5faa9467901fc9e0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:40:12 -0700 Subject: [PATCH 69/74] Avoid top-level `with ...;` in pkgs/games/factorio/mods.nix --- pkgs/games/factorio/mods.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix index 7327b9e22870..9a06453ccce8 100644 --- a/pkgs/games/factorio/mods.nix +++ b/pkgs/games/factorio/mods.nix @@ -7,7 +7,7 @@ , allRecommendedMods ? true , allOptionalMods ? false }: -with lib; + let modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; }; in From 9be6e2203771aaa21f2eb373994aef7a0e130fed Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:40:44 -0700 Subject: [PATCH 70/74] Avoid top-level `with ...;` in pkgs/games/factorio/utils.nix --- pkgs/games/factorio/utils.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix index d2b52ae48366..b68cc921996e 100644 --- a/pkgs/games/factorio/utils.nix +++ b/pkgs/games/factorio/utils.nix @@ -1,7 +1,18 @@ # This file provides a top-level function that will be used by both nixpkgs and nixos # to generate mod directories for use at runtime by factorio. { lib, stdenv }: -with lib; +let + inherit (lib) + flatten + head + optionals + optionalString + removeSuffix + replaceStrings + splitString + unique + ; +in { mkModDirDrv = mods: modsDatFile: # a list of mod derivations let @@ -18,7 +29,7 @@ with lib; # NB: there will only ever be a single zip file in each mod derivation's output dir ln -s $modDrv/*.zip $out done - '' + (lib.optionalString (modsDatFile != null) '' + '' + (optionalString (modsDatFile != null) '' cp ${modsDatFile} $out/mod-settings.dat ''); }; From 3faad463744af05bb8136dea7fe596e70c0f70bd Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:41:38 -0700 Subject: [PATCH 71/74] Avoid top-level `with ...;` in pkgs/games/koboredux/default.nix --- pkgs/games/koboredux/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix index 46db8b1da57a..5eb482b09cb3 100644 --- a/pkgs/games/koboredux/default.nix +++ b/pkgs/games/koboredux/default.nix @@ -10,9 +10,16 @@ , useProprietaryAssets ? true }: -with lib; - let + inherit (lib) + and + licenses + maintainers + optional + optionalString + platforms + ; + pname = "koboredux"; version = "0.7.5.1"; From 72f827ec28cf3f700af3b649d6fc23695302fecd Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:42:12 -0700 Subject: [PATCH 72/74] Avoid top-level `with ...;` in pkgs/games/lugaru/default.nix --- pkgs/games/lugaru/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix index b989195bd5a3..ba8dcdebcec3 100644 --- a/pkgs/games/lugaru/default.nix +++ b/pkgs/games/lugaru/default.nix @@ -1,7 +1,13 @@ { lib, stdenv, fetchFromGitLab, cmake, openal, pkg-config, libogg, libvorbis, SDL2, makeWrapper, libpng, libjpeg_turbo, libGLU }: -with lib; +let + inherit (lib) + licenses + maintainers + platforms + ; +in stdenv.mkDerivation rec { @@ -27,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://osslugaru.gitlab.io"; maintainers = [ ]; platforms = platforms.linux; - license = lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } From 8809c410214b5584a1a0efbc1c02723235349a1c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:42:51 -0700 Subject: [PATCH 73/74] Avoid top-level `with ...;` in pkgs/games/openra_2019/common.nix --- pkgs/games/openra_2019/common.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openra_2019/common.nix b/pkgs/games/openra_2019/common.nix index 5932eeb6e6d0..091b56b3d141 100644 --- a/pkgs/games/openra_2019/common.nix +++ b/pkgs/games/openra_2019/common.nix @@ -7,9 +7,16 @@ , zenity }: -with lib; - let + inherit (lib) + licenses + maintainers + makeBinPath + makeLibraryPath + optional + platforms + ; + path = makeBinPath ([ mono python3 ] ++ optional (zenity != null) zenity); rpath = makeLibraryPath [ lua freetype openal SDL2 ]; mkdirp = makeSetupHook { From 4a660d5bb29c955bc776d59f88693a0d7772f3ad Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:43:33 -0700 Subject: [PATCH 74/74] Avoid top-level `with ...;` in pkgs/games/tinyfugue/default.nix --- pkgs/games/tinyfugue/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index d6b9647fcc02..e03364f4a1ad 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -3,10 +3,17 @@ , sslSupport ? true }: -with lib; - assert sslSupport -> openssl != null; +let + inherit (lib) + licenses + maintainers + optional + platforms + ; +in + stdenv.mkDerivation rec { pname = "tinyfugue"; version = "50b8";