From 8e2ec78c13d4bb8c990b080c07914f316f2cf842 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 03:47:09 +0000 Subject: [PATCH 01/43] python38Packages.bids-validator: 1.8.0 -> 1.8.2 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index e3ee7b9ba73b..f39e775fc257 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.8.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "6d4ecc384121899e0cd5af773419c5ba722585cb176544560ec9a48f17dfd777"; + sha256 = "7969d55e9ed07f6cf7dfd72ed696a05abe56a2f35e81a1ef677f3694b2adf606"; }; # needs packages which are not available in nixpkgs From 595dc022b1523d8ae0210dea3eb50114c05bee8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 06:16:20 +0000 Subject: [PATCH 02/43] python38Packages.jq: 1.1.3 -> 1.2.1 --- pkgs/development/python-modules/jq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index f9f71a587ab9..3833bf9850f8 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.1.3"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r"; + sha256 = "73ce588025495e6ebcda20bb9e64b6d9f3f1657c22895143ae243899ac710cbc"; }; patches = [ From 65bb58d8ca05f98b51ea7e8863813da45b653f0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 06:59:49 +0000 Subject: [PATCH 03/43] python38Packages.mecab-python3: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/mecab-python3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index bb5ffb7de791..ad717e9d0c8f 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "62abe28a1155398325372291483608427bc82681fef80e7d132904415f9fd42e"; + sha256 = "b150ad5fe4260539b4ef184657e552ef81307fbbe60ae1f258bc814549ea90f8"; }; nativeBuildInputs = [ From a283b94822f387aa9119fad9f21f3a9d6e857474 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 07:48:16 +0000 Subject: [PATCH 04/43] python38Packages.msal: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index b5095cc59102..73a40741f3d6 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "5cc93f09523c703d4e00a901cf719ade4faf2c3d14961ba52060ae78d5b25327"; + sha256 = "1ab72dbb623fb8663e8fdefc052b1f9d4ae0951ea872f5f488dad58f3618c89d"; }; propagatedBuildInputs = [ From 8dfb114b7bfca80fd710bf7f9b3a8f1e022df5f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 07:53:42 +0000 Subject: [PATCH 05/43] python38Packages.nbsphinx: 0.8.6 -> 0.8.7 --- pkgs/development/python-modules/nbsphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 8611059eb317..1b0a95f3d76f 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.6"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "097dee333558f400e9abbb53ce7d4fa64a257cfa89dd20f7554dca7f0cd5e143"; + sha256 = "ff91b5b14ceb1a9d44193b5fc3dd3617e7b8ab59c788f7710049ce5faff2750c"; }; propagatedBuildInputs = [ From f8a246accb32e3ee79d08e91ac8376f5caf15ac2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 08:25:22 +0000 Subject: [PATCH 06/43] python38Packages.django-q: 1.3.8 -> 1.3.9 --- pkgs/development/python-modules/django-q/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index c9c5410416ad..f81fc01bdd6f 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.3.8"; + version = "1.3.9"; src = fetchPypi { inherit pname version; - sha256 = "db30266fadd6ab9336a8824291910ff1d1c28f7bc9d6e52cdaf33cc275ae6146"; + sha256 = "5c6b4d530aa3aabf9c6aa57376da1ca2abf89a1562b77038b7a04e52a4a0a91b"; }; propagatedBuildInputs = [ From 81171e61ac152167344258192208591ec75dec42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 08:42:54 +0000 Subject: [PATCH 07/43] python38Packages.elasticsearch: 7.13.1 -> 7.14.0 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 86e7477ab317..c469a7c87f97 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.13.1"; + version = "7.14.0"; src = fetchPypi { inherit pname version; - sha256 = "d6bcca0b2e5665d08e6fe6fadc2d4d321affd76ce483603078fc9d3ccd2bc0f9"; + sha256 = "f3ab1454e646170bbc6796b8707e4bff125234391d2acc022221e1c0313becb4"; }; # Check is disabled because running them destroy the content of the local cluster! From e5766d96922b67468f8a8a0f92990e630ebb4f18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 12:28:54 +0000 Subject: [PATCH 08/43] python38Packages.jwcrypto: 0.9.1 -> 1.0 --- pkgs/development/python-modules/jwcrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 182cfd0d485c..ca7319eeb1fc 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "0.9.1"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "63531529218ba9869e14ef8c9e7b516865ede3facf9b0ef3d3ba68014da211f9"; + sha256 = "f88816eb0a41b8f006af978ced5f171f33782525006cdb055b536a40f4d46ac9"; }; propagatedBuildInputs = [ From 5cca732abf167c95c434e4733793d276b5bdc399 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 16:37:26 +0000 Subject: [PATCH 09/43] jc: 1.16.0 -> 1.16.1 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index b09137d361b7..bf671fcb1bac 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.16.0"; + version = "1.16.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6kh9FzMW5davxN8jNFFUh+PGSNAW7w8aeoJP25mGY10="; + sha256 = "sha256-R/RKMxSilv8JJW5om+l99vvrZYHjEEK1OCdsYWuxA74="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From f2b6a2d112580a1df60ac9132c8a3b41291f7629 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 19:16:08 +0000 Subject: [PATCH 10/43] python38Packages.scikit-build: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 42f10aedf393..749e07ef840e 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.11.1"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s"; + sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe"; }; propagatedBuildInputs = [ From d1b607d38ae9e92c8ffeebc5df0942efe8414e58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 20:10:59 +0000 Subject: [PATCH 11/43] python38Packages.wurlitzer: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/wurlitzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index f37d6de13595..f3b8d47debe8 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0144228960a992ef46e339e8aa560600bd34cd64e018bfebad88c0dd61bd8ba5"; + sha256 = "5a3ea5a13a8aac2d808864087fec87a0518bf7d9776173ab06a6bb4ade9f4d27"; }; propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; From 2d665331c9c544c24a08d250e36f4bce0c64272c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:10:24 +0000 Subject: [PATCH 12/43] python38Packages.pdftotext: 2.1.6 -> 2.2.0 --- pkgs/development/python-modules/pdftotext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 400dc76c0d39..d64b2719f3d6 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.6"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "caf8ddbaeaf0a5897f07655a71747242addab2e695e84c5d47f2ea92dfe2a594"; + sha256 = "efbbfb14cf37ed7ab2c71936bae44707dfed6bb3be7ea5214e9c44c8c258c7af"; }; buildInputs = [ poppler ]; From 86bc67fdb5fd5c86f9c00515f0389604186c4e71 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:21:29 +0000 Subject: [PATCH 13/43] python38Packages.perfplot: 0.9.6 -> 0.9.8 --- pkgs/development/python-modules/perfplot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 8e15cc0be8db..af653ed0c8da 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.6"; + version = "0.9.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = "v${version}"; - sha256 = "11f31d6xqxp04693symc2dl8890gjaycrb2a35y5xy023abwir5b"; + rev = version; + sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d"; }; format = "pyproject"; From 0a1f5eb55567fbb4675ea8e12a0069a1a1a7686e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:42:59 +0000 Subject: [PATCH 14/43] python38Packages.progress: 1.5 -> 1.6 --- pkgs/development/python-modules/progress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index fcc1a7a92293..801beaa44710 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5"; + version = "1.6"; pname = "progress"; src = fetchPypi { inherit pname version; - sha256 = "0wj3wvdgfmqj44n32wag3mzpp5fjqkkd321x67v1prxvs78yvv39"; + sha256 = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd"; }; checkPhase = '' From 1698c2ad6284f3afb632969fa3e3be720accd8d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:52:13 +0000 Subject: [PATCH 15/43] python38Packages.pybtex-docutils: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/pybtex-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix index 2dbd4e8cff58..a4abd26a043f 100644 --- a/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.0.1"; pname = "pybtex-docutils"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e"; + sha256 = "d53aa0c31dc94d61fd30ea3f06c749e6f510f9ff0e78cb2765a9300f173d8626"; }; meta = with lib; { From 5e3d416dff8fe916cd9babb018c253fe7dee099a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 14:38:12 +0000 Subject: [PATCH 16/43] python38Packages.pymbolic: 2020.1 -> 2021.1 --- pkgs/development/python-modules/pymbolic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 23c88ca28d45..4faf04d289ee 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "ca029399f9480f6d51fbac0349fddbb42d937620deb03befa0ba94ac08895e6b"; + sha256 = "67d08ef95568408901e59f79591ba41fd3f2caaecb42b7497c38fc82fd60358c"; }; postConfigure = '' From e95db9d78b8e642c360ee8db69f5a2eee72e2b1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 18:54:32 +0000 Subject: [PATCH 17/43] python38Packages.sounddevice: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/sounddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 7787e8b16b85..9ada3c6603a7 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b"; + sha256 = "1c9b07cff59c837d258002ed806ee134ed367ef11042bd7d283d6ce407bf889c"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; From 1aa8a9fe452421791f76f0bef61c009c99ac9032 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 04:28:58 +0000 Subject: [PATCH 18/43] keycloak: 15.0.1 -> 15.0.2 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index f8e9ec33cf77..cd8373f0842b 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "15.0.1"; + version = "15.0.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-levWTIO64or3jPejiJzyU0YQqMap5bK6w1EIMmfthD8="; + sha256 = "sha256-GlnSsvAYBjRTtabMVrpWUH0EWEdLIe6ud+HIXJqTsqY="; }; nativeBuildInputs = [ makeWrapper ]; From d5b9aefa439a9da2dae7f533202173745ad7b9e0 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Tue, 24 Aug 2021 22:46:45 +0000 Subject: [PATCH 19/43] stage-1: fix copytoram option for loopback.cfg boot Uses an alternative method to find the size of the ISO when it is a file and not a block device for creating the tmpfs its contents are copied to. --- nixos/modules/system/boot/stage-1-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index ddaf985878e0..3dfcc010b64e 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -542,7 +542,7 @@ while read -u 3 mountPoint; do # If copytoram is enabled: skip mounting the ISO and copy its content to a tmpfs. if [ -n "$copytoram" ] && [ "$device" = /dev/root ] && [ "$mountPoint" = /iso ]; then fsType=$(blkid -o value -s TYPE "$device") - fsSize=$(blockdev --getsize64 "$device") + fsSize=$(blockdev --getsize64 "$device" || stat -Lc '%s' "$device") mkdir -p /tmp-iso mount -t "$fsType" /dev/root /tmp-iso From 4a9c5a6754913bca1d6912d4a7057a23295882e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 04:59:11 +0000 Subject: [PATCH 20/43] go-ethereum: 1.10.7 -> 1.10.8 --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 8257aa43dd28..b9f31a3e7fa7 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P0+XPSpvVsjia21F3FIg7KO6Qe2ZbY90tM/dRwBBuBk="; + sha256 = "sha256-r4ifLa4CMZvp0MaCkxWo5rWLEnFdX//mYlC08hndXhQ="; }; runVend = true; - vendorSha256 = "sha256-51jt5oBb/3avZnDRfo/NKAtZAU6QBFkzNdVxFnJ+erM="; + vendorSha256 = "sha256-e8aKQMVEEf0BzpdljkOBxznj5P1Go/6EbY9mdhDLyrw="; doCheck = false; From 4f1b827007ddd4a0ea6953a850c51650586e6234 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:47:12 +0200 Subject: [PATCH 21/43] python3Packages.awesomeversion: 21.8.0 -> 21.8.1 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 7b7d432f0c6b..b5b59ef65508 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.8.0"; + version = "21.8.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-j5y3f6F+8PzOPxpBHE3LKF3kdRzP4d21N/1Bd6v+MQg="; + sha256 = "sha256-eyo0dzmExJ7WCRAXFvB+ElWi5HTTzJ7XJsmxB2t6yfI="; }; postPatch = '' From 34f455a86a4d83053869dc1d373f5fc898a17982 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 15:47:45 +0200 Subject: [PATCH 22/43] python3Packages.pysyncthru: 0.7.7 -> 0.7.8 --- pkgs/development/python-modules/pysyncthru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index 373cb7c6f2b6..67194d51cb2f 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.7"; + version = "0.7.8"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nielstron"; repo = "pysyncthru"; rev = "release-${version}"; - sha256 = "1449lbg9dx13p03v6fl2ap0xk5i5wrmy6amx1pl0rgz712p5jmq7"; + sha256 = "17k9dhnya4304gqmkyvvf94jvikmnkf2lqairl3rfrl7w68jm3vp"; }; propagatedBuildInputs = [ From 982f46985e37a6488d8e904b46e0cba2060adc71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 25 Aug 2021 09:32:10 +0200 Subject: [PATCH 23/43] writers: drop writeC This function is fundamentally broken. Not even the ncurses example will compile. The interface needs to be rethought for it to work (i.e. don't unconditionally include all pc files, set include path and ld path and rpath). Since it is unlikely that in the current this has any user, just drop it for now. --- pkgs/build-support/writers/default.nix | 45 -------------------------- pkgs/build-support/writers/test.nix | 26 --------------- 2 files changed, 71 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 47919c251af1..111ec68a6021 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -99,51 +99,6 @@ rec { writeBashBin = name: writeBash "/bin/${name}"; - # writeC writes an executable c package called `name` to `destination` using `libraries`. - # - # Examples: - # writeC "hello-world-ncurses" { libraries = [ pkgs.ncurses ]; } '' - # #include - # int main() { - # initscr(); - # printw("Hello World !!!"); - # refresh(); endwin(); - # return 0; - # } - # '' - writeC = name: { - libraries ? [], - strip ? true - }: - makeBinWriter { - compileScript = '' - PATH=${makeBinPath [ - pkgs.binutils-unwrapped - pkgs.coreutils - pkgs.findutils - pkgs.gcc - pkgs.pkg-config - ]} - export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries} - gcc \ - ${optionalString (libraries != []) - "$(pkg-config --cflags --libs ${ - concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgconfig -name \\*.pc)") libraries - })" - } \ - -O \ - -o "$out" \ - -Wall \ - -x c \ - "$contentPath" - ''; - inherit strip; - } name; - - # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin) - writeCBin = name: - writeC "/bin/${name}"; - # Like writeScript but the first line is a shebang to dash # # Example: diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 00cad9a96b53..69bc7dd2c61a 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -17,14 +17,6 @@ let if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeCBin "test-writers-c" { libraries = [ ]; } '' - #include - int main() { - printf("success\n"); - return 0; - } - ''; - dash = writeDashBin "test-writers-dash-bin" '' test '~' = '~' && echo 'success' ''; @@ -88,24 +80,6 @@ let if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeC "test-writers-c" { libraries = [ glib.dev ]; } '' - #include - #include - int main() { - GApplication *application = g_application_new ("hello.world", G_APPLICATION_FLAGS_NONE); - g_application_register (application, NULL, NULL); - GNotification *notification = g_notification_new ("Hello world!"); - g_notification_set_body (notification, "This is an example notification."); - GIcon *icon = g_themed_icon_new ("dialog-information"); - g_notification_set_icon (notification, icon); - g_object_unref (icon); - g_object_unref (notification); - g_object_unref (application); - printf("success\n"); - return 0; - } - ''; - dash = writeDash "test-writers-dash" '' test '~' = '~' && echo 'success' ''; From 7eeb8feab5ccaead0c7aee39407985a3ab3bbb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 01:26:26 +0200 Subject: [PATCH 24/43] python39Packages.google-cloud-access-context-manager: remove unused input --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 71688ec17130..f2e327670586 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }: +{ lib, buildPythonPackage, fetchPypi, google-api-core }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Protobufs for Google Access Context Manager."; + description = "Protobufs for Google Access Context Manager"; homepage = "https://github.com/googleapis/python-access-context-manager"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; From c5b90ed43160db09fa7cf3e004e07d72f5ceb410 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 02:54:11 +0000 Subject: [PATCH 25/43] python38Packages.cfgv: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/cfgv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index 306019b54b75..c7b074089a68 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cfgv"; - version = "3.3.0"; + version = "3.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1"; + sha256 = "f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"; }; propagatedBuildInputs = [ six ]; From 356ef3579b9ca54628eace6b448cb7d00a0dcce7 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 26 Aug 2021 11:12:18 +0800 Subject: [PATCH 26/43] perlPackages.XSParseKeyword: 0.06 -> 0.12 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35836205943f..12da4a5fec19 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24155,11 +24155,12 @@ let XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.06"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.06.tar.gz"; - sha256 = "0nnr8akkxb2h2y3d5r51pr84vvxkq89ynmi9azkbnn79jmbcbgvq"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.12.tar.gz"; + sha256 = "0crwhcw9ciqndvwvhycd93m6jgyhi77yyj4vi9xfyglpv84p3y68"; }; + buildInputs = [ ExtUtilsCChecker ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; From 1f1357e20e9b05ccd926c2eaf114a38c92f25a86 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 26 Aug 2021 11:15:45 +0800 Subject: [PATCH 27/43] perlPackages.XSParseSublike: 0.10 -> 0.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35836205943f..aeee748d69ea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24170,10 +24170,10 @@ let XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.10"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.10.tar.gz"; - sha256 = "99a1bdda3ffa67514adb6aa189c902fa78dca41d778a42ae7079f604a045ac43"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.12.tar.gz"; + sha256 = "08kpia48f1rqc44rvbns97h3jyy2y5c8qlkh4a95v1m0yr5cb22s"; }; buildInputs = [ TestFatal ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; From 89c84c4dc5dc28297985f4dbe47b9a0fec4fe7af Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 26 Aug 2021 11:19:23 +0800 Subject: [PATCH 28/43] perlPackages.FutureAsyncAwait: 0.49 -> 0.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35836205943f..c79fea90f986 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8645,13 +8645,13 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.49"; + version = "0.52"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "0cm7cgfjrqs7jazl0f9q6lgkhz6k8qbawin1z36nrwh2ywc94zjb"; + sha256 = "0dwij2r51vij91hx808zc2l5q38h55jahzrh73h4rn816jv597yx"; }; buildInputs = [ TestRefcount ]; - propagatedBuildInputs = [ Future XSParseSublike ]; + propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; From 6a9c41924d911e25b61e1df311790b3ea5213b9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 04:19:49 +0000 Subject: [PATCH 29/43] dotenv-linter: 3.1.0 -> 3.1.1 --- pkgs/development/tools/analysis/dotenv-linter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 51e43555d5ea..983dd2c2a999 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ="; + sha256 = "sha256-kBBn8Lgb3427K00Ag35Ei9oBD7L0Zp/lr0cAKqZpULo="; }; - cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM="; + cargoSha256 = "sha256-7Porqqh6lYeBCK2pAtbL9nxtORB9rqSyVdJDoy1/ZDo="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; From 0caa3c6e9488891882d7a9b21b76dd8f70d56de7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 06:23:38 +0000 Subject: [PATCH 30/43] grype: 0.16.0 -> 0.17.0 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index e27526289aa0..4dc119980a5d 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xk+AyCcPQDDKKLT/tkZ2znXbBSBEgmqVqmgGBP/3Oos="; + sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE="; }; - vendorSha256 = "sha256-OAzuL1pHLLKgkKjPjupPg7LEz8sY7ehq2PONnjhvzHE="; + vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ="; propagatedBuildInputs = [ docker ]; From 354c960d3597d6f732a7937c89eed298afa15864 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 09:37:13 +0200 Subject: [PATCH 31/43] python3Packages.slack-sdk: 3.9.1 -> 3.10.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index f121ac9aeb73..6183ee7b0cba 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.9.1"; + version = "3.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-IskBFccMDG03BFkERRfL7TH1Ppq8Xr9qTxCEoUEqxtk="; + sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs="; }; propagatedBuildInputs = [ From d2a08fef699a955e4ca2d99286aba9113f734d3f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Aug 2021 09:00:00 -0500 Subject: [PATCH 32/43] ocamlPackages.ppx_cstubs: 0.6.1.1 -> 0.6.1.2 https://github.com/fdopen/ppx_cstubs/raw/0.6.1.2/CHANGES.md --- pkgs/development/ocaml-modules/ppx_cstubs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index b4ddb4dd5e45..6ad6c4cd8985 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { pname = "ppx_cstubs"; - version = "0.6.1.1"; + version = "0.6.1.2"; useDune2 = true; @@ -21,7 +21,7 @@ buildDunePackage rec { owner = "fdopen"; repo = "ppx_cstubs"; rev = version; - sha256 = "0rgg78435ypi6ryhcq5ljkch4qjvra2jqjd47c2hhhcbwvi2ssxh"; + sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; buildInputs = [ @@ -37,8 +37,9 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; + changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; description = "Preprocessor for easier stub generation with ocaml-ctypes"; - license = licenses.mit; + license = licenses.lgpl21Plus; maintainers = [ maintainers.osener ]; }; } From 4a8fec5e6f4e5328ef53d3d5ab30992ba8e04af7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Aug 2021 09:01:00 -0500 Subject: [PATCH 33/43] ocamlPackages.integers: 0.4.0 -> 0.5.1 https://github.com/ocamllabs/ocaml-integers/raw/0.5.1/CHANGES.md --- pkgs/development/ocaml-modules/integers/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index 97443bf5706e..ed5ccbedb64d 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip, buildDunePackage, ocaml }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: buildDunePackage rec { pname = "integers"; - version = "0.4.0"; + version = "0.5.1"; useDune2 = lib.versionAtLeast ocaml.version "4.08"; - src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; + src = fetchFromGitHub { + owner = "ocamllabs"; + repo = "ocaml-integers"; + rev = version; + sha256 = "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi"; }; meta = { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; homepage = "https://github.com/ocamllabs/ocaml-integers"; + changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl ]; }; } From 6ad7483734f71aa3706e87ed28ec8bfbc36c3e8f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 10:09:56 +1000 Subject: [PATCH 34/43] cri-o: 1.21.2 -> 1.22.0 https://github.com/cri-o/cri-o/releases/tag/v1.22.0 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 26e56ccc609e..bc7e25d93dd7 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI="; + sha256 = "sha256-lY/kHvJBN7idFn3YUEHMR4w+M3F89RKMsvvyHmH/EPc="; }; vendorSha256 = null; From 9362518892ab9ab8c51c64aef9ee3860e50dae50 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 10:07:56 +1000 Subject: [PATCH 35/43] crun: 0.21 -> 1.0 https://github.com/containers/crun/releases/tag/1.0 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index a0d8c16d5572..cc9d02681790 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.21"; + version = "1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-PhhaCXtWsknMsEt1F9jMfEWSl+OLQ/C/iTj7t0XuAFw="; + sha256 = "sha256-xpNwhNAbcTKkXl5i4L8aayMAx8O8SWdFlgHguHNiqqw="; fetchSubmodules = true; }; From 3bfda0f02c206ea8ada6d76b5f84367d2329a66b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 09:52:04 +0200 Subject: [PATCH 36/43] python3Packages.sendgrid: 6.8.0 -> 6.8.1 --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index f4c913b1639c..5aabcc2d0f10 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.8.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-PtTsFwE6+6/HzyR721Y9+qaI7gwYtYwuY+wrZpoGY2Q="; + sha256 = "sha256-rK/GouOv5RMDsn5NrCEtIz5a9wO6YATlhsRuhFuHaXY="; }; propagatedBuildInputs = [ From a4127fa9430d4e54fc19acc691660a4bc4c1fbe3 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Thu, 26 Aug 2021 11:03:54 +0200 Subject: [PATCH 37/43] hp2p: init at 3.3 --- pkgs/tools/networking/hp2p/default.nix | 38 +++++++ pkgs/tools/networking/hp2p/python3.patch | 120 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 160 insertions(+) create mode 100644 pkgs/tools/networking/hp2p/default.nix create mode 100644 pkgs/tools/networking/hp2p/python3.patch diff --git a/pkgs/tools/networking/hp2p/default.nix b/pkgs/tools/networking/hp2p/default.nix new file mode 100644 index 000000000000..52f3455ed4d5 --- /dev/null +++ b/pkgs/tools/networking/hp2p/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, mpi, python3Packages, autoconf, automake } : + +stdenv.mkDerivation rec { + pname = "hp2p"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "cea-hpc"; + repo = "hp2p"; + rev = version; + sha256 = "0zvlwb941rlp3vrf9yzv7njgpj3mh4671ch7qvxfa4hq2ivd52br"; + }; + + patches = [ ./python3.patch ]; + enableParallelBuilding = true; + nativeBuildInputs = [ autoconf automake python3Packages.wrapPython ]; + buildInputs = [ mpi ] ++ (with python3Packages; [ python numpy matplotlib plotly mpldatacursor ]) ; + pythonPath = (with python3Packages; [ numpy matplotlib plotly mpldatacursor ]) ; + + preConfigure = '' + patchShebangs autogen.sh + ./autogen.sh + export CC=mpicc + export CXX=mpic++ + ''; + + postInstall = '' + wrapPythonPrograms + ''; + + meta = with lib; { + description = "A MPI based benchmark for network diagnostics"; + homepage = "https://github.com/cea-hpc/hp2p"; + platforms = platforms.unix; + license = licenses.cecill-c; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/tools/networking/hp2p/python3.patch b/pkgs/tools/networking/hp2p/python3.patch new file mode 100644 index 000000000000..13043d9f09f1 --- /dev/null +++ b/pkgs/tools/networking/hp2p/python3.patch @@ -0,0 +1,120 @@ +diff -u -r source.orig/src/vizhp2p source/src/vizhp2p +--- source.orig/src/vizhp2p 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p 2021-08-24 10:41:42.926881770 +0200 +@@ -94,25 +94,25 @@ + with open(hostfile) as fd: + for line in fd: + if line.startswith(motif_rank): +- print line ++ print(line) + c,v = line[len(motif_rank)+1:-1].split(separator) + nodes[c] = v + + # display k worst nodes indices +- print "\nTop %d bad mean:" % k ++ print("\nTop %d bad mean:" % k) + mean_order = np.argsort(a_mean) +- print [nodes[str(c)] for c in mean_order[:k]] ++ print([nodes[str(c)] for c in mean_order[:k]]) + mean_st = "Top nodes with bad mean:\n" + for i in range(0, k, hostname_per_line): + mean_st += repr([nodes[str(c)] for c + in mean_order[i:i + hostname_per_line]]) + "\n" + +- print "Top %d bad std:" % k +- print [nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]] ++ print("Top %d bad std:" % k) ++ print([nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]]) + +- print "Top %d bad mean/std:" % k ++ print("Top %d bad mean/std:" % k) + pen_order = np.argsort(a_mean / a_std) +- print [nodes[str(c)] for c in pen_order[:k]] ++ print([nodes[str(c)] for c in pen_order[:k]]) + pen_st = "Top nodes with bad mean/std:\n" + for i in range(0, k, hostname_per_line): + pen_st += repr([nodes[str(c)] for c +@@ -293,9 +293,9 @@ + # and 'p' (snapshot) + def onrefresh(event): + if event.key == 'r': +- print "refreshing...", ++ print("refreshing...", end=' ') + loop() +- print "ok" ++ print("ok") + elif event.key == 'q': + exit() + elif event.key == 'p': +@@ -303,9 +303,9 @@ + fig1.savefig(snapfile) + snapfile = outputname + "_snapshot_time.png" + fig2.savefig(snapfile) +- print 'snapshot saved (%s)' % snapfile ++ print('snapshot saved (%s)' % snapfile) + else: +- print "The answer to %s is 42." % event.key ++ print("The answer to %s is 42." % event.key) + + + if __name__ == "__main__": +@@ -356,11 +356,11 @@ + countfile = outputname + ".count.bin" + + print("visu_hp2p configuration:") +- print(" DATAFILE : %s"%resfile) +- print(" BIN_TIMER_FILE : %s"%resfile_time) +- print(" HOSTFILE : %s"%hostfile) +- print(" Bad nodes to display: %d"%k) +- print(" GUI resolution : %s"%resolution) ++ print((" DATAFILE : %s"%resfile)) ++ print((" BIN_TIMER_FILE : %s"%resfile_time)) ++ print((" HOSTFILE : %s"%hostfile)) ++ print((" Bad nodes to display: %d"%k)) ++ print((" GUI resolution : %s"%resolution)) + + hostname_per_line = 4 # for GUI layout + refresh_in_sec = 60 +@@ -377,7 +377,7 @@ + # wait for resfile + while not os.path.exists(resfile) : + time.sleep(5) +- print "Waiting for input files..." ++ print("Waiting for input files...") + + # add callback on key press event + cid1 = fig1.canvas.mpl_connect('key_press_event', onrefresh) +Only in source/src: vizhp2p.bak +diff -u -r source.orig/src/vizhp2p_html source/src/vizhp2p_html +--- source.orig/src/vizhp2p_html 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p_html 2021-08-24 10:41:54.799946303 +0200 +@@ -118,7 +118,7 @@ + hostfile = args.hostfile + clustername = args.clustername + if len(args.OutputName) == 0: +- print "No DATAFILE given! Please provide Hp2p output files name !" ++ print("No DATAFILE given! Please provide Hp2p output files name !") + exit(0) + else: + outputname = args.OutputName.split('.')[0] +@@ -134,13 +134,13 @@ + else: + outfile = args.outfile + +- print "%s configuration:"%commandname +- print " DATAFILE : %s"%resfile +- print " HOSTFILE : %s"%hostfile +- print " CLUSTER : %s"%clustername +- print " OUTPUTFILE : %s"%outfile ++ print("%s configuration:"%commandname) ++ print(" DATAFILE : %s"%resfile) ++ print(" HOSTFILE : %s"%hostfile) ++ print(" CLUSTER : %s"%clustername) ++ print(" OUTPUTFILE : %s"%outfile) + if not os.path.exists(resfile): +- print "%s doesn't exist...Exiting"%resfile ++ print("%s doesn't exist...Exiting"%resfile) + exit(0) + + # Data management +Only in source/src: vizhp2p_html.bak diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20aecbc2994e..9212b97ec9ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1648,6 +1648,8 @@ with pkgs; hostctl = callPackage ../tools/system/hostctl { }; + hp2p = callPackage ../tools/networking/hp2p { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; From 8431c52e46aa4ddeb5249798e78f7ce2b90c77b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 09:32:14 +0000 Subject: [PATCH 38/43] python38Packages.pytelegrambotapi: 3.8.2 -> 3.8.3 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 1e07b2c01f0c..58d1d0c694a7 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.8.2"; + version = "3.8.3"; src = fetchPypi { inherit pname version; - sha256 = "cf83c652b88b4b1535a306a9b0c2f34bf6c390cebb9553ef34369e6290fc9496"; + sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518"; }; propagatedBuildInputs = [ requests ]; From 0d92d8e613d8ffa7fc455970c4ce761488b2f436 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 09:41:08 +0000 Subject: [PATCH 39/43] minio: 2021-08-20T18-32-01Z -> 2021-08-25T00-41-18Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 56a2850107a4..9293b4c48f01 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-08-20T18-32-01Z"; + version = "2021-08-25T00-41-18Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Ij0QExsCtEtVOI1Zd0YC46y2ACp/mdE07VNIBRVi4/8="; + sha256 = "sha256-gwP1q+5vjgCnrnvWTxPC66fugVrilC1WbLk3SP4NXqA="; }; - vendorSha256 = "sha256-Nr2zpIgqinUvxV9xW8UuZRnrIvCe3pWTe3qE2UtUyzc="; + vendorSha256 = "sha256-JcgMJ6xz3h3YJ1zoSJLCWdWGmd12MPvxcIPX1ZbhpaM="; doCheck = false; From 034b80b453147efcabc75976700d51807e16759f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 10:02:44 +0000 Subject: [PATCH 40/43] python38Packages.somajo: 2.1.4 -> 2.1.5 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index e99363690340..6027df2be521 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.4"; + version = "2.1.5"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "0clcndij4nd5ig7padvb9dj5hfxg6nymn9sf42bjr9ipjihcsbdq"; + sha256 = "17v1vmbjwpxwql25vlbm7xsair7945ljmyaricxx8fd6fxvgn9rr"; }; propagatedBuildInputs = [ regex ]; From 13ea123c74cdcb33cdc376b16677044512615afa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:45:51 +1000 Subject: [PATCH 41/43] treewide: buildFlagsArray -> ldflags --- pkgs/applications/editors/glow/default.nix | 2 +- pkgs/applications/editors/micro/default.nix | 2 +- pkgs/applications/logging/humioctl/default.nix | 2 +- pkgs/applications/misc/archiver/default.nix | 2 +- pkgs/applications/misc/charm/default.nix | 2 +- pkgs/applications/misc/dstask/default.nix | 10 +++++----- pkgs/applications/misc/expenses/default.nix | 4 ++-- pkgs/applications/misc/wtf/default.nix | 2 +- .../networking/cloudflared/default.nix | 2 +- .../networking/cluster/argocd/default.nix | 5 ++--- .../cluster/cloudfoundry-cli/default.nix | 3 +-- .../networking/cluster/fluxcd/default.nix | 2 +- .../networking/cluster/fluxctl/default.nix | 2 +- .../networking/cluster/helmfile/default.nix | 2 +- .../networking/cluster/hetzner-kube/default.nix | 7 +++---- .../networking/cluster/istioctl/default.nix | 4 ++-- .../networking/cluster/jx/default.nix | 13 ++++++------- .../networking/cluster/k9s/default.nix | 11 +++++------ .../networking/cluster/kpt/default.nix | 2 +- .../networking/cluster/kubelogin/default.nix | 9 ++++----- .../networking/cluster/kubeseal/default.nix | 2 +- .../networking/cluster/kuttl/default.nix | 8 ++++---- .../networking/cluster/multus-cni/default.nix | 4 ++-- .../networking/cluster/popeye/default.nix | 9 ++++----- .../networking/cluster/qbec/default.nix | 11 +++++------ .../networking/cluster/sonobuoy/default.nix | 14 +++++++------- .../networking/cluster/stern/default.nix | 4 ++-- .../networking/cluster/tanka/default.nix | 2 +- .../networking/cluster/tilt/default.nix | 2 +- .../networking/cluster/velero/default.nix | 11 +++++------ .../networking/dnscontrol/default.nix | 2 +- pkgs/applications/networking/nextdns/default.nix | 2 +- .../networking/shellhub-agent/default.nix | 2 +- .../git-and-tools/ghorg/default.nix | 2 +- .../git-and-tools/ghq/default.nix | 7 +++---- .../git-and-tools/git-bug/default.nix | 11 +++++------ .../git-and-tools/git-chglog/default.nix | 3 +-- .../git-and-tools/lab/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../applications/video/go-chromecast/default.nix | 2 +- .../virtualization/imgcrypt/default.nix | 4 ++-- .../nvidia-container-toolkit/default.nix | 2 +- .../embedded/arduino/arduino-cli/default.nix | 4 ++-- pkgs/development/tools/bazelisk/default.nix | 2 +- .../build-managers/bazel/buildtools/default.nix | 2 +- .../tools/build-managers/mage/default.nix | 3 +-- pkgs/development/tools/buildpack/default.nix | 2 +- pkgs/development/tools/butane/default.nix | 6 +++--- pkgs/development/tools/cloud-nuke/default.nix | 2 +- pkgs/development/tools/conftest/default.nix | 3 +-- .../buildkite-cli/default.nix | 2 +- .../tools/continuous-integration/fly/default.nix | 7 +++---- pkgs/development/tools/cue/default.nix | 4 ++-- pkgs/development/tools/dive/default.nix | 2 +- pkgs/development/tools/earthly/default.nix | 11 +++++------ pkgs/development/tools/fission/default.nix | 2 +- pkgs/development/tools/github/bump/default.nix | 5 ++--- pkgs/development/tools/go-minimock/default.nix | 4 ++-- pkgs/development/tools/go-swagger/default.nix | 2 +- pkgs/development/tools/go-task/default.nix | 4 ++-- pkgs/development/tools/gomplate/default.nix | 3 +-- pkgs/development/tools/gosec/default.nix | 3 +-- pkgs/development/tools/gotestsum/default.nix | 2 +- pkgs/development/tools/hcloud/default.nix | 2 +- .../tools/jsonnet-bundler/default.nix | 2 +- pkgs/development/tools/kubepug/default.nix | 6 +++--- pkgs/development/tools/kustomize/default.nix | 12 ++++++------ pkgs/development/tools/lazygit/default.nix | 2 +- .../tools/misc/circleci-cli/default.nix | 2 +- pkgs/development/tools/misc/k2tf/default.nix | 2 +- pkgs/development/tools/misc/mkcert/default.nix | 6 +++--- .../development/tools/misc/reviewdog/default.nix | 2 +- .../tools/misc/terracognita/default.nix | 2 +- pkgs/development/tools/renderizer/default.nix | 4 ++-- pkgs/development/tools/skaffold/default.nix | 13 ++++++------- pkgs/development/tools/tf2pulumi/default.nix | 6 +++--- pkgs/development/tools/yj/default.nix | 2 +- pkgs/development/web/flyctl/default.nix | 2 +- pkgs/development/web/minify/default.nix | 2 +- pkgs/os-specific/darwin/smimesign/default.nix | 2 +- pkgs/servers/blockbook/default.nix | 11 +++++------ pkgs/servers/dex/default.nix | 4 ++-- pkgs/servers/hasura/cli.nix | 10 +++++----- pkgs/servers/http/pomerium/default.nix | 4 ++-- pkgs/servers/maddy/default.nix | 2 +- pkgs/servers/matrix-corporal/default.nix | 4 ++-- pkgs/servers/miniflux/default.nix | 6 +++--- pkgs/servers/misc/gobgpd/default.nix | 7 +++---- .../alertmanager-irc-relay/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- pkgs/servers/monitoring/do-agent/default.nix | 7 +++---- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- .../monitoring/mackerel-agent/default.nix | 9 ++++----- pkgs/servers/monitoring/mtail/default.nix | 4 ++-- .../prometheus/artifactory-exporter.nix | 15 +++++++-------- .../monitoring/prometheus/mysqld-exporter.nix | 16 ++++++++-------- pkgs/servers/monitoring/prometheus/promscale.nix | 2 +- .../monitoring/prometheus/redis-exporter.nix | 9 ++++----- .../monitoring/prometheus/smokeping-prober.nix | 4 ++-- pkgs/servers/monitoring/sensu-go/default.nix | 11 +++++------ pkgs/servers/monitoring/thanos/default.nix | 15 +++++++-------- pkgs/servers/monitoring/unifi-poller/default.nix | 14 +++++++------- pkgs/servers/nosql/influxdb/default.nix | 2 +- pkgs/servers/nosql/victoriametrics/default.nix | 2 +- pkgs/servers/oauth2-proxy/default.nix | 2 +- pkgs/servers/pg_featureserv/default.nix | 2 +- pkgs/servers/pg_tileserv/default.nix | 2 +- pkgs/servers/reproxy/default.nix | 4 ++-- pkgs/servers/rtsp-simple-server/default.nix | 8 ++++---- pkgs/shells/elvish/default.nix | 2 +- pkgs/shells/zsh/antibody/default.nix | 2 +- pkgs/tools/admin/aws-vault/default.nix | 7 +++---- pkgs/tools/admin/awsweeper/default.nix | 2 +- pkgs/tools/admin/chamber/default.nix | 2 +- pkgs/tools/admin/credhub-cli/default.nix | 3 +-- pkgs/tools/admin/fioctl/default.nix | 6 +++--- pkgs/tools/admin/iamy/default.nix | 6 +++--- pkgs/tools/admin/lego/default.nix | 4 ++-- pkgs/tools/admin/ssmsh/default.nix | 2 +- pkgs/tools/backup/kopia/default.nix | 9 ++++----- pkgs/tools/filesystems/gocryptfs/default.nix | 11 +++++------ pkgs/tools/misc/chezmoi/default.nix | 4 ++-- pkgs/tools/misc/duf/default.nix | 2 +- pkgs/tools/misc/goreleaser/default.nix | 3 +-- pkgs/tools/misc/gotify-cli/default.nix | 4 ++-- pkgs/tools/misc/lf/default.nix | 2 +- pkgs/tools/misc/microplane/default.nix | 6 +++--- pkgs/tools/misc/pgcenter/default.nix | 2 +- pkgs/tools/misc/pgmetrics/default.nix | 2 +- pkgs/tools/misc/pistol/default.nix | 2 +- pkgs/tools/misc/tfk8s/default.nix | 3 +-- pkgs/tools/misc/vsh/default.nix | 2 +- pkgs/tools/networking/cassowary/default.nix | 2 +- pkgs/tools/networking/chisel/default.nix | 2 +- pkgs/tools/networking/clash/default.nix | 3 +-- pkgs/tools/networking/gobgp/default.nix | 7 +++---- pkgs/tools/networking/grpcui/default.nix | 2 +- pkgs/tools/networking/grpcurl/default.nix | 2 +- pkgs/tools/networking/nebula/default.nix | 2 +- pkgs/tools/networking/shadowfox/default.nix | 4 ++-- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- pkgs/tools/networking/termshark/default.nix | 7 +++---- pkgs/tools/networking/yggdrasil/default.nix | 11 +++++------ .../package-management/holo-build/default.nix | 2 +- pkgs/tools/package-management/morph/default.nix | 8 +++----- pkgs/tools/package-management/nfpm/default.nix | 2 +- .../security/aws-iam-authenticator/default.nix | 2 +- pkgs/tools/security/cfssl/default.nix | 9 ++++----- pkgs/tools/security/doppler/default.nix | 2 +- pkgs/tools/security/gopass/default.nix | 2 +- pkgs/tools/security/gopass/git-credential.nix | 8 +++----- pkgs/tools/security/gopass/jsonapi.nix | 8 +++----- pkgs/tools/security/saml2aws/default.nix | 6 +++--- pkgs/tools/security/step-ca/default.nix | 2 +- pkgs/tools/security/subjs/default.nix | 2 +- pkgs/tools/system/ctop/default.nix | 2 +- pkgs/tools/system/hostctl/default.nix | 3 +-- pkgs/tools/system/netdata/go.d.plugin.nix | 2 +- pkgs/tools/text/mark/default.nix | 2 +- pkgs/tools/text/vale/default.nix | 2 +- pkgs/tools/virtualization/shipyard/default.nix | 4 ++-- 161 files changed, 342 insertions(+), 388 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 728f5e54a3c6..dde5083d9c8d 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index c10a436b7396..c3c42ac24cba 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; postInstall = '' installManPage assets/packaging/micro.1 diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 5ec33d88cddb..b5d0578b1220 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -20,7 +20,7 @@ in buildGoModule { sha256 = sha256; }; - buildFlagsArray = "-ldflags=-X main.version=${humioCtlVersion}"; + ldflags = [ "-X main.version=${humioCtlVersion}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 4d46047bb964..cf76eda2720c 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; doCheck = false; diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 97e8227e6c96..224336dffabf 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { description = "Manage your charm account on the CLI"; diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index c17ed9b3af5e..4e03059a8cc4 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -24,11 +24,11 @@ buildGoModule rec { # The other variables are set so that the output of dstask version shows the # git ref and the release version from github. # Ref - buildFlagsArray = [ '' - -ldflags=-w -s - -X "github.com/naggie/dstask.VERSION=${version}" - -X "github.com/naggie/dstask.GIT_COMMIT=v${version}" - '' ]; + ldflags = [ + "-w" "-s" + "-X github.com/naggie/dstask.VERSION=${version}" + "-X github.com/naggie/dstask.GIT_COMMIT=v${version}" + ]; subPackages = [ "cmd/dstask.go" ]; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index cd40b381cb74..052a7905f5b3 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -23,8 +23,8 @@ buildGoModule rec { buildInputs = [ sqlite ]; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}" + ldflags = [ + "-s" "-w" "-X github.com/manojkarthick/expenses/cmd.Version=${version}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 867dee5bcd30..30ae2d9be0f6 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index ebc1144e1576..617d84e43db6 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = "-ldflags=-X main.Version=${version}"; + ldflags = [ "-X main.Version=${version}" ]; meta = with lib; { description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index d82537beac85..4101ac9f3fd0 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -22,11 +22,10 @@ buildGoModule rec { packr ''; - buildFlagsArray = + ldflags = let package_url = "github.com/argoproj/argo-cd/v2/common"; in [ - "-ldflags=" - "-s -w" + "-s" "-w" "-X ${package_url}.version=${version}" "-X ${package_url}.buildDate=unknown" "-X ${package_url}.gitCommit=${commit}" diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 287640bf5a54..619b2834e5c6 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -25,8 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a4699bacba9c..729f7e472280 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { subPackages = [ "cmd/flux" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 003f6722d1da..4fe8bea90717 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "cmd/fluxctl" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' for shell in bash fish zsh; do diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index af2771f98587..6d70b405e168 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; postInstall = '' wrapProgram $out/bin/helmfile \ diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index f66e5f88e729..bf4183268e53 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -22,10 +22,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X github.com/xetys/hetzner-kube/cmd.version=${version} - ''; + ldflags = [ + "-X github.com/xetys/hetzner-kube/cmd.version=${version}" + ]; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 747523103af8..e4ef8d1aa8d7 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -17,14 +17,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; # Bundle release metadata - buildFlagsArray = let + ldflags = let attrs = [ "istio.io/pkg/version.buildVersion=${version}" "istio.io/pkg/version.buildStatus=Nix" "istio.io/pkg/version.buildTag=${version}" "istio.io/pkg/version.buildHub=docker.io/istio" ]; - in ["-ldflags=-s -w ${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; + in ["-s" "-w" "${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; subPackages = [ "istioctl/cmd/istioctl" ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index d7fc1cb22429..d9b04aaf7fc6 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -19,13 +19,12 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/jenkins-x/jx/pkg/version.Version=${version} - -X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev} - -X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean - ''; + ldflags = [ + "-s -w" + "-X github.com/jenkins-x/jx/pkg/version.Version=${version}" + "-X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev}" + "-X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean" + ]; postInstall = '' for shell in bash zsh; do diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 3c7b232cc214..871ab8b93456 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -11,12 +11,11 @@ buildGoModule rec { sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/derailed/k9s/cmd.version=${version} - -X github.com/derailed/k9s/cmd.commit=${src.rev} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/derailed/k9s/cmd.version=${version}" + "-X github.com/derailed/k9s/cmd.commit=${src.rev}" + ]; vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8="; diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index be91a64b74f9..3e6475ca6586 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/GoogleContainerTools/kpt/run.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/GoogleContainerTools/kpt/run.version=${version}" ]; meta = with lib; { description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files"; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index f8bec6e0b109..d5f04c14d572 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -13,11 +13,10 @@ buildGoModule rec { vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM="; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - -X main.goVersion=${lib.getVersion go} - ''; + ldflags = [ + "-X main.version=${version}" + "-X main.goVersion=${lib.getVersion go}" + ]; meta = with lib; { description = "A Kubernetes credential plugin implementing Azure authentication"; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 15670188f14e..13fc7a9605e4 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/kubeseal" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; meta = with lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index fe92a5ddf9f2..64f13ad6b60f 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -16,10 +16,10 @@ buildGoModule rec { subPackages = [ "cmd/kubectl-kuttl" ]; - buildFlagsArray = '' - -ldflags=-s -w - -X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}" + ]; meta = with lib; { description = "The KUbernetes Test TooL (KUTTL) provides a declarative approach to testing production-grade Kubernetes operators"; diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index 9e91589478b4..3a8a26af3ff9 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -11,11 +11,11 @@ buildGoModule rec { sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs="; }; - buildFlagsArray = let + ldflags = let multus = "gopkg.in/intel/multus-cni.v3/pkg/multus"; commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7"; in [ - "-ldflags=-s -w -X '${multus}.version=v${version}' -X '${multus}.commit=${commit}'" + "-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}" ]; preInstall = '' diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 3751ad25c784..1a7c56bd18b4 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -11,11 +11,10 @@ buildGoModule rec { sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/derailed/popeye/cmd.version=${version} - -X github.com/derailed/popeye/cmd.commit=${version} + ldflags = '' + "-s" "-w" + "-X github.com/derailed/popeye/cmd.version=${version}" + "-X github.com/derailed/popeye/cmd.commit=${version}" ''; vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 6f8e5640539d..3c00bc1eedbe 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -15,12 +15,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/splunk/qbec/internal/commands.version=${version} - -X github.com/splunk/qbec/internal/commands.commit=${src.rev} - -X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go} + ldflags = '' + "-s" "-w" + "-X github.com/splunk/qbec/internal/commands.version=${version}" + "-X github.com/splunk/qbec/internal/commands.commit=${src.rev}" + "-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}" ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index fc30699f225f..b82b6cf610de 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -7,14 +7,14 @@ buildGoModule rec { pname = "sonobuoy"; version = "0.53.2"; # Do not forget to update `rev` above - buildFlagsArray = + ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; - in '' - -ldflags= - -s -X ${t}/pkg/buildinfo.Version=v${version} - -X ${t}/pkg/buildinfo.GitSHA=${rev} - -X ${t}/pkg/buildDate=unknown - ''; + in [ + "-s" + "-X ${t}/pkg/buildinfo.Version=v${version}" + "-X ${t}/pkg/buildinfo.GitSHA=${rev}" + "-X ${t}/pkg/buildDate=unknown" + ]; src = fetchFromGitHub { sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY="; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 602ac8ae5368..74508a73227d 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = - [ "-ldflags=-s -w -X github.com/stern/stern/cmd.version=${version}" ]; + ldflags = + [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ]; postInstall = let stern = if isCrossBuild then buildPackages.stern else "$out"; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index bf11b35d71aa..6aee37c57ed4 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/tk" ]; - buildFlagsArray = [ "-ldflags=-s -w -extldflags \"-static\" -X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; + ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index d717bd42652b..b4e44a05d82e 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/tilt" ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 80d02eb19ed2..2c7300573c74 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -14,12 +14,11 @@ buildGoModule rec { sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean + ldflags = '' + "-s" "-w" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" ''; vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU="; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 494a40c6bfe0..d767a381ea49 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 025c58a9383d..4c0f9c1a0fb3 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "NextDNS DNS/53 to DoH Proxy"; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index aa5175fca9ed..ae2dee21fb26 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { vendorSha256 = "18z3vwcwkyj6hcvl35qmj034237h9l18dvcbx1hxry7qdwv807c9"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { updateScript = genericUpdater { diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 74f644e23ad2..6a765f8e8b52 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Quickly clone an entire org/users repositories into one directory"; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 28020f85369d..b2f5346bbfce 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -15,10 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - ''; + ldflags = [ + "-X=main.Version=${version}" + ]; postInstall = '' install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index a90390ddd3b3..c08e68cc28a1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -16,12 +16,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X github.com/MichaelMure/git-bug/commands.GitCommit=${rev} - -X github.com/MichaelMure/git-bug/commands.GitLastTag=${version} - -X github.com/MichaelMure/git-bug/commands.GitExactTag=${version} - ''; + ldflags = [ + "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}" + "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" + "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" + ]; postInstall = '' install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug" diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix index 19de4b28bfea..143ab6cac9db 100644 --- a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-jIq+oacyT71m78iMZwWOBsBVAY/WxgyH9zRr8GiMGTU="; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; subPackages = [ "cmd/git-chglog" ]; @@ -24,4 +24,3 @@ buildGoModule rec { maintainers = with maintainers; [ ldenefle ]; }; } - diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index a373d3dbf897..63f42963089a 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ffd6ff7d16c8..46caac00c4fa 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorSha256 = "sha256-gTObI0pmRUX6Eh5FVdt+5LbckyBuFq1Ly4oPZztazHQ="; buildInputs = [ git ]; - buildFlagsArray = "-ldflags=-X main.Version=${version}"; + ldflags = [ "-X main.Version=${version}" ]; doCheck = false; meta = with lib; { diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 5b0ddf717362..7c0894ee06d8 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; meta = with lib; { homepage = "https://github.com/vishen/go-chromecast"; diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix index c985632b9ebc..ce12fb8f387b 100644 --- a/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k"; }; - buildFlagsArray = [ - "-ldflags=-X github.com/containerd/containerd/version.Version=${version}" + ldflags = [ + "-X github.com/containerd/containerd/version.Version=${version}" ]; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 4276f71a409b..8cb470d2fa4c 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 84c39dba9000..8fd4cf0a35ae 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -19,8 +19,8 @@ let doCheck = false; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown" + ldflags = [ + "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; meta = with lib; { diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index d2de1bcc063b..00852a4c90f1 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.BazeliskVersion=${version}" ]; meta = with lib; { description = "A user-friendly launcher for Bazel"; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index e181917c417a..4ff5c39fac67 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { excludedPackages = [ "generatetables" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.buildVersion=${version}" "-X main.buildScmRevision=${src.rev}" ]; meta = with lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index d8ccd3ad2fe0..cf719f2c0ca1 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X github.com/magefile/mage/mage.commitHash=v${version}" "-X github.com/magefile/mage/mage.gitTag=v${version}" "-X github.com/magefile/mage/mage.timestamp=1970-01-01T00:00:00Z" diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 0f31f7b1b37d..a3e1b093e7b0 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/pack" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ]; postInstall = '' installShellCompletion --bash --name pack.bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash) diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index ccb011360e5b..094aa5fe026c 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -19,9 +19,9 @@ buildGoModule rec { subPackages = [ "internal" ]; - buildFlagsArray = '' - -ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version} - ''; + ldflags = [ + "-X github.com/coreos/butane/internal/version.Raw=v${version}" + ]; postInstall = '' mv $out/bin/{internal,butane} diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index aa6472494733..2979ae9f5d1c 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80="; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; doCheck = false; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 1ba8cb0a9d3d..74e823ad9b84 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index 73aefdd0cda7..4604cca7cfc8 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/bk" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; meta = with lib; { description = "A command line interface for Buildkite"; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 741bcfbe5a87..0b000b0f4d83 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { subPackages = [ "fly" ]; - buildFlagsArray = '' - -ldflags= - -X github.com/concourse/concourse.Version=${version} - ''; + ldflags = [ + "-X github.com/concourse/concourse.Version=${version}" + ]; postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 5170297a4330..f177ced3092d 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -16,8 +16,8 @@ buildGoModule rec { subPackages = [ "cmd/cue" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X cuelang.org/go/cmd/cue/cmd.version=${version}" + ldflags = [ + "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; meta = { diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 3b04c0fb8992..581b0db3b35a 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A tool for exploring each layer in a docker image"; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index aa1de8acd583..53da9c1fb4ef 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -13,12 +13,11 @@ buildGoModule rec { vendorSha256 = "sha256-gydhh/EMSuE/beo+A2CRDdDnQGT6DMjMwthylT339I4="; - buildFlagsArray = '' - -ldflags= - -s -w - -X main.Version=v${version} - -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version} - ''; + ldflags = [ + "-s" "-w" + "-X main.Version=v${version}" + "-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}" + ]; BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork"; preBuild = '' diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index a87b20402d95..0151a6fb38ba 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s="; - buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; + ldflags = [ "-s" "-w" "-X info.Version=${version}" ]; subPackages = [ "cmd/fission-cli" ]; diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix index 791b8b7aa916..3531926e4bc4 100644 --- a/pkgs/development/tools/github/bump/default.nix +++ b/pkgs/development/tools/github/bump/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X main.buildVersion=${version} -X main.buildCommit=${version} -X main.buildDate=1970-01-01" + ldflags = [ + "-X main.buildVersion=${version}" "-X main.buildCommit=${version}" "-X main.buildDate=1970-01-01" ]; meta = with lib; { @@ -26,4 +26,3 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; }; } - diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index 60f53e1e253c..1ec03ed2a69d 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-l+ngvmTb9yVgQYT+OeaVd0zz/xNZeXWrjMpVkMpbQIw="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; vendorSha256 = "sha256-hn222ifKRYbASAHBJyMTCDwhykf2Jg9IqIUlK/GabJA="; diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 2147ed00c77c..20c2a2b9e991 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/swagger" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version} -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version}" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; meta = with lib; { description = "Golang implementation of Swagger 2.0, representation of your RESTful API"; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index c1cff6562f23..4c7d20bb74b9 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/task" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; postInstall = '' diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 45602a053522..10f853a65237 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -19,8 +19,7 @@ buildGoModule rec { rm net/net_test.go ''; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 9264ac27fa2a..9f9bb882de08 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitTag=${src.rev}" "-X main.BuildDate=unknown" ]; meta = with lib; { homepage = "https://github.com/securego/gosec"; @@ -27,4 +27,3 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; }; } - diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 1e63b07d03ed..161aba5d68f6 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; subPackages = [ "." ]; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index fe3dfb9a34c8..f77e3832fe78 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' for shell in bash zsh; do diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/development/tools/jsonnet-bundler/default.nix index 4286a454ff02..87da63f0f354 100644 --- a/pkgs/development/tools/jsonnet-bundler/default.nix +++ b/pkgs/development/tools/jsonnet-bundler/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd/jb" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "A jsonnet package manager"; diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index 639e72edb8c1..df619086861d 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "0jzry4znq4kcl6i9jcawilyjm8av1zxbml6nlr96v8x47ijxav5j"; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/rikatz/kubepug/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}" + ]; subPackages = [ "cmd/kubepug.go" ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index cae13140b04f..36c425aef18f 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -6,12 +6,12 @@ buildGoModule rec { # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; - buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in - '' - -ldflags= - -s -X ${t}.version=${version} - -X ${t}.gitCommit=${rev} - ''; + ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in + [ + "-s" + "-X ${t}.version=${version}" + "-X ${t}.gitCommit=${rev}" + ]; src = fetchFromGitHub { owner = "kubernetes-sigs"; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index c7e3a1fabdc9..21d9f9903d26 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = null; subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; + ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; meta = with lib; { description = "Simple terminal UI for git commands"; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 890229ebc815..6ce86c44d7f9 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version} -X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev} -X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; + ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; preBuild = '' substituteInPlace data/data.go \ diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/development/tools/misc/k2tf/default.nix index 904256ee66a9..bc24d4563a5c 100644 --- a/pkgs/development/tools/misc/k2tf/default.nix +++ b/pkgs/development/tools/misc/k2tf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1c2mwhrj0xapc661z1nb6am4qq3rd1pvbvjaxikjyx95n0gs8gjk"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; meta = with lib; { description = "Kubernetes YAML to Terraform HCL converter"; diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 0f110ae0b082..bfd551570090 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags=-s -w -X main.Version=v${version} - ''; + ldflags = [ + "-s" "-w" "-X main.Version=v${version}" + ]; meta = with lib; { homepage = "https://github.com/FiloSottile/mkcert"; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 075698ac43dc..b39ab68f06c0 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/reviewdog" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; meta = with lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 1d33f5929bbf..c10543e17689 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 18d5cae542cc..d9987137ce65 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.commitHash=${src.rev} -X main.date=19700101T000000" + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commitHash=${src.rev}" "-X main.date=19700101T000000" ]; vendorSha256 = null; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 2490c3a3ce27..dcacd997d7de 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -15,13 +15,12 @@ buildGoModule rec { subPackages = ["cmd/skaffold"]; - buildFlagsArray = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in '' - -ldflags= - -s -w - -X ${t}/version.version=v${version} - -X ${t}/version.gitCommit=${src.rev} - -X ${t}/version.buildDate=unknown - ''; + ldflags = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in [ + "-s" "-w" + "-X ${t}/version.version=v${version}" + "-X ${t}/version.gitCommit=${src.rev}" + "-X ${t}/version.buildDate=unknown" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/tf2pulumi/default.nix b/pkgs/development/tools/tf2pulumi/default.nix index 8a1a03c16359..6f195d86849a 100644 --- a/pkgs/development/tools/tf2pulumi/default.nix +++ b/pkgs/development/tools/tf2pulumi/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-wsgNrDnFXbpanEULEjf6OxOeMYmWzjE7vpVUB/UFNp8="; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/pulumi/tf2pulumi/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/pulumi/tf2pulumi/version.Version=${src.rev}" + ]; subPackages = [ "." ]; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 303f325dec18..017434134ca1 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "Convert YAML <=> TOML <=> JSON <=> HCL"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 71db0f89cd73..c222d5232bac 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; + ldflags = [ "-s" "-w" "-X github.com/superfly/flyctl/flyctl.Version=${version}" "-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}" "-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000" "-X github.com/superfly/flyctl/flyctl.Environment=production" ]; meta = with lib; { description = "Command line tools for fly.io services"; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index ac040d0a9156..31c6ba9253bb 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "Minifiers for web formats"; diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index 6b7e38891619..d50e00f984e5 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz"; - buildFlagsArray = "-ldflags=-X main.versionString=v${version}"; + ldflags = [ "-X main.versionString=v${version}" ]; meta = with lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git"; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 8d75b89d0d8a..b10f8919af7a 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -33,12 +33,11 @@ buildGoModule rec { buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; - buildFlagsArray = '' - -ldflags= - -X github.com/trezor/blockbook/common.version=${version} - -X github.com/trezor/blockbook/common.gitcommit=${commit} - -X github.com/trezor/blockbook/common.buildDate=unknown - ''; + ldflags = [ + "-X github.com/trezor/blockbook/common.version=${version}" + "-X github.com/trezor/blockbook/common.gitcommit=${commit}" + "-X github.com/trezor/blockbook/common.buildDate=unknown" + ]; preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 9d577047ee21..0f4282699ee2 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { "cmd/dex" ]; - buildFlagsArray = [ - "-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}" + ldflags = [ + "-w" "-s" "-X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index 4338f1bcaed8..a65d4bb38234 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -13,11 +13,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} - -s - -w - '']; + ldflags = [ + "-X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version}" + "-s" + "-w" + ]; postInstall = '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index ea9628417d7d..7b28200b284e 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { "cmd/pomerium-cli" ]; - buildFlagsArray = let + ldflags = let # Set a variety of useful meta variables for stamping the build with. setVars = { Version = "v${version}"; @@ -35,7 +35,7 @@ buildGoModule rec { }; varFlags = concatStringsSep " " (mapAttrsToList (name: value: "-X github.com/pomerium/pomerium/internal/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags}" + "${varFlags}" ]; nativeBuildInputs = [ diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index bc6071bff0d2..c5fa1b5e670a 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/servers/matrix-corporal/default.nix index e489e774be5e..ae455168778f 100644 --- a/pkgs/servers/matrix-corporal/default.nix +++ b/pkgs/servers/matrix-corporal/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-u1ppwy+t2ewAH0/+R6e0Ja5A3PQG/lUy2b6kgcMVj8E="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}" + ldflags = [ + "-s" "-w" "-X main.GitCommit=${version}" "-X main.GitBranch=${version}" "-X main.GitState=nixpkgs" "-X main.GitSummary=${version}" "-X main.Version=${version}" ]; vendorSha256 = "sha256-YmUiGsg2UZfV6SHEPwnbmWPhGQ5teV+we9MBaJyrJr4="; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index f66468b240f8..fe61e5fc8b84 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -22,9 +22,9 @@ in buildGoModule { go test $(go list ./... | grep -v client) ''; # skip client tests as they require network access - buildFlagsArray = '' - -ldflags=-s -w -X miniflux.app/version.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X miniflux.app/version.Version=${version}" + ]; postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 0a09293226ed..75bc9f8e6088 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgpd" ]; diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index f5d4f6ca88f3..5a2fcc4a8976 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC"; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 8501aa5e02cd..2db3cd084470 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-FMO+wNmjFFD9+/9mhNcyZftk8ryhwFXDZeEy/h5EMWc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; postInstall = '' mv $out/bin/{cmd,cadvisor} diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d6e3accdf41d..5f70bf702a6b 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -11,10 +11,9 @@ buildGoModule rec { sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g="; }; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; vendorSha256 = null; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 56f8b30fbb44..996637f51b9e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -43,9 +43,9 @@ buildGoModule rec { rm -r scripts/go ''; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' tar -xvf $srcStatic diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index d8987f9e5adc..21776c352af1 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -19,11 +19,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X=main.version=${version} - -X=main.gitcommit=v${version} - ''; + ldflags = [ + "-X=main.version=${version}" + "-X=main.gitcommit=v${version}" + ]; postInstall = '' wrapProgram $out/bin/mackerel-agent \ diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index c0a7e1129a14..e5a3179a86c0 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -21,8 +21,8 @@ buildGoModule rec { go generate -x ./internal/vm/ ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version}" + ldflags = [ + "-X main.Version=${version}" ]; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 5e7d386d7e1c..a91a267bb210 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -16,14 +16,13 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=19700101-00:00:00 - ''; + ldflags = [ + "-s" "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) artifactory; }; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index e31800f43c0e..894fbd1ab3f1 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,14 +14,14 @@ buildGoModule rec { vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -s -w -X ${t}.Version=${version} - -X ${t}.Revision=${rev} - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-s" "-w" + "-X ${t}.Version=${version}" + "-X ${t}.Revision=${rev}" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; # skips tests with external dependencies, e.g. on mysqld checkFlags = [ "-short" ]; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 0727616de311..546bfbb7e28c 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-DFDTYT7UK1cYwGeCgeQcJmrCoqGPDzicusRPPUbH0Gs="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/timescale/promscale/pkg/version.Version=${version}" "-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon doInstallCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index a2636d9f7147..d209f52ef585 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -13,11 +13,10 @@ buildGoModule rec { vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; - buildFlagsArray = '' - -ldflags= - -X main.BuildVersion=${version} - -X main.BuildCommitSha=unknown - -X main.BuildDate=unknown + ldflags = '' + "-X main.BuildVersion=${version}" + "-X main.BuildCommitSha=unknown" + "-X main.BuildDate=unknown" ''; # needs a redis server diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b998e1d24c6c..8b1cbb962ade 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "smokeping_prober"; version = "${baseVersion}-g${commit}"; - buildFlagsArray = let + ldflags = let setVars = { Version = baseVersion; Revision = commit; @@ -17,7 +17,7 @@ buildGoModule rec { }; varFlags = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-X github.com/prometheus/common/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags} -s -w" + "${varFlags}" "-s" "-w" ]; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 881d677b3e59..23294dfb88c4 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -20,13 +20,12 @@ let doCheck = false; - buildFlagsArray = let + ldflags = let versionPkg = "github.com/sensu/sensu-go/version"; - in '' - -ldflags= - -X ${versionPkg}.Version=${version} - -X ${versionPkg}.BuildSHA=${shortRev} - ''; + in [ + "-X ${versionPkg}.Version=${version}" + "-X ${versionPkg}.BuildSHA=${shortRev}" + ]; meta = { homepage = "https://sensu.io"; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 03811314f456..fef179945b38 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -16,14 +16,13 @@ buildGoModule rec { subPackages = "cmd/thanos"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 992a92a2733c..745cfdd34595 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { vendorSha256 = "sha256-LOBkdyfsw7ua6TsLglO5jdR9NWo5Df8rnQ8MH+eIz4g="; - buildFlagsArray = '' - -ldflags=-w -s - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=unknown - -X github.com/prometheus/common/version.Revision=${src.rev} - -X github.com/prometheus/common/version.Version=${version}-0 - ''; + ldflags = [ + "-w" "-s" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=unknown" + "-X github.com/prometheus/common/version.Revision=${src.rev}" + "-X github.com/prometheus/common/version.Version=${version}-0" + ]; meta = with lib; { description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index df3e116ab74a..4f10beda85cc 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = "test"; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 12ad70375121..4ef8fe9575f2 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index a5aee60d8bb1..dfc1756b3746 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile - buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); + ldflags = [ "-X main.VERSION=${version}" ]; meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix index fd31d728a3b2..9a4fd071338e 100644 --- a/pkgs/servers/pg_featureserv/default.nix +++ b/pkgs/servers/pg_featureserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; meta = with lib; { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix index b7f1fa0c1c9d..a380af0311b3 100644 --- a/pkgs/servers/pg_tileserv/default.nix +++ b/pkgs/servers/pg_tileserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; - buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ]; doCheck = false; diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 0d25b4267838..25fb5268c146 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -27,8 +27,8 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=-s -w -X main.revision=${version}" + ldflags = [ + "-s" "-w" "-X main.revision=${version}" ]; installPhase = '' diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 58b565851236..c6897167cefa 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -19,10 +19,10 @@ buildGoModule rec { # Tests need docker doCheck = false; - buildFlagsArray = [ - # In the future, we might need to switch to `main.Version`, considering: - # https://github.com/aler9/rtsp-simple-server/issues/503 - "-ldflags=-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" + # In the future, we might need to switch to `main.Version`, considering: + # https://github.com/aler9/rtsp-simple-server/issues/503 + ldflags = [ + "-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" ]; meta = with lib; { diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 6ef08992f963..0916c9b25b59 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { excludedPackages = [ "website" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/elves/elvish/pkg/buildinfo.Version==${version} -X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ]; + ldflags = [ "-s" "-w" "-X github.com/elves/elvish/pkg/buildinfo.Version==${version}" "-X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ]; src = fetchFromGitHub { owner = "elves"; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index d5c197d5da6e..1db4321259df 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "The fastest shell plugin manager"; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index c17160152817..afc493c3b6a1 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -34,10 +34,9 @@ buildGoModule rec { subPackages = [ "." ]; # set the version. see: aws-vault's Makefile - buildFlagsArray = '' - -ldflags= - -X main.Version=v${version} - ''; + ldflags = [ + "-X main.Version=v${version}" + ]; doInstallCheck = true; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 0ff42ca20fcf..7d1935415ab7 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-1u1mzANLlWduAQF1GUX7BJSyYlSZwNQISqKwbyRlGog="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; + ldflags = [ "-s" "-w" "-X github.com/jckuester/awsweeper/internal.version=${version}" "-X github.com/jckuester/awsweeper/internal.commit=${src.rev}" "-X github.com/jckuester/awsweeper/internal.date=unknown" ]; doCheck = false; diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 524970925ddc..d69e96a45551 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; meta = with lib; { description = diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 0c71850f849e..9cfb23ab9daa 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -28,8 +28,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X code.cloudfoundry.org/credhub-cli/version.Version=${version}" diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 6e20a32cf21b..98e68c10fb9d 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { runVend = true; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}" + ]; meta = with lib; { description = "A simple CLI to manage your Foundries Factory "; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index dd35da451ad8..6ee5f3f880bb 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X main.Version=v${version} -s -w - '']; + ldflags = [ + "-X main.Version=v${version}" "-s" "-w" + ]; meta = with lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 78f4b8cd2cb2..685679467549 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/lego" ]; - buildFlagsArray = [ - "-ldflags=-X main.version=${version}" + ldflags = [ + "-X main.version=${version}" ]; meta = with lib; { diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 3ed29af25fdc..6c4785c81c59 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = true; - buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ]; + ldflags = [ "-w" "-s" "-X main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/bwhaley/ssmsh"; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 32f051f5ad91..ad113ed615ef 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -17,11 +17,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X github.com/kopia/kopia/repo.BuildVersion=${version} - -X github.com/kopia/kopia/repo.BuildInfo=${src.rev} - ''; + ldflags = [ + "-X github.com/kopia/kopia/repo.BuildVersion=${version}" + "-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}" + ]; meta = with lib; { homepage = "https://kopia.io"; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 4d901d688908..29750531db20 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -37,12 +37,11 @@ buildGoModule rec { propagatedBuildInputs = [ libfido2 ]; - buildFlagsArray = '' - -ldflags= - -X main.GitVersion=${version} - -X main.GitVersionFuse=[vendored] - -X main.BuildDate=unknown - ''; + ldflags = [ + "-X main.GitVersion=${version}" + "-X main.GitVersionFuse=[vendored]" + "-X main.BuildDate=unknown" + ]; subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index ff9e7a001333..a60a84475b06 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 076eb33fbb19..e95edb08b84a 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9"; - buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 35fc8343b5a1..62c184d6be59 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -13,8 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk="; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 36a7055f875c..05a93b44b94e 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Commit=${version} -X main.BuildDate=1970-01-01" + ldflags = [ + "-X main.Version=${version}" "-X main.Commit=${version}" "-X main.BuildDate=1970-01-01" ]; meta = with lib; { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 8aa8e9a663b7..b135ed061dee 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.gVersion=r${version}" ]; + ldflags = [ "-s" "-w" "-X main.gVersion=r${version}" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index 26ae9f4f16db..a44ae344bf59 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' ln -s $out/bin/microplane $out/bin/mp diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index c5ca7e8c911b..ac1c0bd356d2 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd" ]; - buildFlagsArray = [ "-ldflags=-w -s -X main.gitTag=${src.rev} -X main.gitCommit=${src.rev} -X main.gitBranch=master" ]; + ldflags = [ "-w" "-s" "-X main.gitTag=${src.rev}" "-X main.gitCommit=${src.rev}" "-X main.gitBranch=master" ]; postInstall = '' mv $out/bin/cmd $out/bin/pgcenter diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 955444ff8c87..c5a240f714ea 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://pgmetrics.io/"; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 52c83abdf688..6d91a54e56dc 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { installManPage pistol.1 ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant"; diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index 086a05c90169..8ca102444a9d 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; runVend = true; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.toolVersion=${tag}" diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index 13a3df4d6b94..416dd4bfcc13 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = null; # make sure version gets set at compile time - buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.vshVersion=v${version}" ]; meta = with lib; { description = "HashiCorp Vault interactive shell"; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 527ecfbf98d3..6280b923ec0c 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 5d82a549e889..9df5625c2355 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; # tests require access to the network doCheck = false; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 61e529dc8729..221a6c280b26 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 98925489e548..6ba0752222ac 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgp" ]; diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index a9fb7c823f9e..1fa47ba917fc 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/grpcui" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index 734a751daf09..e6cd09dc2fd7 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 06615ae25fae..2aec2fb50c76 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - buildFlagsArray = [ "-ldflags=" "-X main.Build=${version}" ]; + ldflags = [ "-X main.Build=${version}" ]; meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index e6b1c823eb88..a75936a15204 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X main.tag=v${version}" + ldflags = [ + "-X main.tag=v${version}" ]; meta = with lib; { diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 2cbe5fd91849..e7ae903e8682 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" + ]; subPackages = [ "cmd/telepresence" ]; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 7b9a3c42d606..d35e70ad52e4 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -22,10 +22,9 @@ buildGoModule rec { wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]} ''; - buildFlagsArray = '' - -ldflags= - -X github.com/gcla/termshark.Version=${version} - ''; + ldflags = [ + "-X github.com/gcla/termshark.Version=${version}" + ]; meta = with lib; { homepage = "https://termshark.io/"; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 506869238e57..874205f592bd 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -22,12 +22,11 @@ buildGoModule rec { subPackages = [ "cmd/yggdrasil" "cmd/yggdrasilctl" ]; - buildFlagsArray = '' - -ldflags= - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version} - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname} - -s -w - ''; + ldflags = [ + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" + "-s" "-w" + ]; passthru.tests.basic = nixosTests.yggdrasil; diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix index 20e3b555fd2f..847c8a726d0f 100644 --- a/pkgs/tools/package-management/holo-build/default.nix +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { subPackages = [ "src/holo-build" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; postBuild = '' make build/man/holo-build.8 VERSION=${version} diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 56d824059f53..e7b6b3adf1f2 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -15,11 +15,9 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper go-bindata ]; - buildFlagsArray = '' - -ldflags= - -X - main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; postPatch = '' go-bindata -pkg assets -o assets/assets.go data/ diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 69d2f0d29f78..9331bdba6843 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A simple deb and rpm packager written in Go"; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index d9f4f4a01735..476d248c4343 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { deleteVendor = true; vendorSha256 = "+Z8sENIMWXP29Piwb/W6i7UdNXVq6ZnO7AZbSaUYCME="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; subPackages = [ "cmd/aws-iam-authenticator" ]; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 6ef07c2c355b..1e95d1d6f2f9 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -34,11 +34,10 @@ buildGoModule rec { popd ''; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/cloudflare/cfssl/cli/version.version=v${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/cloudflare/cfssl/cli/version.version=v${version}" + ]; meta = with lib; { homepage = "https://cfssl.org/"; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index ad49251aae86..18ca909cd5e0 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8="; - buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; + ldflags = [ "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" ]; postInstall = '' mv $out/bin/cli $out/bin/doppler diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 358acf376b48..9e56b4c1a4bb 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -30,7 +30,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; wrapperPath = lib.makeBinPath ( [ diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index fb0da2c1a093..0b15e9b02353 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -22,11 +22,9 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - preBuild = '' - buildFlagsArray+=( - "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" - ) - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; postFixup = '' wrapProgram $out/bin/git-credential-gopass --prefix PATH : "${lib.makeBinPath [ gopass ]}" diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index e060adbf5bcf..c138bde2cc3c 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -23,11 +23,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - preBuild = '' - buildFlagsArray+=( - "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" - ) - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; postFixup = '' wrapProgram $out/bin/gopass-jsonapi --prefix PATH : "${lib.makeBinPath [ gopass ]}" diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 8ee2c9a4c4e4..55862623f494 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -20,9 +20,9 @@ buildGoModule rec { subPackages = [ "." "cmd/saml2aws" ]; - buildFlagsArray = '' - -ldflags=-X main.Version=${version} - ''; + ldflags = [ + "-X main.Version=${version}" + ]; meta = with lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 63291946e38c..9b645dcba927 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { vendorSha256 = "sha256-cFuLW0qkI/l/TvYwQZA2bLlWYjs1hdbQJ5jU7xiuFZI="; - buildFlagsArray = [ "-ldflags=-buildid=" ]; + ldflags = [ "-buildid=" ]; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/tools/security/subjs/default.nix index 1b7986c0a77a..65d3f18be794 100644 --- a/pkgs/tools/security/subjs/default.nix +++ b/pkgs/tools/security/subjs/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "1y01k8pvv7y9zb15wbk068cvkx0g83484jak2dvcvghqcf5j1fr1"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; meta = with lib; { description = "Fetcher for Javascript files"; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 45cbca172fa7..36dfd02c33f6 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.build=v${version}" ]; meta = with lib; { description = "Top-like interface for container metrics"; diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix index 3c366d56fca9..fb3a293a80fd 100644 --- a/pkgs/tools/system/hostctl/default.nix +++ b/pkgs/tools/system/hostctl/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -33,4 +33,3 @@ buildGoModule rec { maintainers = with maintainers; [ blaggacao ]; }; } - diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index be6e8f267637..53ab6d6982d6 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' mkdir -p $out/lib/netdata/conf.d diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 04b08488ee91..653af8b79692 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A tool for syncing your markdown documentation with Atlassian Confluence pages"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index a665e35fdd55..d5c64aa9f7b2 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { cp -r styles $data/share/vale ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://docs.errata.ai/vale/about"; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index cd8a4c36a920..9c67b5462bbf 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { }; vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA="; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; # Tests require a large variety of tools and resources to run including From 3360a376cb905ac40e77d5424089d4893e9cd157 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 23 Aug 2021 14:55:51 +1000 Subject: [PATCH 42/43] buildGoModule: warn if buildFlagsArray is used --- pkgs/applications/networking/cluster/popeye/default.nix | 4 ++-- pkgs/applications/networking/cluster/qbec/default.nix | 4 ++-- pkgs/applications/networking/cluster/velero/default.nix | 4 ++-- pkgs/development/go-modules/generic/default.nix | 7 ++++--- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 1a7c56bd18b4..910317bd9673 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -11,11 +11,11 @@ buildGoModule rec { sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; }; - ldflags = '' + ldflags = [ "-s" "-w" "-X github.com/derailed/popeye/cmd.version=${version}" "-X github.com/derailed/popeye/cmd.commit=${version}" - ''; + ]; vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 3c00bc1eedbe..f5fb6ee234c5 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -15,12 +15,12 @@ buildGoModule rec { doCheck = false; - ldflags = '' + ldflags = [ "-s" "-w" "-X github.com/splunk/qbec/internal/commands.version=${version}" "-X github.com/splunk/qbec/internal/commands.commit=${src.rev}" "-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}" - ''; + ]; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 2c7300573c74..76babadc023c 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -14,12 +14,12 @@ buildGoModule rec { sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk="; }; - ldflags = '' + ldflags = [ "-s" "-w" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" - ''; + ]; vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU="; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index a7852bcc7e5d..3b645f9ce8b9 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -46,8 +46,9 @@ # Not needed with buildGoModule , goPackagePath ? "" -# needed for buildFlags warning +# needed for buildFlags{,Array} warning , buildFlags ? "" +, buildFlagsArray ? "" , ... }@args': @@ -271,6 +272,6 @@ let }; }); in -lib.warnIf (buildFlags != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" +lib.warnIf (buildFlags != "" || buildFlagsArray != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" package diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index d209f52ef585..e87c6354ae55 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -13,11 +13,11 @@ buildGoModule rec { vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; - ldflags = '' + ldflags = [ "-X main.BuildVersion=${version}" "-X main.BuildCommitSha=unknown" "-X main.BuildDate=unknown" - ''; + ]; # needs a redis server doCheck = false; From 6e758d0e819bffd7fb14b72ea40977e0a8216ab4 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Wed, 25 Aug 2021 23:42:21 +0200 Subject: [PATCH 43/43] fstar: 0.9.6.0 -> 2021.07.31 --- pkgs/development/compilers/fstar/default.nix | 54 +++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 7abdf132b51e..fec71dc46fdc 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,36 +1,66 @@ { lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: +let + # FStar requires sedlex < 2.4 + # see https://github.com/FStarLang/FStar/issues/2343 + sedlex-2_3 = ocamlPackages.sedlex_2.overrideAttrs (_: rec { + pname = "sedlex"; + version = "2.3"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = "sedlex"; + rev = "v${version}"; + sha256 = "WXUXUuIaBUrFPQOKtZ7dgDZYdpEVnoJck0dkrCi8g0c="; + }; + }); +in + stdenv.mkDerivation rec { pname = "fstar"; - version = "0.9.6.0"; + version = "2021.07.31"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb"; + sha256 = "KZTmphpt8nYpOd8EReAZ6iIkS4uY3ZziKQ3A70BL/90="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = with ocamlPackages; [ - z3 ocaml findlib batteries menhir menhirLib stdint - zarith camlp4 yojson pprint - ulex ocaml-migrate-parsetree process ppx_deriving ppx_deriving_yojson ocamlbuild - ]; + buildInputs = [ + z3 + ] ++ (with ocamlPackages; [ + ocaml + findlib + ocamlbuild + batteries + zarith + stdint + yojson + fileutils + menhir + menhirLib + pprint + sedlex-2_3 + ppxlib + ppx_deriving + ppx_deriving_yojson + process + ]); makeFlags = [ "PREFIX=$(out)" ]; - preBuild = '' - patchShebangs src/tools - patchShebangs bin + buildFlags = [ "libs" ]; + + postPatch = '' + patchShebangs ulib/gen_mllib.sh + substituteInPlace src/ocaml-output/Makefile --replace '$(COMMIT)' 'v${version}' ''; - buildFlags = [ "-C" "src/ocaml-output" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib ''; - installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" installShellCompletion --bash .completion/bash/fstar.exe.bash diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9212b97ec9ce..72ee7e00ec60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11519,9 +11519,7 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + fstar = callPackage ../development/compilers/fstar { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});