From 989ec1afaaf8604493e4b651dc0c02c229e2c1a6 Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Fri, 6 Sep 2024 15:50:04 +0200 Subject: [PATCH 01/54] git-annex-remote-googledrive: modernise --- .../git-annex-remote-googledrive/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix index 72c0e48275ca4..51ca2dbba4a96 100644 --- a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix @@ -6,18 +6,21 @@ , gitpython , humanfriendly , tenacity +, setuptools }: buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ annexremote drivelib @@ -36,7 +39,7 @@ buildPythonApplication rec { meta = with lib; { description = "Git-annex special remote for Google Drive"; - homepage = "https://pypi.org/project/git-annex-remote-googledrive/"; + homepage = "https://github.com/Lykos153/git-annex-remote-googledrive"; license = licenses.gpl3Only; maintainers = with maintainers; [ gravndal ]; mainProgram = "git-annex-remote-googledrive"; From 8ce786ec86be946643567fbfeff9fb44251d77b3 Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Fri, 6 Sep 2024 15:50:19 +0200 Subject: [PATCH 02/54] git-annex-remote-googledrive: add missing distutils dependency --- .../git-annex-remote-googledrive/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix index 51ca2dbba4a96..03bd655adcdc8 100644 --- a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix @@ -7,6 +7,7 @@ , humanfriendly , tenacity , setuptools +, distutils }: buildPythonApplication rec { @@ -27,6 +28,7 @@ buildPythonApplication rec { gitpython tenacity humanfriendly + distutils ]; # while git-annex does come with a testremote command that *could* be used, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 283595a809445..aace7cf18ea99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2211,15 +2211,7 @@ with pkgs; humanfriendly; }; - git-annex-remote-googledrive = callPackage ../applications/version-management/git-annex-remote-googledrive { - inherit (python3Packages) - buildPythonApplication - annexremote - drivelib - gitpython - tenacity - humanfriendly; - }; + git-annex-remote-googledrive = python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive { }; git-annex-remote-rclone = callPackage ../applications/version-management/git-annex-remote-rclone { }; From b3d9c9af37559ec28d541758b057b299a50cec0f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 15 Sep 2024 12:55:38 +0200 Subject: [PATCH 03/54] python3Packages.cffi: use build-system/dependencies --- pkgs/development/python-modules/cffi/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 199324d0e4207..a541c49cd9b99 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -59,14 +59,13 @@ else --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; - nativeBuildInputs = [ - pkg-config - setuptools - ]; + nativeBuildInputs = [ pkg-config ]; + + build-system = [ setuptools ]; buildInputs = [ libffi ]; - propagatedBuildInputs = [ pycparser ]; + dependencies = [ pycparser ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing"; From 4ee79f4f1c6c02a4e07251d3af1ae921537b06dd Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 10 Sep 2024 20:01:03 +0200 Subject: [PATCH 04/54] limine: reformat --- pkgs/by-name/li/limine/package.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 92d62030ae793..14e0c5c8f3014 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -2,13 +2,13 @@ { # Helpers - stdenv -, fetchurl -, lib -, # Dependencies - llvmPackages -, mtools -, nasm + stdenv, + fetchurl, + lib, + # Dependencies + llvmPackages, + mtools, + nasm, }: let @@ -40,9 +40,17 @@ stdenv.mkDerivation { "--enable-all" ]; - installFlags = [ "destdir=$out" "manprefix=/share" ]; + installFlags = [ + "destdir=$out" + "manprefix=/share" + ]; - outputs = [ "out" "doc" "dev" "man" ]; + outputs = [ + "out" + "doc" + "dev" + "man" + ]; meta = with lib; { homepage = "https://limine-bootloader.org/"; From 1e85a6ab16551ed124119645266b04651117dd54 Mon Sep 17 00:00:00 2001 From: nat Date: Wed, 18 Sep 2024 00:05:45 +0200 Subject: [PATCH 05/54] limine: add surfaceflinger as maintainer --- pkgs/by-name/li/limine/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 14e0c5c8f3014..59618561a94b0 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation { maintainers = [ maintainers._48cf maintainers.phip1611 + maintainers.surfaceflinger ]; }; } From 7c3d1d6ccf0a88197bc249194ede3c4344f48544 Mon Sep 17 00:00:00 2001 From: sanana Date: Mon, 2 Sep 2024 09:52:58 +0300 Subject: [PATCH 06/54] maintainers: add sanana --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 26cecd9d0dda3..953e9d09d3d22 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18592,6 +18592,13 @@ githubId = 34161949; keys = [ { fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; } ]; }; + sanana = { + email = "asya@waifu.club"; + github = "AsyaTheAbove"; + githubId = 40492846; + keys = [ { fingerprint = "B766 7717 1644 5ABC DE82 94AA 4679 BF7D CC04 4783"; } ]; + name = "sanana the skenana"; + }; sander = { email = "s.vanderburg@tudelft.nl"; github = "svanderburg"; From 67ff8244c3175b510b53b89eaaf671fc2c6fa2c6 Mon Sep 17 00:00:00 2001 From: nat Date: Wed, 18 Sep 2024 00:10:12 +0200 Subject: [PATCH 07/54] limine: add sanana as maintainer --- pkgs/by-name/li/limine/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 59618561a94b0..a12d2d733eef2 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation { maintainers = [ maintainers._48cf maintainers.phip1611 + maintainers.sanana maintainers.surfaceflinger ]; }; From 0611a6bf49d86a8fc403b8704bb978752c6a2462 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Sep 2024 13:25:46 -0300 Subject: [PATCH 08/54] grim: migrate to by-name --- .../graphics/grim/default.nix => by-name/gr/grim/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/grim/default.nix => by-name/gr/grim/package.nix} (100%) diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/by-name/gr/grim/package.nix similarity index 100% rename from pkgs/tools/graphics/grim/default.nix rename to pkgs/by-name/gr/grim/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97bf23bde3e6c..26f4bfd446348 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5211,8 +5211,6 @@ with pkgs; pythonPackages = python3Packages; }; - grim = callPackage ../tools/graphics/grim { }; - grit = callPackage ../tools/misc/grit { }; grobi = callPackage ../tools/X11/grobi { }; From 4994bd1a2bac2733d9af50eee3fda03ca519f4ef Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Sep 2024 13:29:03 -0300 Subject: [PATCH 09/54] grim: refactor and adopt - finalAttrs - strictDeps --- pkgs/by-name/gr/grim/package.nix | 53 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/gr/grim/package.nix b/pkgs/by-name/gr/grim/package.nix index caea55766d1fe..9055acb96dd86 100644 --- a/pkgs/by-name/gr/grim/package.nix +++ b/pkgs/by-name/gr/grim/package.nix @@ -1,33 +1,30 @@ -{ lib -, stdenv -, fetchFromSourcehut -, pixman -, libpng -, libjpeg -, meson -, ninja -, pkg-config -, scdoc -, wayland -, wayland-protocols -, wayland-scanner +{ + lib, + fetchFromSourcehut, + libjpeg, + libpng, + meson, + ninja, + pixman, + pkg-config, + scdoc, + stdenv, + wayland, + wayland-protocols, + wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grim"; version = "1.4.1"; src = fetchFromSourcehut { owner = "~emersion"; - repo = pname; - rev = "v${version}"; + repo = "grim"; + rev = "v${finalAttrs.version}"; hash = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o="; }; - mesonFlags = [ - "-Dwerror=false" - ]; - nativeBuildInputs = [ meson ninja @@ -44,12 +41,16 @@ stdenv.mkDerivation rec { wayland-protocols ]; - meta = with lib; { - description = "Grab images from a Wayland compositor"; + mesonFlags = [ (lib.mesonBool "werror" false) ]; + + strictDeps = true; + + meta = { homepage = "https://github.com/emersion/grim"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + description = "Grab images from a Wayland compositor"; + license = lib.licenses.mit; mainProgram = "grim"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; }; -} +}) From 608bd15ce5fbb82a39cea2a9fb5b0ac4f7d23306 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 21 Sep 2024 00:30:00 +0200 Subject: [PATCH 10/54] nixos/i2pd: remove `with lib;` --- nixos/modules/services/networking/i2pd.nix | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 2bb9df15de2c3..fcdb17333776e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -1,17 +1,17 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption mkEnableOption types optional optionals; + inherit (lib.types) nullOr bool listOf str; cfg = config.services.i2pd; homeDir = "/var/lib/i2pd"; strOpt = k: v: k + " = " + v; - boolOpt = k: v: k + " = " + boolToString v; + boolOpt = k: v: k + " = " + lib.boolToString v; intOpt = k: v: k + " = " + toString v; - lstOpt = k: xs: k + " = " + concatStringsSep "," xs; + lstOpt = k: xs: k + " = " + lib.concatStringsSep "," xs; optionalNullString = o: s: optional (s != null) (strOpt o s); optionalNullBool = o: b: optional (b != null) (boolOpt o b); optionalNullInt = o: i: optional (i != null) (intOpt o i); @@ -54,7 +54,7 @@ let mkKeyedEndpointOpt = name: addr: port: keyloc: (mkEndpointOpt name addr port) // { keys = mkOption { - type = with types; nullOr str; + type = nullOr str; default = keyloc; description = '' File to persist ${lib.toUpper name} keys. @@ -162,8 +162,8 @@ let (sec "meshnets") (boolOpt "yggdrasil" cfg.yggdrasil.enable) ] ++ (optionalNullString "yggaddress" cfg.yggdrasil.address) - ++ (flip map - (collect (proto: proto ? port && proto ? address) cfg.proto) + ++ (lib.flip map + (lib.collect (proto: proto ? port && proto ? address) cfg.proto) (proto: let protoOpts = [ (sec proto.name) (boolOpt "enabled" proto.enable) @@ -178,10 +178,10 @@ let ++ (optionals (proto ? outproxy) (optionalNullString "outproxy" proto.outproxy)) ++ (optionals (proto ? outproxyPort) (optionalNullInt "outproxyport" proto.outproxyPort)) ++ (optionals (proto ? outproxyEnable) (optionalNullBool "outproxy.enabled" proto.outproxyEnable)); - in (concatStringsSep "\n" protoOpts) + in (lib.concatStringsSep "\n" protoOpts) )); in - pkgs.writeText "i2pd.conf" (concatStringsSep "\n" opts); + pkgs.writeText "i2pd.conf" (lib.concatStringsSep "\n" opts); tunnelConf = let mkOutTunnel = tun: @@ -200,7 +200,7 @@ let ++ (optionals (tun ? outbound.quantity) (optionalNullInt "outbound.quantity" tun.outbound.quantity)) ++ (optionals (tun ? crypto.tagsToSend) (optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend)); in - concatStringsSep "\n" outTunOpts; + lib.concatStringsSep "\n" outTunOpts; mkInTunnel = tun: let @@ -214,16 +214,16 @@ let ++ (optionals (tun ? inPort) (optionalNullInt "inport" tun.inPort)) ++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList)); in - concatStringsSep "\n" inTunOpts; + lib.concatStringsSep "\n" inTunOpts; - allOutTunnels = collect (tun: tun ? port && tun ? destination) cfg.outTunnels; - allInTunnels = collect (tun: tun ? port && tun ? address) cfg.inTunnels; + allOutTunnels = lib.collect (tun: tun ? port && tun ? destination) cfg.outTunnels; + allInTunnels = lib.collect (tun: tun ? port && tun ? address) cfg.inTunnels; opts = [ notice ] ++ (map mkOutTunnel allOutTunnels) ++ (map mkInTunnel allInTunnels); in - pkgs.writeText "i2pd-tunnels.conf" (concatStringsSep "\n" opts); + pkgs.writeText "i2pd-tunnels.conf" (lib.concatStringsSep "\n" opts); - i2pdFlags = concatStringsSep " " ( + i2pdFlags = lib.concatStringsSep " " ( optional (cfg.address != null) ("--host=" + cfg.address) ++ [ "--service" ("--conf=" + i2pdConf) @@ -235,7 +235,7 @@ in { imports = [ - (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) + (lib.mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) ]; ###### interface @@ -252,7 +252,7 @@ in ''; }; - package = mkPackageOption pkgs "i2pd" { }; + package = lib.mkPackageOption pkgs "i2pd" { }; logLevel = mkOption { type = types.enum ["debug" "info" "warn" "error"]; @@ -269,7 +269,7 @@ in logCLFTime = mkEnableOption "full CLF-formatted date and time to log"; address = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Your external IP or hostname. @@ -277,7 +277,7 @@ in }; family = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Specify a family the router belongs to. @@ -285,7 +285,7 @@ in }; dataDir = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Alternative path to storage of i2pd data (RI, keys, peer profiles, ...) @@ -301,7 +301,7 @@ in }; ifname = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Network interface to bind to. @@ -309,7 +309,7 @@ in }; ifname4 = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' IPv4 interface to bind to. @@ -317,7 +317,7 @@ in }; ifname6 = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' IPv6 interface to bind to. @@ -325,7 +325,7 @@ in }; ntcpProxy = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Proxy URL for NTCP transport. @@ -399,7 +399,7 @@ in reseed.verify = mkEnableOption "SU3 signature verification"; reseed.file = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Full path to SU3 file to reseed from. @@ -407,7 +407,7 @@ in }; reseed.urls = mkOption { - type = with types; listOf str; + type = listOf str; default = []; description = '' Reseed URLs. @@ -415,7 +415,7 @@ in }; reseed.floodfill = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Path to router info of floodfill to reseed from. @@ -423,7 +423,7 @@ in }; reseed.zipfile = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Path to local .zip file to reseed from. @@ -431,7 +431,7 @@ in }; reseed.proxy = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' URL for reseed proxy, supports http/socks. @@ -446,7 +446,7 @@ in ''; }; addressbook.subscriptions = mkOption { - type = with types; listOf str; + type = listOf str; default = [ "http://inr.i2p/export/alive-hosts.txt" "http://i2p-projekt.i2p/hosts.txt" @@ -460,7 +460,7 @@ in trust.enable = mkEnableOption "explicit trust options"; trust.family = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Router Family to trust for first hops. @@ -468,7 +468,7 @@ in }; trust.routers = mkOption { - type = with types; listOf str; + type = listOf str; default = []; description = '' Only connect to the listed routers. @@ -543,7 +543,7 @@ in yggdrasil.enable = mkEnableOption "Yggdrasil"; yggdrasil.address = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Your local yggdrasil address. Specify it if you want to bind your router to a @@ -572,7 +572,7 @@ in }; strictHeaders = mkOption { - type = with types; nullOr bool; + type = nullOr bool; default = null; description = '' Enable strict host checking on WebUI. @@ -580,7 +580,7 @@ in }; hostname = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = '' Expected hostname for WebUI. @@ -591,7 +591,7 @@ in proto.httpProxy = (mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "httpproxy-keys.dat") // { outproxy = mkOption { - type = with types; nullOr str; + type = nullOr str; default = null; description = "Upstream outproxy bind address."; }; @@ -648,7 +648,7 @@ in description = "Service port. Default to the tunnel's listen port."; }; accessList = mkOption { - type = with types; listOf str; + type = listOf str; default = []; description = "I2P nodes that are allowed to connect to this service."; }; From fdf019979ebe923d0393765f08975d33e557842e Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 21 Sep 2024 16:30:00 +0200 Subject: [PATCH 11/54] nixos/jenkinsSlave: remove `with lib;` --- .../services/continuous-integration/jenkins/slave.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index c0599a65b480a..d5a6b93a6cf8d 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -with lib; + let + inherit (lib) mkIf mkOption types; cfg = config.services.jenkinsSlave; masterCfg = config.services.jenkins; in { @@ -47,16 +48,16 @@ in { ''; }; - javaPackage = mkPackageOption pkgs "jdk" { }; + javaPackage = lib.mkPackageOption pkgs "jdk" { }; }; }; config = mkIf (cfg.enable && !masterCfg.enable) { - users.groups = optionalAttrs (cfg.group == "jenkins") { + users.groups = lib.optionalAttrs (cfg.group == "jenkins") { jenkins.gid = config.ids.gids.jenkins; }; - users.users = optionalAttrs (cfg.user == "jenkins") { + users.users = lib.optionalAttrs (cfg.user == "jenkins") { jenkins = { description = "jenkins user"; createHome = true; From a70951ade35635c56c6f9f3ceaf1fb8eb48876e8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 25 Sep 2024 21:39:54 +0300 Subject: [PATCH 12/54] appflowy: Fix missing attribute on `aarch64-linux` --- pkgs/applications/office/appflowy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index f3a7ea76c533d..0790cb44d1f33 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -25,7 +25,8 @@ let }; aarch64-darwin = x86_64-darwin; } - ."${stdenvNoCC.hostPlatform.system}"; + ."${stdenvNoCC.hostPlatform.system}" + or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}"); in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; From 5176f640ee631ef58dafaac6a9fe689e122f8041 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 25 Sep 2024 23:48:05 +0300 Subject: [PATCH 13/54] cups-idprt-{barcode,mt888,mt890,sp900,tspl}: Fix missing attribute on `aarch64-linux` `getAttr` has a slightly better performance but it's not possible to throw with it so one would have to do `builtins.hasAttr` first which makes that methods performance worse than string interpolation and `or throw` --- pkgs/by-name/cu/cups-idprt-barcode/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-mt888/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-mt890/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-sp900/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-tspl/package.nix | 11 +++++++---- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/cu/cups-idprt-barcode/package.nix b/pkgs/by-name/cu/cups-idprt-barcode/package.nix index 1f9bb0b168f91..a5e3a85b5a943 100644 --- a/pkgs/by-name/cu/cups-idprt-barcode/package.nix +++ b/pkgs/by-name/cu/cups-idprt-barcode/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-barcode: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-mt888/package.nix b/pkgs/by-name/cu/cups-idprt-mt888/package.nix index 27441a467b303..0fa4fd146d060 100644 --- a/pkgs/by-name/cu/cups-idprt-mt888/package.nix +++ b/pkgs/by-name/cu/cups-idprt-mt888/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-mt888: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-mt890/package.nix b/pkgs/by-name/cu/cups-idprt-mt890/package.nix index ca3baacbcfe46..96ca74b35ee60 100644 --- a/pkgs/by-name/cu/cups-idprt-mt890/package.nix +++ b/pkgs/by-name/cu/cups-idprt-mt890/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-mt890: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-sp900/package.nix b/pkgs/by-name/cu/cups-idprt-sp900/package.nix index ed07c4fc36be4..34243a325ee72 100644 --- a/pkgs/by-name/cu/cups-idprt-sp900/package.nix +++ b/pkgs/by-name/cu/cups-idprt-sp900/package.nix @@ -34,10 +34,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-sp900: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-tspl/package.nix b/pkgs/by-name/cu/cups-idprt-tspl/package.nix index 60aa4c8c80d81..f165015c14f4f 100644 --- a/pkgs/by-name/cu/cups-idprt-tspl/package.nix +++ b/pkgs/by-name/cu/cups-idprt-tspl/package.nix @@ -33,10 +33,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-tspl: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall From 99fdda89e357e9957daa842e588afad7a8db2345 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Sep 2024 20:09:35 +0000 Subject: [PATCH 14/54] kubevela: 1.9.11 -> 1.9.12 --- pkgs/applications/networking/cluster/kubevela/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/applications/networking/cluster/kubevela/default.nix index caa2519af57aa..1c8b618518702 100644 --- a/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/pkgs/applications/networking/cluster/kubevela/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "kubevela"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "kubevela"; repo = "kubevela"; rev = "v${version}"; - hash = "sha256-u9UGV1UwZoj4eSqqMLf8BvsfTFIYagoslN5pflDKm8c="; + hash = "sha256-AltyaV4tFW/3nOzEgWwlIqFXVaEtcpN5IxdFScZ7Nes="; }; - vendorHash = "sha256-NnUZnlvVb2VmNx4HM8lkbTNcQA3/pctkg1UVpOY8Acs="; + vendorHash = "sha256-Ethbor1nZRYuemBL03QdnExNJtdOJ4w76sjLrBDW9Aw="; ldflags = [ "-s" "-w" From 1231dc5014fd6470c7dec7bbdb8e7fd39a0e7e9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Sep 2024 22:57:25 +0000 Subject: [PATCH 15/54] rocketchat-desktop: 4.1.0 -> 4.1.1 --- .../instant-messengers/rocketchat-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 9cfa239e081a9..95ab2c39b21dd 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-SMpcsRKxx51O7cagDFIrp70QiAHaoAU5NhLHtog647g="; + hash = "sha256-6NvQtc+IUWqixFwWUHvl+SkSl0pk3SK4VmQXoZYyqqg="; }; nativeBuildInputs = [ From 5f7659f9e899d92a60f7ddab6d3442c0ca958ecc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Sep 2024 23:21:52 +0000 Subject: [PATCH 16/54] turso-cli: 0.97.1 -> 0.97.2 --- pkgs/development/tools/turso-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index e87cd2c9e210c..d08622783bf5a 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.97.1"; + version = "0.97.2"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-sS9H9mdbjV2EEsMKikQKND+gPeghH5cqRxhHcbjr7ok="; + hash = "sha256-6Ci1QESSN6wNpUAQoWtTyHWrGaI/3xs/jGCSkJsYC8o="; }; vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; From 1c861357c1e0b11d91e46c972eb34f17627a9c7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 01:19:57 +0000 Subject: [PATCH 17/54] anilibria-winmaclinux: 2.2.18 -> 2.2.19 --- pkgs/applications/video/anilibria-winmaclinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 3369316621713..8bb21ac9d43b2 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "2.2.18"; + version = "2.2.19"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-gFIz2tkuBaC4DoN/oVNra5pQi23MAuhFJRGxEcZgvAo="; + hash = "sha256-f4AlTfLTn0GvBj3ztpkNPc6BDlLsEtz/yE5F2WfjU8U="; }; sourceRoot = "${src.name}/src"; From c80786a33c59ceaa47483da38b4d6a7649a19383 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 02:12:32 +0000 Subject: [PATCH 18/54] flix: 0.50.0 -> 0.51.0 --- pkgs/development/compilers/flix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 61fbdd6fe9d80..2bf6b754e2973 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.50.0"; + version = "0.51.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-fAEt7JsljnEXubYgiF8uEOuoOXHjv9AHgQbPunaEMw4="; + sha256 = "sha256-JeOw9mdmFAG0mMe8G/yanKCLPbCUPJxUBluNFFqjfbA="; }; dontUnpack = true; From 1f03c3f5421e71c522a443b87f14952e29bd4355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 02:18:55 +0000 Subject: [PATCH 19/54] clj-kondo: 2024.08.29 -> 2024.09.27 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index b24d2b9fd2555..e764f34c91253 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -3,12 +3,12 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2024.08.29"; + version = "2024.09.27"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-0Mvj8FW6/Q9GudaD3lnRFvTjMkkAGwpAokdNJa/HfsI="; + sha256 = "sha256-DrSfL1WazlNd5H0jG6m0S5aED4BLVufr1rGIAyifn6E="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; From 648fd81e3e4834328d5d79f6fa22981f4d75ac89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 03:20:31 +0000 Subject: [PATCH 20/54] boxed-cpp: 1.4.2 -> 1.4.3 --- pkgs/by-name/bo/boxed-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boxed-cpp/package.nix b/pkgs/by-name/bo/boxed-cpp/package.nix index 442a27ed33742..3ce5a5c9c6084 100644 --- a/pkgs/by-name/bo/boxed-cpp/package.nix +++ b/pkgs/by-name/bo/boxed-cpp/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (final: { pname = "boxed-cpp"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "boxed-cpp"; rev = "v${final.version}"; - hash = "sha256-Z/dfSa/6SnzLWnFCXjJUbTBNa5dFZna099Crbcya/Dw="; + hash = "sha256-uZ/wT159UuEcTUtoQyt0D59z2wnLT5KpeeCpjyij198="; }; nativeBuildInputs = [ cmake ]; From 7d804872788875672c61a760e4b6e65ba51be830 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 04:53:15 +0000 Subject: [PATCH 21/54] gosec: 2.21.2 -> 2.21.4 --- pkgs/development/tools/gosec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index a2c6cd85e5ed0..be4d2d39dc5ff 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.21.2"; + version = "2.21.4"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-1lVyIytIorxxipDZAf2AYqtO1Slz9aUw6MpC40ji89w="; + hash = "sha256-fu0k+dZyEo2l0PWfN8iryGgUIJsWi7AQD3ku+w1tuGM="; }; - vendorHash = "sha256-jxbGAEvkjvuK878nkl8TGbZmBzS7n9nG4hH9BL3UGwE="; + vendorHash = "sha256-LYEAQ/7S31Rv2gmkLReV1lKeAHW5DpKkegKb0Js75q0="; subPackages = [ "cmd/gosec" From 27e58c943f2fcf19e9efe320f9d9913735fe439d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 04:54:54 +0000 Subject: [PATCH 22/54] automatic-timezoned: 2.0.32 -> 2.0.33 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index b149649a75eb2..83ac6002f20c1 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.32"; + version = "2.0.33"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J8DAHwbpcSQtOWOkWjya3zXRhr9Dje2QzumDmeq2rR0="; + sha256 = "sha256-q2OVd3eb1zGQMiI3T0oXAq5dFzdYTYQGqPNBUeuMEck="; }; - cargoHash = "sha256-M0MX2ZjVsJuWQ6nuxpF1VDYIlGPAsebRbxZ40oSYVO0="; + cargoHash = "sha256-cu6d9sCvVYt+85cl0dTOY9874QdnyA13T7Nb/KFjkMg="; meta = with lib; { description = "Automatically update system timezone based on location"; From f1a96b5bd6988f349653daf664e6aa52ae490dc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 05:00:37 +0000 Subject: [PATCH 23/54] nsc: 2.8.9 -> 2.9.0 --- pkgs/tools/system/nsc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index 88dafe7f4f3e7..deefe7056929c 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.8.9"; + version = "2.9.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-KNW9meeThHT9ZZJFXsb9RAzLsvgnaXWbuMR4tei/s2U="; + hash = "sha256-pzUjcezzZ3Fo9b7nuPV08ZSxrk7cBufQL6Dbfvmjkg4="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-3qUgzvb7VkYrlYb+W0ZycJ0S7CQAHSUFNQSfwiKqMdI="; + vendorHash = "sha256-tZTrjIax3zofrRuSJQO7VA7rlTXN/GT1KTcsLpvB+2Q="; nativeBuildInputs = [ installShellFiles ]; @@ -46,7 +46,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.8.9.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.9.0.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. From acc3e5930514fde147a667cf4d459d3f54b79e10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 05:16:55 +0000 Subject: [PATCH 24/54] pachyderm: 2.11.2 -> 2.11.3 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index dee29c2fd9c2e..56bad49da759d 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.11.2"; + version = "2.11.3"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-CNYFaUZBUwa+RF4JFXSmsdHalCPeowM4FYeWBojOOjA="; + hash = "sha256-tn+wOd01zClMcANYTolXHTEMGohXGNnKbsZ5NA4kELc="; }; vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc="; From 35fbcfdd6dde0b5feebb671ee11fa45ec7a50b21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 08:44:40 +0000 Subject: [PATCH 25/54] stackql: 0.5.740 -> 0.5.742 --- pkgs/by-name/st/stackql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index f63f7fd718b85..fb0b02d559cd4 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.740"; + version = "0.5.742"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-XwNz+O0FSNzWFiZvOUQCvcjg6L0f53c2ZaNiT8T0ikU="; + hash = "sha256-GMc22n0y4lKv4DlG9069p/TrMJLyw0Zdiykuo41Tgys="; }; vendorHash = "sha256-dssGqcS9l3VipEypKErlCeRs087Tb5Kx4VXvkErZar4="; From a76e5f665ca3800f3bb06dd4395be914ae420a2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 Sep 2024 10:44:59 +0200 Subject: [PATCH 26/54] python312Packages.fastcore: 1.7.9 -> 1.7.10 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.7.9...1.7.10 Changelog: https://github.com/fastai/fastcore/blob/1.7.10/CHANGELOG.md --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 0aacc52e3f76e..f1047b6adac2a 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.9"; + version = "1.7.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-OGqd+pLM3THcPD3JtccjH6sgpVEhcNVnGbIbyMFfqTU="; + hash = "sha256-ksHJrgNju2rEVHcKU6jpW6izQPFgrWvDrvDZy0/Cgug="; }; build-system = [ setuptools ]; From 3b00d15c48400eab678880043b21955caf208b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Thu, 2 Mar 2023 13:50:56 +0100 Subject: [PATCH 27/54] sasquatch: 4.4 -> 4.5.1-4 Changed using ONEKEY fork of sasquatch which is up-to-date with squashfs-tools 4.5.1 and the Darwin compatibility patch used to be shipped in Nixpkgs applies cleanly as well. The updated version also provides a big-endian compatible build as well to support even more insane squashfs dialects. --- pkgs/tools/filesystems/sasquatch/darwin.patch | 357 ++++++++++++++++++ pkgs/tools/filesystems/sasquatch/default.nix | 105 +++--- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 406 insertions(+), 58 deletions(-) create mode 100644 pkgs/tools/filesystems/sasquatch/darwin.patch diff --git a/pkgs/tools/filesystems/sasquatch/darwin.patch b/pkgs/tools/filesystems/sasquatch/darwin.patch new file mode 100644 index 0000000000000..657971c5b0abb --- /dev/null +++ b/pkgs/tools/filesystems/sasquatch/darwin.patch @@ -0,0 +1,357 @@ +Patch based on commits by Dave Vasilevsky and +Blake Riley , squashed into a single patch, +with BSD-specific changes omitted. + +See also https://github.com/plougher/squashfs-tools/pull/69. + +diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c +index ea2f604..9c979f8 100644 +--- a/squashfs-tools/action.c ++++ b/squashfs-tools/action.c +@@ -39,6 +39,10 @@ + #include + #include + ++#ifndef FNM_EXTMATCH /* glibc extension */ ++ #define FNM_EXTMATCH 0 ++#endif ++ + #include "squashfs_fs.h" + #include "mksquashfs.h" + #include "action.h" +@@ -2415,9 +2419,12 @@ static char *get_start(char *s, int n) + + static int subpathname_fn(struct atom *atom, struct action_data *action_data) + { +- return fnmatch(atom->argv[0], get_start(strdupa(action_data->subpath), ++ char *path = strdup(action_data->subpath); ++ int is_match = fnmatch(atom->argv[0], get_start(path, + count_components(atom->argv[0])), + FNM_PATHNAME|FNM_EXTMATCH) == 0; ++ free(path); ++ return is_match; + } + + /* +diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c +index 216b979..eea2ec9 100644 +--- a/squashfs-tools/info.c ++++ b/squashfs-tools/info.c +@@ -144,31 +144,22 @@ void dump_state() + void *info_thrd(void *arg) + { + sigset_t sigmask; +- struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; +- int sig, waiting = 0; ++ int sig, err, waiting = 0; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + + while(1) { +- if(waiting) +- sig = sigtimedwait(&sigmask, NULL, ×pec); +- else +- sig = sigwaitinfo(&sigmask, NULL); ++ err = sigwait(&sigmask, &sig); + +- if(sig == -1) { ++ if(err == -1) { + switch(errno) { +- case EAGAIN: +- /* interval timed out */ +- waiting = 0; +- /* FALLTHROUGH */ + case EINTR: +- /* if waiting, the wait will be longer, but +- that's OK */ + continue; + default: +- BAD_ERROR("sigtimedwait/sigwaitinfo failed " ++ BAD_ERROR("sigwait failed " + "because %s\n", strerror(errno)); + } + } +@@ -179,8 +170,12 @@ void *info_thrd(void *arg) + /* set one second interval period, if ^\ received + within then, dump queue and cache status */ + waiting = 1; +- } else ++ alarm(1); ++ } else if (sig == SIGQUIT) { + dump_state(); ++ } else if (sig == SIGALRM) { ++ waiting = 0; ++ } + } + } + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index 843f9f4..ed2c3a6 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -35,7 +35,12 @@ + #include + #include + #include ++#ifndef linux ++#include ++#else ++#include + #include ++#endif + #include + #include + #include +@@ -50,7 +55,10 @@ + #include + #include + #include +-#include ++ ++#ifndef FNM_EXTMATCH /* glibc extension */ ++ #define FNM_EXTMATCH 0 ++#endif + + #ifndef linux + #include +@@ -5064,6 +5072,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) + BAD_ERROR("Failed to set signal mask in intialise_threads\n"); + +@@ -5802,6 +5811,35 @@ static int get_physical_memory() + long long page_size = sysconf(_SC_PAGESIZE); + int phys_mem; + ++#ifndef linux ++ #ifdef HW_MEMSIZE ++ #define SYSCTL_PHYSMEM HW_MEMSIZE ++ #elif defined(HW_PHYSMEM64) ++ #define SYSCTL_PHYSMEM HW_PHYSMEM64 ++ #else ++ #define SYSCTL_PHYSMEM HW_PHYSMEM ++ #endif ++ ++ int mib[2]; ++ uint64_t sysctl_physmem = 0; ++ size_t sysctl_len = sizeof(sysctl_physmem); ++ ++ mib[0] = CTL_HW; ++ mib[1] = SYSCTL_PHYSMEM; ++ ++ if(sysctl(mib, 2, &sysctl_physmem, &sysctl_len, NULL, 0) == 0) { ++ /* some systems use 32-bit values, work with what we're given */ ++ if (sysctl_len == 4) ++ sysctl_physmem = *(uint32_t*)&sysctl_physmem; ++ phys_mem = sysctl_physmem >> 20; ++ } else { ++ ERROR_START("Failed to get amount of available " ++ "memory."); ++ ERROR_EXIT(" Defaulting to least viable amount\n"); ++ phys_mem = SQUASHFS_LOWMEM; ++ } ++ #undef SYSCTL_PHYSMEM ++#else + if(num_pages == -1 || page_size == -1) { + struct sysinfo sys; + int res = sysinfo(&sys); +@@ -5814,6 +5852,7 @@ static int get_physical_memory() + } + + phys_mem = num_pages * page_size >> 20; ++#endif + + if(phys_mem < SQUASHFS_LOWMEM) + BAD_ERROR("Mksquashfs requires more physical memory than is " +diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c +index 2067f80..ca8b7f4 100644 +--- a/squashfs-tools/read_xattrs.c ++++ b/squashfs-tools/read_xattrs.c +@@ -31,13 +31,13 @@ + #include + #include + ++#include ++ + #include "squashfs_fs.h" + #include "squashfs_swap.h" + #include "xattr.h" + #include "error.h" + +-#include +- + extern int read_fs_bytes(int, long long, long long, void *); + extern int read_block(int, long long, long long *, int, void *); + +diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +index d434b42..1208e45 100644 +--- a/squashfs-tools/unsquashfs.c ++++ b/squashfs-tools/unsquashfs.c +@@ -32,8 +32,12 @@ + #include "stdarg.h" + #include "fnmatch_compat.h" + ++#ifndef linux ++#include ++#else + #include + #include ++#endif + #include + #include + #include +@@ -1182,7 +1186,7 @@ int create_inode(char *pathname, struct inode *i) + break; + case SQUASHFS_SYMLINK_TYPE: + case SQUASHFS_LSYMLINK_TYPE: { +- struct timespec times[2] = { ++ struct timeval times[2] = { + { i->time, 0 }, + { i->time, 0 } + }; +@@ -1201,8 +1205,7 @@ int create_inode(char *pathname, struct inode *i) + goto failed; + } + +- res = utimensat(AT_FDCWD, pathname, times, +- AT_SYMLINK_NOFOLLOW); ++ res = lutimes(pathname, times); + if(res == -1) { + EXIT_UNSQUASH_STRICT("create_inode: failed to" + " set time on %s, because %s\n", +@@ -2687,6 +2690,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_ + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) + EXIT_UNSQUASH("Failed to set signal mask in initialise_threads\n"); + +diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h +index 1099678..5b6a038 100644 +--- a/squashfs-tools/unsquashfs.h ++++ b/squashfs-tools/unsquashfs.h +@@ -46,6 +46,10 @@ + #include + #include + ++#ifndef FNM_EXTMATCH /* glibc extension */ ++ #define FNM_EXTMATCH 0 ++#endif ++ + #include "endian_compat.h" + #include "squashfs_fs.h" + #include "unsquashfs_error.h" +diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c +index e906eaf..f1e68c2 100644 +--- a/squashfs-tools/unsquashfs_info.c ++++ b/squashfs-tools/unsquashfs_info.c +@@ -96,31 +96,22 @@ void dump_state() + void *info_thrd(void *arg) + { + sigset_t sigmask; +- struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; +- int sig, waiting = 0; ++ int sig, err, waiting = 0; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGQUIT); + sigaddset(&sigmask, SIGHUP); ++ sigaddset(&sigmask, SIGALRM); + + while(1) { +- if(waiting) +- sig = sigtimedwait(&sigmask, NULL, ×pec); +- else +- sig = sigwaitinfo(&sigmask, NULL); ++ err = sigwait(&sigmask, &sig); + +- if(sig == -1) { ++ if(err == -1) { + switch(errno) { +- case EAGAIN: +- /* interval timed out */ +- waiting = 0; +- /* FALLTHROUGH */ + case EINTR: +- /* if waiting, the wait will be longer, but +- that's OK */ + continue; + default: +- BAD_ERROR("sigtimedwait/sigwaitinfo failed " ++ BAD_ERROR("sigwait failed " + "because %s\n", strerror(errno)); + } + } +@@ -132,8 +123,12 @@ void *info_thrd(void *arg) + /* set one second interval period, if ^\ received + within then, dump queue and cache status */ + waiting = 1; +- } else ++ alarm(1); ++ } else if (sig == SIGQUIT) { + dump_state(); ++ } else if (sig == SIGALRM) { ++ waiting = 0; ++ } + } + } + +diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c +index 61910e1..73e0090 100644 +--- a/squashfs-tools/unsquashfs_xattr.c ++++ b/squashfs-tools/unsquashfs_xattr.c +@@ -27,6 +27,11 @@ + + #include + ++#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ ++ #define lsetxattr(path_, name_, val_, sz_, flags_) \ ++ setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW) ++#endif ++ + #define NOSPACE_MAX 10 + + extern int root_process; +diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c +index b1c0089..6d7ed98 100644 +--- a/squashfs-tools/xattr.c ++++ b/squashfs-tools/xattr.c +@@ -22,6 +22,14 @@ + * xattr.c + */ + ++#ifndef linux ++#define __BYTE_ORDER BYTE_ORDER ++#define __BIG_ENDIAN BIG_ENDIAN ++#define __LITTLE_ENDIAN LITTLE_ENDIAN ++#else ++#include ++#endif ++ + #define TRUE 1 + #define FALSE 0 + +@@ -36,6 +44,13 @@ + #include + #include + ++#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ ++ #define llistxattr(path_, buf_, sz_) \ ++ listxattr(path_, buf_, sz_, XATTR_NOFOLLOW) ++ #define lgetxattr(path_, name_, val_, sz_) \ ++ getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW) ++#endif ++ + #include "squashfs_fs.h" + #include "squashfs_swap.h" + #include "mksquashfs.h" +-- +2.35.1 + diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index f8d66683fccbf..089fc573181a5 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -1,76 +1,65 @@ { lib , stdenv , fetchFromGitHub -, fetchurl -, xz +, lz4 , lzo +, which +, xz , zlib , zstd -, lz4 -, lz4Support ? false +, bigEndian ? false }: let - patch = fetchFromGitHub - { - # NOTE: This uses my personal fork for now, until - # https://github.com/devttys0/sasquatch/pull/40 is merged. - # I, cole-h, will keep this fork available until that happens. - owner = "cole-h"; + drv = stdenv.mkDerivation (finalAttrs: { + pname = "sasquatch"; + version = "4.5.1-4"; + + src = fetchFromGitHub { + owner = "onekey-sec"; repo = "sasquatch"; - rev = "6edc54705454c6410469a9cb5bc58e412779731a"; - sha256 = "x+PuPYGD4Pd0fcJtlLWByGy/nggsmZkxwSXxJfPvUgo="; - } + "/patches/patch0.txt"; -in -stdenv.mkDerivation rec { - pname = "sasquatch"; - version = "4.4"; + rev = "sasquatch-v${finalAttrs.version}"; + hash = "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU="; + }; - src = fetchurl { - url = "mirror://sourceforge/squashfs/squashfs${version}.tar.gz"; - sha256 = "qYGz8/IFS1ouZYhRo8BqJGCtBKmopkXgr+Bjpj/bsH4="; - }; + patches = lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ - xz - lzo - zlib - zstd - ] - ++ lib.optionals lz4Support [ lz4 ]; + strictDeps = true; + nativeBuildInputs = [ which ]; + buildInputs = [ zlib xz zstd lz4 lzo ]; - patches = [ patch ]; - patchFlags = [ "-p0" ]; + preBuild = '' + cd squashfs-tools + ''; - postPatch = '' - # Drop blanket -Werror to avoid build failure on fresh toolchains - # like gcc-11. - substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' ' - cd squashfs-tools - ''; + installFlags = [ + "INSTALL_DIR=${placeholder "out"}/bin" + "INSTALL_MANPAGES_DIR=${placeholder "out"}/share/man/man1" + ]; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: unsquashfs_xattr.o:/build/squashfs4.4/squashfs-tools/error.h:34: multiple definition of - # `verbose'; unsquashfs.o:/build/squashfs4.4/squashfs-tools/error.h:34: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ + "GZIP_SUPPORT=1" + "LZ4_SUPPORT=1" + "LZMA_SUPPORT=1" + "LZO_SUPPORT=1" + "XZ_SUPPORT=1" + "ZSTD_SUPPORT=1" + ]; - installFlags = [ "INSTALL_DIR=\${out}/bin" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString bigEndian "-DFIX_BE"; - makeFlags = [ - "XZ_SUPPORT=1" - "CC=${stdenv.cc.targetPrefix}cc" - "CXX=${stdenv.cc.targetPrefix}c++" - "AR=${stdenv.cc.targetPrefix}ar" - ] - ++ lib.optional lz4Support "LZ4_SUPPORT=1"; + postInstall = lib.optionalString bigEndian '' + mv $out/bin/sasquatch{,-v4be} + ''; - meta = with lib; { - homepage = "https://github.com/devttys0/sasquatch"; - description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.pamplemousse ]; - platforms = platforms.linux; - mainProgram = "sasquatch"; - }; -} + meta = { + homepage = "https://github.com/onekey-sec/sasquatch"; + description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pamplemousse vlaci ]; + platforms = lib.platforms.unix; + mainProgram = if bigEndian then "sasquatch-v4be" else "sasquatch"; + }; + }); +in +drv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03be6c25f5047..f597ae3be63fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12303,6 +12303,8 @@ with pkgs; sasquatch = callPackage ../tools/filesystems/sasquatch { }; + sasquatch-v4be = callPackage ../tools/filesystems/sasquatch { bigEndian = true; }; + sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; sbs = callPackage ../tools/X11/sbs { }; From 7495b445ee7ad2a6bd7376c7cf8ab95b8021b88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Mon, 19 Jun 2023 18:05:03 +0200 Subject: [PATCH 28/54] sasquatch: removing pamplemousse from maintainers Asked for their removal in https://github.com/NixOS/nixpkgs/pull/219169#issuecomment-1597379517 --- pkgs/tools/filesystems/sasquatch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 089fc573181a5..7159574411287 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -56,7 +56,7 @@ let homepage = "https://github.com/onekey-sec/sasquatch"; description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ pamplemousse vlaci ]; + maintainers = with lib.maintainers; [ vlaci ]; platforms = lib.platforms.unix; mainProgram = if bigEndian then "sasquatch-v4be" else "sasquatch"; }; From 17fb7dfa72b52fb08462aa7b8411bafb9de6ee4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:05:42 +0200 Subject: [PATCH 29/54] sasquatch: move to pkgs/by-name --- pkgs/by-name/sa/sasquatch-v4be/package.nix | 3 +++ pkgs/{tools/filesystems => by-name/sa}/sasquatch/darwin.patch | 0 .../default.nix => by-name/sa/sasquatch/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/sa/sasquatch-v4be/package.nix rename pkgs/{tools/filesystems => by-name/sa}/sasquatch/darwin.patch (100%) rename pkgs/{tools/filesystems/sasquatch/default.nix => by-name/sa/sasquatch/package.nix} (100%) diff --git a/pkgs/by-name/sa/sasquatch-v4be/package.nix b/pkgs/by-name/sa/sasquatch-v4be/package.nix new file mode 100644 index 0000000000000..10318b97045d6 --- /dev/null +++ b/pkgs/by-name/sa/sasquatch-v4be/package.nix @@ -0,0 +1,3 @@ +{ sasquatch }: + +sasquatch.override { bigEndian = true; } diff --git a/pkgs/tools/filesystems/sasquatch/darwin.patch b/pkgs/by-name/sa/sasquatch/darwin.patch similarity index 100% rename from pkgs/tools/filesystems/sasquatch/darwin.patch rename to pkgs/by-name/sa/sasquatch/darwin.patch diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/by-name/sa/sasquatch/package.nix similarity index 100% rename from pkgs/tools/filesystems/sasquatch/default.nix rename to pkgs/by-name/sa/sasquatch/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f597ae3be63fa..20aeff45d458e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12301,10 +12301,6 @@ with pkgs; sanctity = callPackage ../tools/misc/sanctity { }; - sasquatch = callPackage ../tools/filesystems/sasquatch { }; - - sasquatch-v4be = callPackage ../tools/filesystems/sasquatch { bigEndian = true; }; - sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; sbs = callPackage ../tools/X11/sbs { }; From 289411e92bbc1d99e744c6e30568f98ed508669c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:09:07 +0200 Subject: [PATCH 30/54] sasquatch: format package.nix to match RFC style --- pkgs/by-name/sa/sasquatch/package.nix | 29 +++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix index 7159574411287..1c71a75452fba 100644 --- a/pkgs/by-name/sa/sasquatch/package.nix +++ b/pkgs/by-name/sa/sasquatch/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, lz4 -, lzo -, which -, xz -, zlib -, zstd -, bigEndian ? false +{ + lib, + stdenv, + fetchFromGitHub, + lz4, + lzo, + which, + xz, + zlib, + zstd, + bigEndian ? false, }: let @@ -26,7 +27,13 @@ let strictDeps = true; nativeBuildInputs = [ which ]; - buildInputs = [ zlib xz zstd lz4 lzo ]; + buildInputs = [ + zlib + xz + zstd + lz4 + lzo + ]; preBuild = '' cd squashfs-tools From 94c90db73556d2ae11ccf48acca4e4b3c9a676ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 10:36:02 +0000 Subject: [PATCH 31/54] mcdreforged: 2.13.1 -> 2.13.2 --- pkgs/by-name/mc/mcdreforged/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index 31c53dfbe3f71..d9c216271205a 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mcdreforged"; - version = "2.13.1"; + version = "2.13.2"; pyproject = true; src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; rev = "refs/tags/v${version}"; - hash = "sha256-Um4XSpkpJupBy5h/hUuHNyXnaDvjL1IIcmSqBHKycEM="; + hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; }; build-system = [ python3.pkgs.setuptools ]; From 8b7694db5666871409e3a68a5e2baeb8d267c7a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 10:36:04 +0000 Subject: [PATCH 32/54] nu_scripts: 0-unstable-2024-09-11 -> 0-unstable-2024-09-26 --- pkgs/shells/nushell/nu_scripts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 48f81d678852b..76b15ef1cd5a1 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-09-11"; + version = "0-unstable-2024-09-26"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "d04eea634a3ac35d481fa26c35271dfe175bf3e2"; - hash = "sha256-uHD8j98WubyvtbtOqTdfGmeRJ7zoVDVZ9+CJzmB6vF0="; + rev = "e10ffbaaa7dc8c9ecd300e72d5f0b6c7e6691175"; + hash = "sha256-CT4CI/oKidy7nwiqEbDJxKDuinrcjGQBke9bwwOcD8A="; }; installPhase = '' From 52f187490db175d411ffc67c3ca5f5c96191a6ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 11:51:04 +0000 Subject: [PATCH 33/54] peergos: 0.19.0 -> 0.20.0 --- pkgs/by-name/pe/peergos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 95a2d501cf375..3913938d025e4 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "peergos"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar"; - hash = "sha256-GxJI33EVNSZfmrj5H70kwW9RE8YuJKt36qYmdWKtEJ8="; + hash = "sha256-Kk0ahAsvfTYkmVZTDE+QhyDFHQFY6lpWhmIOYBeJ1xk="; }; dontUnpack = true; From fb88a9803d74a03d09206c6dd80397c96e535a56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 12:57:31 +0000 Subject: [PATCH 34/54] fblog: 4.10.0 -> 4.12.0 --- pkgs/development/tools/fblog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix index 8720d5a7f6251..69e8d2326ea45 100644 --- a/pkgs/development/tools/fblog/default.nix +++ b/pkgs/development/tools/fblog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.10.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "brocode"; repo = pname; rev = "v${version}"; - hash = "sha256-4Yg7gWVBG9GI1ailEbbcslM+XR8L7yjjjvf4dQq/87I="; + hash = "sha256-OZE+jqjsyvHLDJ+6r0txH56afufnl4H9PHcG7XRfxnE="; }; - cargoHash = "sha256-8rnQllCne1q1uDpeJkqAdzNKSkEgVp+v9drXL8TaQmM="; + cargoHash = "sha256-zZ/xE7DVX1HSK81xwB4VxCtnOTUwJvSScmJeA/t/ACI="; meta = with lib; { description = "Small command-line JSON log viewer"; From 342b7f7031bb0d1cf2592600d747ffb3a69c56e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 15:25:03 +0200 Subject: [PATCH 35/54] python312Packages.pulsectl: 24.4.0 -> 24.8.0 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index abdc439fd611e..756826b4500a5 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "24.4.0"; + version = "24.8.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aX7VDn1FLnhniuOOKrk1hDAIvsRIlVKDzQ+zYoZ+MWU="; + hash = "sha256-sFFQbQ1z08xDV879PeF7uFnX7PAE6ZSw98+oeFG8cVY="; }; patches = [ From 6a5dd51e4283227cedd1f9c4b04d1223394eed2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 15:26:43 +0200 Subject: [PATCH 36/54] python312Packages.mobly: 1.12.3 -> 1.12.4 https://github.com/google/mobly/blob/refs/tags/1.12.4/CHANGELOG.md --- pkgs/development/python-modules/mobly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index 046edf9a3da15..dc76a6d6ea095 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "mobly"; - version = "1.12.3"; + version = "1.12.4"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "mobly"; rev = "refs/tags/${version}"; - hash = "sha256-hhI1jrHJk4wo49MK8J4VTS2dGmHG2kwzgZeSWBXdXkA="; + hash = "sha256-77wZK5dqxXUkOgWE7NBpGJBbbtYYxRCJwPbtwLIX09I="; }; build-system = [ setuptools ]; From d7a546299a95ce4f8920e796422ff9859f2e5a15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 Sep 2024 15:44:15 +0200 Subject: [PATCH 37/54] python312Packages.adafruit-io: 2.7.2 -> 2.8.0 Diff: https://github.com/adafruit/Adafruit_IO_Python/compare/refs/tags/2.7.2...2.8.0 --- pkgs/development/python-modules/adafruit-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 3177c78047669..e0f1122a464e1 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "adafruit-io"; - version = "2.7.2"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "adafruit"; repo = "Adafruit_IO_Python"; rev = "refs/tags/${version}"; - hash = "sha256-JBpF08WGe1pMK1y7HZLH/jSQkJtbWdiTGYHWRd39UIk="; + hash = "sha256-OwTHMyc2ePSdYVuY1h3PY+uDBl6/7fTMXiZC3sZm8fU="; }; nativeBuildInputs = [ setuptools-scm ]; From c41d6196d0b6a9706e6dbd313a69c9ff264287da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 Sep 2024 15:44:42 +0200 Subject: [PATCH 38/54] python312Packages.aiohasupervisor: 0.1.0b1 -> 0.1.0 --- pkgs/development/python-modules/aiohasupervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 04755463bf61a..969e72889da69 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.1.0b1"; + version = "0.1.0"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-INpyN5jdXOzTC6t18PvbkbDM7n4Y4rejb08UfyJyFSk="; + hash = "sha256-Jq9cSdMMXVgRHhQK1LuGwVR6GBTIrw3th7y9huRSQjM="; }; postPatch = '' From 04a6caa183e41f6f0c774708b48b596ac9e6a4b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 14:12:21 +0000 Subject: [PATCH 39/54] kubedb-cli: 0.47.0 -> 0.48.0 --- pkgs/applications/networking/cluster/kubedb-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 65be1f739ae35..f70dcee4682d9 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-C106krMg4vtRe78hh6emAGBxEApfc5ZorRgTtH+QZ9g="; + sha256 = "sha256-xqupDfcjCSP7uomBCuFlhCAOetZrvSiKehOgCqZKLLg="; }; vendorHash = null; From 53a28edc1f0913a63547fcffd74b9ea0a4fdaea7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 14:12:31 +0000 Subject: [PATCH 40/54] pipet: 0.2.1 -> 0.2.2 --- pkgs/by-name/pi/pipet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pipet/package.nix b/pkgs/by-name/pi/pipet/package.nix index 6a49e7d3c934c..335b6256d969e 100644 --- a/pkgs/by-name/pi/pipet/package.nix +++ b/pkgs/by-name/pi/pipet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pipet"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "bjesus"; repo = "pipet"; rev = version; - hash = "sha256-PqOx/aFI5gHt78th1nkSKlTGw/r1eU7Ggz5kvtjMCmI="; + hash = "sha256-NhqrNehmL6LLLEOVT/s2PdQ7HtSCfoM4MST1IHVrJXE="; }; vendorHash = "sha256-jNIjF5jxcpNLAjuWo7OG/Ac4l6NpQNCKzYUgdAoL+C4="; From 61a36b6df13f3c6c99a2991679abcc411069e20e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 15:27:28 +0000 Subject: [PATCH 41/54] podman-tui: 1.2.1 -> 1.2.2 --- pkgs/by-name/po/podman-tui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 7f4f84948f3a4..c92ea01778d06 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-Is4qpN6i8zBK0WNYbb/YhtzsrgOth9sQdUT81sx7i7g="; + hash = "sha256-ldFlW0QNjOvuJGyd2SzmMWA3ofS2ZW5krvCJRU83NXs="; }; vendorHash = null; From 976e5387d2c2a43430c8214f7e79d466de4d64f0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 26 Sep 2024 03:46:28 +0300 Subject: [PATCH 42/54] treewide: Fix `error: makeWrapper/makeShellWrapper must be in nativeBuildInputs` On cross --- pkgs/applications/editors/vscode/generic.nix | 3 ++- .../networking/browsers/brave/make-brave.nix | 6 ++++-- .../signal-desktop/generic.nix | 7 ++++--- .../version-management/gitkraken/default.nix | 6 ++++-- pkgs/by-name/gi/github-desktop/package.nix | 7 ++++--- pkgs/by-name/pa/paper-plane/package.nix | 4 ++-- pkgs/development/tools/nwjs/default.nix | 6 ++++-- pkgs/development/web/cypress/default.nix | 16 +++++++++++++--- 8 files changed, 37 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index defae3cf96171..1c5fe1a56a424 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -167,7 +167,8 @@ in asar copyDesktopItems # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook3.override { inherit (buildPackages) makeWrapper; }) + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; dontBuild = true; diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index e94e1a93bf723..2ea95693a9aed 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook3, makeWrapper +{ lib, stdenv, fetchurl, buildPackages , alsa-lib , at-spi2-atk , at-spi2-core @@ -112,7 +112,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ dpkg - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 49df948196568..97abf0e749f66 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -8,8 +8,7 @@ , asar , rsync , python3 -, wrapGAppsHook3 -, makeWrapper +, buildPackages , nixosTests , gtk3 , atk @@ -127,7 +126,9 @@ stdenv.mkDerivation rec { asar python3 autoPatchelfHook - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 3e2206aa633bc..7d35f1efbb58c 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -37,7 +37,7 @@ makeDesktopItem, openssl, wrapGAppsHook3, - makeShellWrapper, + buildPackages, at-spi2-atk, at-spi2-core, libuuid, @@ -166,7 +166,9 @@ let nativeBuildInputs = [ copyDesktopItems - (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ gtk3 diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index cbd89cda3c21b..88f8b5620b45d 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -2,8 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook3 -, makeWrapper +, buildPackages , gnome-keyring , libsecret , git @@ -44,7 +43,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index 228c4aa638b08..2028e7a848f20 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , gtk4 -, wrapGAppsHook3 , libadwaita , tdlib , rlottie @@ -18,6 +17,7 @@ , libshumate , gst_all_1 , darwin +, buildPackages }: let @@ -36,7 +36,7 @@ let gtk4-paperplane = gtk4.overrideAttrs (prev: { patches = (prev.patches or []) ++ [ "${src}/build-aux/gtk-reversed-list.patch" ]; }); - wrapPaperPlaneHook = wrapGAppsHook3.override { + wrapPaperPlaneHook = buildPackages.wrapGAppsHook3.override { gtk3 = gtk4-paperplane; }; # libadwaita has gtk4 in propagatedBuildInputs so it must be overrided diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index ff1fae302d169..408584de712e8 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -3,6 +3,7 @@ , atk , autoPatchelfHook , buildEnv +, buildPackages , cairo , cups , dbus @@ -32,7 +33,6 @@ , stdenv , systemd , udev -, wrapGAppsHook3 , xorg }: @@ -107,7 +107,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ nwEnv ]; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 856b31af1565a..2f3b8cf20808d 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -4,13 +4,13 @@ , gtk2 , gtk3 , lib +, buildPackages , makeShellWrapper , mesa , nss , stdenv , udev , unzip -, wrapGAppsHook3 , xorg , darwin }: @@ -46,8 +46,18 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ unzip makeShellWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; + nativeBuildInputs = + [ + unzip + makeShellWrapper + ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + ]; + buildInputs = lib.optionals stdenv.isLinux (with xorg; [ libXScrnSaver From 5f62b2c546a10071e58acf3b39f59442cb7ef01f Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 26 Sep 2024 03:57:33 +0300 Subject: [PATCH 43/54] cudaPackages.tensorrt: Fix `attribute 'lib' missing` on `aarch64-linux` There should be no attribute missing errors as they cannot be handled. --- pkgs/development/cuda-modules/tensorrt/fixup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/tensorrt/fixup.nix b/pkgs/development/cuda-modules/tensorrt/fixup.nix index 0d52c91320c47..aab6d8f320796 100644 --- a/pkgs/development/cuda-modules/tensorrt/fixup.nix +++ b/pkgs/development/cuda-modules/tensorrt/fixup.nix @@ -65,7 +65,7 @@ finalAttrs: prevAttrs: { # We need to look inside the extracted output to get the files we need. sourceRoot = "TensorRT-${finalAttrs.version}"; - buildInputs = prevAttrs.buildInputs ++ [ finalAttrs.passthru.cudnn.lib ]; + buildInputs = prevAttrs.buildInputs ++ [ (finalAttrs.passthru.cudnn.lib or null) ]; preInstall = (prevAttrs.preInstall or "") From 68432605ef009228c32e5d70c60ede6dbdce81ca Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 26 Sep 2024 04:10:26 +0300 Subject: [PATCH 44/54] gaugePlugins.go: Fix `error: attribute 'aarch64-linux' missing` --- pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix index acf902e1b79df..71f88a2c40ae6 100644 --- a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix @@ -17,7 +17,7 @@ let otherArgs = lib.attrsets.removeAttrs args [ "pname" "data" "repo" "releasePrefix" "isMultiArch" ]; inherit (stdenvNoCC.hostPlatform) system; - inherit (if isCrossArch then data else data.${system}) url hash; + inherit (if isCrossArch then data else data.${system} or (throw "gaugePlugins.${pname}: No source for system: ${system}")) url hash; # Upstream uses a different naming scheme for platforms systemMap = { "x86_64-darwin" = "darwin.x86_64"; From 3194fb792064d6135053d1f8bcd0c561d2078998 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 27 Sep 2024 01:11:30 +0300 Subject: [PATCH 45/54] unixbench: No need to use `targetPackages` here causes eval error on cross --- pkgs/development/tools/misc/unixbench/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/development/tools/misc/unixbench/default.nix index d5f060af82cf5..7721a2648b359 100644 --- a/pkgs/development/tools/misc/unixbench/default.nix +++ b/pkgs/development/tools/misc/unixbench/default.nix @@ -9,6 +9,7 @@ , libGLX , coreutils , unixtools +, runtimeShell , targetPackages , gnugrep , gawk @@ -89,7 +90,7 @@ stdenv.mkDerivation rec { preFixup = '' substituteInPlace $out/libexec/pgms/multi.sh \ - --replace '/bin/sh "$' '${targetPackages.runtimeShell} "$' + --replace '/bin/sh "$' '${runtimeShell} "$' substituteInPlace $out/bin/ubench \ --subst-var out From 202fa19245d00f54301f4b9b535bcc14a85bc51c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 17:06:49 +0000 Subject: [PATCH 46/54] ipxe: 1.21.1-unstable-2024-09-13 -> 1.21.1-unstable-2024-09-27 --- pkgs/by-name/ip/ipxe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index 85e3564f3cbbc..baf3e92a60b00 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2024-09-13"; + version = "1.21.1-unstable-2024-09-27"; nativeBuildInputs = [ gnu-efi @@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "c85ad1246890cf3c0c5f2ac6de06ab046ddd0043"; - hash = "sha256-Py0mXcCj/NhVW3crngR9ZLHvH9N0QJeVmykc3k+yi6Y="; + rev = "3f4f843920afdc1d808a8b20354cf3eca481401a"; + hash = "sha256-+Zpl8xhiWrnkFVL+DLuV0N9pn6hjw5JxDMxeDmfcNS4="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. From da83922fdd04a911d5666d7285a2bd96b992f1fe Mon Sep 17 00:00:00 2001 From: nat Date: Wed, 18 Sep 2024 00:15:38 +0200 Subject: [PATCH 47/54] limine: refactor, toggleable options, build only for current arch --- pkgs/by-name/li/limine/package.nix | 100 ++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index a12d2d733eef2..7a891bcf107aa 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -1,72 +1,110 @@ -# Builds limine with all available features. - +# Derivation containing the Limine host tool and the compiled bootloader { - # Helpers - stdenv, fetchurl, lib, - # Dependencies - llvmPackages, + llvmPackages_18, mtools, nasm, + # The following options map to configure flags. + enableAll ? false, + buildCDs ? false, + targets ? [ ], + # x86 specific flags + biosSupport ? false, + pxeSupport ? false, }: let - version = "7.9.1"; + llvmPackages = llvmPackages_18; + stdenv = llvmPackages.stdenv; + + version = "8.0.13"; + + hasI686 = + (if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets)) + || enableAll; + + hasX86_64 = + (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets)) + || enableAll; + + uefiFlags = + target: + { + aarch64 = [ "--enable-uefi-aarch64" ]; + i686 = [ "--enable-uefi-ia32" ]; + loongarch64 = [ "--enable-uefi-loongarch64" ]; + riscv64 = [ "--enable-uefi-riscv64" ]; + x86_64 = [ "--enable-uefi-x86-64" ]; + } + .${target} or (throw "Unsupported target ${target}"); + + configureFlags = + lib.optionals enableAll [ "--enable-all" ] + ++ lib.optionals biosSupport [ "--enable-bios" ] + ++ lib.optionals (buildCDs && biosSupport) [ "--enable-bios-cd" ] + ++ lib.optionals buildCDs [ "--enable-uefi-cd" ] + ++ lib.optionals pxeSupport [ "--enable-bios-pxe" ] + ++ lib.concatMap uefiFlags ( + if targets == [ ] then [ stdenv.hostPlatform.parsed.cpu.name ] else targets + ); in + +assert lib.assertMsg (!(biosSupport && !hasI686)) "BIOS builds are possible only for x86"; + +assert lib.assertMsg (!(pxeSupport && !hasI686)) "PXE builds are possible only for x86"; + # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation { - inherit version; + inherit version configureFlags; pname = "limine"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - hash = "sha256-cR6ilV5giwvbqUoOGbnXQnqZzUz/oL7OGZPYNoFKvy0="; + hash = "sha256-pg0tAn4YlfEzpyxb9QAAR0PApYmtnafMbIXfhHw+w3k="; }; - nativeBuildInputs = [ - llvmPackages.bintools - # gcc is used for the host tool, while clang is used for the bootloader. - llvmPackages.clang - llvmPackages.lld - mtools - nasm + hardeningDisable = [ + # clang doesn't support this for RISC-V target + "zerocallusedregs" ]; - configureFlags = [ - "--enable-all" - ]; - - installFlags = [ - "destdir=$out" - "manprefix=/share" - ]; + nativeBuildInputs = + [ + llvmPackages.libllvm + llvmPackages.lld + ] + ++ lib.optionals (enableAll || buildCDs) [ + mtools + ] + ++ lib.optionals (hasI686 || hasX86_64) [ nasm ]; outputs = [ "out" - "doc" "dev" + "doc" "man" ]; meta = with lib; { homepage = "https://limine-bootloader.org/"; description = "Limine Bootloader"; + mainProgram = "limine"; + # The platforms on that the Limine binary and helper tools can run, not + # necessarily the platforms for that bootable images can be created. + platforms = platforms.unix; + badPlatforms = platforms.darwin; # Caution. Some submodules have different licenses. license = [ - licenses.bsd2 # limine, flanterm - licenses.bsd0 # freestanding-toolchain, freestanding-headers licenses.asl20 # cc-runtime + licenses.bsd0 # freestanding-toolchain, freestanding-headers + licenses.bsd2 # limine, flanterm licenses.mit # limine-efi, stb licenses.zlib # tinf ]; - # The platforms on that the Liminine binary and helper tools can run, not - # necessarily the platforms for that bootable images can be created. - platforms = platforms.unix; - badPlatforms = platforms.darwin; maintainers = [ maintainers._48cf maintainers.phip1611 From ef49e8a7395c61fcaf59d09c29c6d1fb19615832 Mon Sep 17 00:00:00 2001 From: Sh0g0-1758 Date: Fri, 27 Sep 2024 23:40:10 +0530 Subject: [PATCH 48/54] dokieli: init at 0-unstable-2024-09-23 --- pkgs/by-name/do/dokieli/package.json | 104 +++++++++++++++++++++++++++ pkgs/by-name/do/dokieli/package.nix | 58 +++++++++++++++ 2 files changed, 162 insertions(+) create mode 100644 pkgs/by-name/do/dokieli/package.json create mode 100644 pkgs/by-name/do/dokieli/package.nix diff --git a/pkgs/by-name/do/dokieli/package.json b/pkgs/by-name/do/dokieli/package.json new file mode 100644 index 0000000000000..39198309b8127 --- /dev/null +++ b/pkgs/by-name/do/dokieli/package.json @@ -0,0 +1,104 @@ +{ + "name": "dokieli", + "version": "0.3.1417", + "description": "dokieli is a clientside editor for decentralised article publishing, annotations, and social interactions.", + "main": "./src/dokieli.js", + "type": "module", + "scripts": { + "build-dist": "webpack --progress --color", + "build": "yarn build-dist", + "test": "TZ=UTC node --experimental-vm-modules node_modules/jest/bin/jest.js --silent", + "test:e2e": "playwright test", + "watch": "webpack --progress --color --watch", + "minify": "webpack --progress --color --env minimize", + "postinstall": "patch-package", + "lint": "eslint ." + }, + "repository": "https://github.com/linkeddata/dokieli", + "keywords": [ + "activitystreams", + "activitypub", + "annotations", + "authoring", + "decentralized", + "editor", + "knowledge graph", + "linked data", + "notifications", + "publishing", + "social web", + "web standards" + ], + "author": "dokieli team", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/linkeddata/dokieli/issues" + }, + "homepage": "https://dokie.li/", + "engines": { + "node": ">=18.0.0" + }, + "dependencies": { + "buffer": "^6.0.3", + "d3-force": "^3.0.0", + "d3-selection": "^3.0.0", + "diff": "^5.2.0", + "dompurify": "^3.1.5", + "fs": "^0.0.1-security", + "http-link-header": "^1.1.3", + "leaflet": "^1.9.4", + "leaflet-gpx": "^1.7.0", + "medium-editor": "^5.23.3", + "medium-editor-tables": "^0.6.1", + "micromark": "^4.0.0", + "micromark-extension-gfm": "^3.0.0", + "micromark-extension-gfm-tagfilter": "^2.0.0", + "rdf-parser-rdfa": "https://github.com/rdf-ext/rdf-parser-rdfa.git#master", + "rdf-store-ldp": "^0.3.1", + "shower": "https://github.com/shower/core.git#main", + "simplerdf": "^0.2.14", + "simplerdf-parse": "^0.1.3", + "solid-auth-client": "^2.5.6" + }, + "devDependencies": { + "@axe-core/playwright": "^4.9.1", + "@playwright/test": "^1.44.1", + "babel-eslint": "^10.1.0", + "dotenv": "^16.4.5", + "eslint": "^9.10.0", + "eslint-plugin-jest": "^27.9.0", + "husky": "^9.0.11", + "jest": "^29.0.3", + "jest-environment-jsdom": "^29.0.3", + "patch-package": "^8.0.0", + "process": "^0.11.10", + "terser-webpack-plugin": "^5.3.3", + "webpack": "5.94.0", + "webpack-cli": "^5.0.1" + }, + "resolutions": { + "ansi-regex": "^5.0.0", + "xmldom": "https://github.com/xmldom/xmldom.git#master", + "green-turtle": "https://github.com/csarven/green-turtle#master", + "json5": "^1.0.2", + "http-cache-semantics": "^4.1.1", + "jsonld": "^5.0.0", + "xml2js": "^0.6.2", + "semver": "^7.6.2", + "lru-cache": "^8.0.0", + "micromatch": "^4.0.8" + }, + "standard": { + "globals": [ + "DO", + "SimpleRDF", + "ld", + "describe", + "it", + "before", + "beforeEach", + "after", + "afterEach" + ] + } +} diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix new file mode 100644 index 0000000000000..882f863ef97ae --- /dev/null +++ b/pkgs/by-name/do/dokieli/package.nix @@ -0,0 +1,58 @@ +{ + lib, + mkYarnPackage, + fetchFromGitHub, + fetchYarnDeps, + makeWrapper, + nodejs, + xsel, +}: + +mkYarnPackage rec { + pname = "dokieli"; + version = "0-unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "linkeddata"; + repo = "dokieli"; + rev = "40ebbc60ba48d8b08f763b07befba96382c5f027"; + hash = "sha256-lc96jOR8uXLcZFhN3wpSd9O5cUdKxllB8WWCh2oWuEw="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-TEXCCLFhpwHZJ8zRGsC7J6EwNaFpIi+CZ3L5uilebK4="; + }; + + packageJSON = ./package.json; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out + ''; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + makeWrapper ${nodejs}/bin/npx $out/bin/dokieli \ + --prefix PATH : ${ + lib.makeBinPath ([ + nodejs + xsel + ]) + } \ + --add-flags serve \ + --chdir $out/deps/dokieli + ''; + + doDist = false; + + meta = { + description = "dokieli is a clientside editor for decentralised article publishing, annotations and social interactions"; + homepage = "https://github.com/linkeddata/dokieli"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ shogo ]; + mainProgram = "dokieli"; + }; +} From 10585c08c642c912c77bd83543695f2a1c09c191 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 27 Sep 2024 22:20:08 +0300 Subject: [PATCH 49/54] ktailctl: 0.17.2 -> 0.18.0 --- pkgs/applications/networking/ktailctl/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index d66e8586a6e35..ae8e63b0da2f2 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchFromGitHub -, buildGoModule +, buildGo123Module , cmake , extra-cmake-modules , git -, go +, go_1_23 , wrapQtAppsHook , qtbase , qtdeclarative @@ -23,20 +23,20 @@ }: let - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-jACcTRIdzYiSLy7zw5QuDu9tZfee9ufhlEecbTbSr+4="; + hash = "sha256-tZnwn94qZyQ8JAC6Y1dDTmc7Cob+kMZnEaP7+EytbH8="; }; - goDeps = (buildGoModule { + goDeps = (buildGo123Module { pname = "ktailctl-go-wrapper"; inherit src version; modRoot = "src/wrapper"; - vendorHash = "sha256-V4Bn5/VaoFOZlNGBedA4Ly8Kocw0BWyfIHv8IU6Eay4="; + vendorHash = "sha256-KdkvAPLnoC7DccRVIz7t/Ns71dnG59DpO5qwOhJk7qc="; }).goModules; in stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation { cmake extra-cmake-modules git - go + go_1_23 wrapQtAppsHook ]; From 7a7fe52b555882e14e96e248a6259035156e13b8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Sep 2024 07:56:39 +0200 Subject: [PATCH 50/54] ocamlPackages.printbox: disable for OCaml < 4.04 --- pkgs/development/ocaml-modules/printbox/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index fe7e655ba60c3..56d9628ebfaf6 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -4,9 +4,7 @@ buildDunePackage rec { pname = "printbox"; version = "0.11"; - useDune2 = true; - - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "c-cube"; From 69dfe24562aaa0895fa0a0ab09eb61c5ff53a82a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Sep 2024 07:56:56 +0200 Subject: [PATCH 51/54] ocamlPackages.ppx_blob: disable for OCaml < 4.08 --- pkgs/development/ocaml-modules/ppx_blob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index b9665ecc05527..62ac0769d6eb7 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "ppx_blob"; version = "0.9.0"; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; @@ -13,7 +13,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; propagatedBuildInputs = [ ppxlib ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { homepage = "https://github.com/johnwhitington/ppx_blob"; From 3cae63521d93eb2fb0aba28218ca9b00150ffdc1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Sep 2024 07:57:01 +0200 Subject: [PATCH 52/54] ocamlPackages.cfstream: disable for OCaml < 4.08 --- pkgs/development/ocaml-modules/cfstream/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 204128adec226..e5de1b6485348 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -1,10 +1,10 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocaml, m4, camlp-streams, core_kernel, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, m4, camlp-streams, core_kernel, ounit }: buildDunePackage rec { pname = "cfstream"; version = "1.3.2"; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "biocaml"; @@ -15,13 +15,11 @@ buildDunePackage rec { patches = [ ./git_commit.patch ./janestreet-0.17.patch ]; - strictDeps = true; - nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ camlp-streams core_kernel ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { inherit (src.meta) homepage; From ca1260a39d9209b3f52794ad43629ad87080319a Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 27 Sep 2024 21:51:55 +0200 Subject: [PATCH 53/54] grafana-alloy: don't build the frontend twice Prior to this, we built the frontend twice. Once in the goModules derivation and then the second time in the actual derivation. --- pkgs/by-name/gr/grafana-alloy/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index c09e7725b9ce6..49e60a6d2b97b 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -55,6 +55,11 @@ buildGoModule rec { "." ]; + # Skip building the frontend in the goModules FOD + overrideModAttrs = (_: { + preBuild = null; + }); + yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; hash = "sha256-Jk+zqR/+NBde9ywncIEJM4kgavqiDvcIAjxJCSMrZDc="; From 673b3307727177d710307edafee38c0e16ea8eba Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 27 Sep 2024 21:55:32 +0200 Subject: [PATCH 54/54] grafana-alloy: 1.3.1 -> 1.4.1 https://github.com/grafana/alloy/releases/tag/v1.4.0 https://github.com/grafana/alloy/releases/tag/v1.4.1 diff: https://github.com/grafana/alloy/compare/v1.3.1...v1.4.1 --- pkgs/by-name/gr/grafana-alloy/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 49e60a6d2b97b..e465a4f66eba6 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -16,17 +16,17 @@ buildGoModule rec { pname = "grafana-alloy"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "alloy"; - hash = "sha256-6YjQUIHZmuguzqTeaLgkrM/WdBPZu/KUXUDOmEB7rNQ="; + hash = "sha256-/LCp4PUt85HR+ig0/v7KlS1cFcFGpI8TXHk3IlcEkvk="; }; proxyVendor = true; - vendorHash = "sha256-eMtwmADYbvpIm4FHTHieQ1i4xCty5xCwsZ/JD9r94/8="; + vendorHash = "sha256-fhUoQGNRoWNbU5U21X45s+eJ8XjCkvYULTRShyq0f3E="; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs installShellFiles ]; @@ -62,7 +62,7 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; - hash = "sha256-Jk+zqR/+NBde9ywncIEJM4kgavqiDvcIAjxJCSMrZDc="; + hash = "sha256-Y0WcmjFtiNXue2kcJGlvHVBGmMLewGICISoRHnBPHGw="; }; preBuild = ''