From 7e0c64837741e846d7e75aca2c12b0485910953c Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Fri, 30 Apr 2021 15:16:12 +0200 Subject: [PATCH 01/38] bacon: init at 1.1.5 --- pkgs/development/tools/bacon/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/bacon/default.nix diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix new file mode 100644 index 00000000000..3a7e7e7ef66 --- /dev/null +++ b/pkgs/development/tools/bacon/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "bacon"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = pname; + rev = "v${version}"; + sha256 = "0wyx216q9q7y60bnnw4cbpv9zlbnjm2hwq0llkjw60fp3qalj9am"; + }; + + cargoSha256 = "1pii5ajl3xgylrm20pkwbd1lk7gv0pshl1cxjfna0l63q56v7f21"; + + meta = with lib; { + description = "Background rust code checker"; + homepage = "https://github.com/Canop/bacon"; + license = licenses.agpl3Only; + maintainers = [ maintainers.FlorianFranzen ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2da323ce708..7a824c65842 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3190,6 +3190,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; + bacon = callPackage ../development/tools/bacon { }; + bareos = callPackage ../tools/backup/bareos { }; bats = callPackage ../development/interpreters/bats { }; From 41f448f2fcdd79f5478caaab05b0461ab359e1d5 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Thu, 29 Apr 2021 23:29:51 +0200 Subject: [PATCH 02/38] prometheus-xmpp-alerts: 0.4.2 -> 0.5.1 --- .../monitoring/prometheus/xmpp-alerts.nix | 31 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 93e6f1767ad..ddffc9c55da 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -1,17 +1,36 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib +, fetchFromGitHub +, python3Packages +, prometheus-alertmanager +}: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "prometheus-xmpp-alerts"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jelmer"; repo = pname; - rev = version; - sha256 = "17aq6v4ahnga82r350kx1y8i7zgikpzmwzaacj7a339kh8hxkh63"; + rev = "v${version}"; + sha256 = "0qmmmlcanbrhyyxi32gy3gibgvj7jdjwpa8cf5ci9czvbyxg4rld"; }; - propagatedBuildInputs = with pythonPackages; [ slixmpp prometheus_client pyyaml ]; + propagatedBuildInputs = [ + prometheus-alertmanager + ] ++ (with python3Packages; [ + aiohttp + slixmpp + prometheus_client + pyyaml + ]); + + checkInputs = with python3Packages; [ + pytz + ]; + + checkPhase = '' + ${python3Packages.python.interpreter} -m unittest discover + ''; meta = { description = "XMPP Web hook for Prometheus"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6c77bdab94..ebe4bd46516 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19193,9 +19193,7 @@ in prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { - pythonPackages = python3Packages; - }; + prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; From 21746a7c80619f72c8197486940fc60183602656 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 May 2021 18:14:03 +0200 Subject: [PATCH 03/38] nixos/postgresqlBackup: allow defining multiple times to start at MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Or … none! Because forcing a string always results in an OnCalender= setting, but an empty string leads to an empty value. > postgresqlBackup-hass.timer: Timer unit lacks value setting. Refusing. or > postgresqlBackup-miniflux.timer: Cannot add dependency job, ignoring: Unit postgresqlBackup-miniflux.timer has a bad unit file setting. I require the postgresqlBackup in my borgbackup unit, so I don't strictly need the timer and could previously set it to an empty list. --- nixos/modules/services/backup/postgresql-backup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index f4bd3aa447e..9da2d522a68 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -48,7 +48,7 @@ in { startAt = mkOption { default = "*-*-* 01:15:00"; - type = types.str; + type = with types; either (listOf str) str; description = '' This option defines (see systemd.time for format) when the databases should be dumped. From c2161e94f830c8b6ab2b3fcb27f21a76e1f00dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 12:57:09 +0200 Subject: [PATCH 04/38] opencv4: use ffmpeg instead of ffmpeg_3 --- pkgs/development/libraries/opencv/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 15c8d46b613..58609a9186d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -45,7 +45,7 @@ , enableVtk ? false , vtk , enableFfmpeg ? true -, ffmpeg_3 +, ffmpeg , enableGStreamer ? true , gst_all_1 , enableTesseract ? false @@ -252,7 +252,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableFfmpeg ffmpeg_3 + ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) From d8f202e83ebae724a5bd1318c12d7721326222bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 12:58:16 +0200 Subject: [PATCH 05/38] opencv3: use ffmpeg instead of ffmpeg_3 --- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a65e978f981..33b1cd18757 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -22,7 +22,7 @@ , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg_3 +, enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica , enableTbb ? false, tbb @@ -188,7 +188,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableFfmpeg ffmpeg_3 + ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) From 242f2064f5acf39f15edbf5c9cf2b27f44bea7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 13:00:34 +0200 Subject: [PATCH 06/38] opencv2: use ffmpeg instead of ffmpeg_3 --- pkgs/development/libraries/opencv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 2575f6bb45d..005257780e4 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -6,7 +6,7 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase -, enableFfmpeg ? false, ffmpeg_3 +, enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , Cocoa, QTKit @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableFfmpeg ffmpeg_3 + ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] From 5722718317f2b9263a955eb81b100b2dd14324a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 May 2021 08:47:48 +0200 Subject: [PATCH 07/38] python3Packages.catalogue: 2.0.1 -> 2.0.4 catalogue now vendors importlib-metadata, so the importlib-metadata dependency is obsolete. --- pkgs/development/python-modules/catalogue/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index d07b7f29dc3..fbbaf92f4eb 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -2,23 +2,20 @@ , buildPythonPackage , fetchPypi , pythonOlder -, importlib-metadata , pytestCheckHook }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.1"; + version = "2.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; + hash = "sha256-ntNF0ShVrzFfFxVYNhKya4YhorCi4775dNxdcS95g6o="; }; - propagatedBuildInputs = [ importlib-metadata ]; - checkInputs = [ pytestCheckHook ]; meta = with lib; { From 8094b43c3817cfb08012c5d6b1f0a9648fbd2221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 May 2021 08:53:02 +0200 Subject: [PATCH 08/38] python3Packages.thinc: 8.0.2 -> 8.0.3 Changelog: https://github.com/explosion/thinc/releases/tag/v8.0.3 --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index a92d349e992..4aac0d756d4 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.2"; + version = "8.0.3"; src = fetchPypi { inherit pname version; - sha256 = "20f033b3d9fbd02389d8f828cebcd3a42aee3e17ed4c2d56c6d5163af83a9cee"; + hash = "sha256-w3CnpG0BtYjY1fmdjV42s8usRRJjg1b6Qw9/Urs6iJc="; }; buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From 91b9bbe38c160d123f7b64b63beffa77c03af6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 May 2021 08:58:44 +0200 Subject: [PATCH 09/38] python3Packages.srsly: 2.4.0 -> 2.4.1 Changelog: https://github.com/explosion/srsly/releases/tag/v2.4.1 --- pkgs/development/python-modules/srsly/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index c6db32a15e4..86550f99873 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -6,20 +6,19 @@ , catalogue , mock , numpy -, pathlib , pytest -, pytz +, ruamel-yaml }: buildPythonPackage rec { pname = "srsly"; - version = "2.4.0"; + version = "2.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; + hash = "sha256-sPKuwKMp5ufnQqCmDpmnSWjKKb5x81xcTeIh4ygXaSY="; }; nativeBuildInputs = [ cython ]; @@ -30,13 +29,9 @@ buildPythonPackage rec { mock numpy pytest - pytz + ruamel-yaml ]; - # TypeError: cannot serialize '_io.BufferedRandom' object - # Possibly because of sandbox restrictions. - doCheck = false; - pythonImportsCheck = [ "srsly" ]; meta = with lib; { From 220611888613edfa932a9634c818716db47b5481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 May 2021 09:38:46 +0200 Subject: [PATCH 10/38] python3Packages.spacy: 3.0.5 -> 3.0.6 Changelog: https://github.com/explosion/spaCy/releases/tag/v3.0.6 --- pkgs/development/python-modules/spacy/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 672af9f0f7e..3cabc1d6ba2 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -12,13 +12,13 @@ , murmurhash , numpy , pathlib -, plac , preshed , requests , setuptools , srsly , spacy-legacy , thinc +, typer , wasabi , packaging , pathy @@ -27,11 +27,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.0.5"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "9f7a09fbad53aac2a3cb7696a902de62b94575a15d249dd5e26a98049328060e"; + hash = "sha256-ViirifH1aAmciAsSqcN/Ts4pq4kmBmDP33KMAnEYecU="; }; propagatedBuildInputs = [ @@ -42,7 +42,6 @@ buildPythonPackage rec { jsonschema murmurhash numpy - plac preshed requests setuptools @@ -53,6 +52,7 @@ buildPythonPackage rec { packaging pathy pydantic + typer ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ @@ -67,10 +67,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ - --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ - --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ - --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \ - --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" \ --replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3" ''; From d6c64b2816f7fc221155fbb9b4b0371dcec0a769 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 May 2021 17:19:23 +0200 Subject: [PATCH 11/38] rxvt-unicode: 9.22 -> 9.26 --- pkgs/applications/terminal-emulators/rxvt-unicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 82536e4b873..02f1b100f49 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -9,7 +9,7 @@ let pname = "rxvt-unicode"; - version = "9.22"; + version = "9.26"; description = "A clone of the well-known terminal emulator rxvt"; desktopItem = makeDesktopItem { @@ -31,7 +31,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; + sha256 = "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4"; }; buildInputs = From 6205c47b025bf88abad32dd621bd2a3c68083505 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 May 2021 17:24:17 +0200 Subject: [PATCH 12/38] rxvt, mrxvt, eterm: Mark vulnerable to unexpected command execution https://www.openwall.com/lists/oss-security/2021/05/17/1 --- pkgs/applications/terminal-emulators/eterm/default.nix | 3 +++ pkgs/applications/terminal-emulators/mrxvt/default.nix | 3 +++ pkgs/applications/terminal-emulators/rxvt/default.nix | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index 70b8311b105..b5ca8b88959 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -39,5 +39,8 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + knownVulnerabilities = [ + "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ]; }; } diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index b0b9ee61118..bd01b0843fb 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -36,5 +36,8 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/materm"; license = licenses.gpl2; platforms = platforms.linux; + knownVulnerabilities = [ + "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ]; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix index 0cd4f13e465..a6f4ab1321c 100644 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt/default.nix @@ -35,5 +35,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; license = licenses.gpl2; platforms = platforms.linux; + knownVulnerabilities = [ + "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ]; }; } From 47a1b5e57fe045cecda740ceca7aa69d16b09341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 18:39:15 +0200 Subject: [PATCH 13/38] yapesdl: fix darwin build --- pkgs/misc/emulators/yapesdl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/emulators/yapesdl/default.nix b/pkgs/misc/emulators/yapesdl/default.nix index 307068cde04..5f4b7771fb5 100644 --- a/pkgs/misc/emulators/yapesdl/default.nix +++ b/pkgs/misc/emulators/yapesdl/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { SDL2 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + installPhase = '' runHook preInstall install --directory $out/bin $out/share/doc/$pname From fdca59b107e89e5c3b26846b911342960a505d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 18:41:43 +0200 Subject: [PATCH 14/38] xcd: fix darwin build --- pkgs/tools/misc/xcd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/xcd/default.nix b/pkgs/tools/misc/xcd/default.nix index c379ed21c19..7e340210419 100644 --- a/pkgs/tools/misc/xcd/default.nix +++ b/pkgs/tools/misc/xcd/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' runHook preInstall install -D $pname $out/bin/$pname From e726f8034fc2a48c10c0864b1991cbac18d99385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 18:56:00 +0200 Subject: [PATCH 15/38] cc65: fix darwin build --- pkgs/development/compilers/cc65/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix index 6e201ac7933..03325d2fd60 100644 --- a/pkgs/development/compilers/cc65/default.nix +++ b/pkgs/development/compilers/cc65/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4"; }; - makeFlags = [ "PREFIX=${placeholder "out"}"]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CC=${stdenv.cc.targetPrefix}cc" + ]; meta = with lib; { homepage = "https://cc65.github.io/"; From 8e713d34d87aebb7a1714b00997924f74d1b5056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 19:04:13 +0200 Subject: [PATCH 16/38] websocat: fix darwin build --- pkgs/tools/misc/websocat/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 821c059a45f..7ba2accc678 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, Security, makeWrapper, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, libiconv +, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -15,7 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-+3SG1maarY4DJ4+QiYGwltGLksOoOhKtcqstRwgzi2k="; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR=1; From 5c3b09aecb8bec7237a6dbf1d46899f7445c681b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 19:27:34 +0200 Subject: [PATCH 17/38] trunk: fix darwin build --- pkgs/development/tools/trunk/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index d31c030edac..9284e1df454 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -1,4 +1,5 @@ -{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config +, openssl, libiconv, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "trunk"; @@ -12,7 +13,9 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin + then [ libiconv CoreServices Security ] + else [ openssl ]; cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 966a6cbc41b..a7f2e0edf81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9059,7 +9059,9 @@ in trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; - trunk = callPackage ../development/tools/trunk { }; + trunk = callPackage ../development/tools/trunk { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; tthsum = callPackage ../applications/misc/tthsum { }; From 7fe17847a2a7fbc17f8e72d218150f14da763ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 19:33:46 +0200 Subject: [PATCH 18/38] tensor: fix darwin build --- .../instant-messengers/tensor/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 114b3ab8f4d..3969627a67a 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,4 +1,5 @@ -{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake +, makeDesktopItem }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that @@ -30,7 +31,15 @@ mkDerivation rec { mimeType = "application/x-chat"; }; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + runHook preInstall + + mkdir -p $out/Applications + cp -r tensor.app $out/Applications/tensor.app + wrapQtApp $out/Applications/tensor.app/Contents/MacOS/tensor + + runHook postInstall + '' else '' runHook preInstall install -Dm755 tensor $out/bin/tensor From a30a3e3cab8fd3f3b92163c94ffbb6259e6ff7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 20:01:24 +0200 Subject: [PATCH 19/38] svd2rust: fix darwin build --- pkgs/development/tools/rust/svd2rust/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 8afb9c033cb..c66cbe3c2c8 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: with rustPlatform; @@ -16,6 +16,8 @@ buildRustPackage rec { cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; homepage = "https://github.com/rust-embedded/svd2rust"; From 755fa6d3b3c41dc454aacd13b2615c414060f59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 20:03:31 +0200 Subject: [PATCH 20/38] sunwait: fix darwin build --- pkgs/applications/misc/sunwait/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/applications/misc/sunwait/default.nix index c9581fe79f6..2d1f8f46f5a 100644 --- a/pkgs/applications/misc/sunwait/default.nix +++ b/pkgs/applications/misc/sunwait/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation { sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax"; }; + makeFlags = [ "C=${stdenv.cc.targetPrefix}c++" ]; + installPhase = '' install -Dm755 sunwait -t $out/bin ''; From 7c0c956a57deadf48efdf1252de4ffa904c34733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 20:35:09 +0200 Subject: [PATCH 21/38] starspace: fix darwin build --- .../science/machine-learning/starspace/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index b511b4ea42e..d5a6cb796a7 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ boost165 ]; + makeFlags = [ + "CXX=${stdenv.cc.targetPrefix}c++" + "BOOST_DIR=${boost165.dev}/include" + ]; + installPhase = '' mkdir -p $out/bin mv starspace $out/bin From 92d0a489e0d740f51bc1eeacdfd256b38870c644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 20:44:24 +0200 Subject: [PATCH 22/38] spnavcfg: fix darwin build --- pkgs/applications/misc/spnavcfg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/applications/misc/spnavcfg/default.nix index caeaa42192d..253549099de 100644 --- a/pkgs/applications/misc/spnavcfg/default.nix +++ b/pkgs/applications/misc/spnavcfg/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + meta = with lib; { homepage = "http://spacenav.sourceforge.net/"; description = "Interactive configuration GUI for space navigator input devices"; From 56f0c92fadf0aa839ecc75db738d2e1f3ffb1e14 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Mon, 17 May 2021 21:11:34 -0400 Subject: [PATCH 23/38] pyicu: 2.6 -> 2.7.1 --- pkgs/development/python-modules/pyicu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index efb7467e485..124846fab8e 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.6"; + version = "2.7.3"; src = fetchPypi { inherit pname version; - sha256 = "0wb3v421i2fnnxdywam4ay8hqvnxlz0r2nrpx5lqy3rn6dlbz9d9"; + sha256 = "1jv1pds94agvn3zs33a8p8f0mk7f5pjwmczmg1s05ri5p0kzk4h8"; }; - nativeBuildInputs = [ icu ]; # for icu-config + nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config buildInputs = [ icu ]; checkInputs = [ pytestCheckHook six ]; From de8dbb21fbf740927ad2888bac59215a92a64ee0 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Mon, 17 May 2021 22:28:13 -0400 Subject: [PATCH 24/38] pin to icu68 --- pkgs/development/python-modules/pyicu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 124846fab8e..1b01f1904e0 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , six -, icu +, icu68 }: buildPythonPackage rec { @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "1jv1pds94agvn3zs33a8p8f0mk7f5pjwmczmg1s05ri5p0kzk4h8"; }; - nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config - buildInputs = [ icu ]; + nativeBuildInputs = [ icu68 ]; # for icu-config, but should be replaced with pkg-config + buildInputs = [ icu68 ]; checkInputs = [ pytestCheckHook six ]; meta = with lib; { From 06b0d82dd45be55dcb9640628bf75a7249ef2ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 21:24:54 +0200 Subject: [PATCH 25/38] jumanpp: fix darwin build --- pkgs/tools/text/jumanpp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index b670bcaec28..5578ed417a2 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, protobuf }: +{ lib, stdenv, fetchurl, cmake, protobuf, libiconv }: stdenv.mkDerivation rec { pname = "jumanpp"; @@ -8,8 +8,10 @@ stdenv.mkDerivation rec { url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; }; + nativeBuildInputs = [ cmake ]; - buildInputs = [ protobuf ]; + buildInputs = [ protobuf ] + ++ lib.optional stdenv.isDarwin libiconv; meta = with lib; { description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; From 4731287e190f35f55a41eb4017c9e4b315aab9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 21:27:32 +0200 Subject: [PATCH 26/38] heimdall: fix non-GUI build on darwin --- pkgs/tools/misc/heimdall/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index e934bbb5c84..3dcefa8b2d0 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -31,7 +31,7 @@ mkDerivation { substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString (stdenv.isDarwin && enableGUI) '' mkdir -p $out/Applications mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend From 84078e61654db8c204316427322956cd908861fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 20:41:17 +0200 Subject: [PATCH 27/38] sqlar: fix darwin build --- pkgs/development/libraries/sqlite/sqlar.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 0828f2f4554..9063879b7e3 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, fuse, zlib }: +{ lib, stdenv, fetchurl, fuse, zlib +, withFuse ? true }: stdenv.mkDerivation { pname = "sqlar"; @@ -9,12 +10,21 @@ stdenv.mkDerivation { sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9"; }; - buildInputs = [ fuse zlib ]; + postPatch = '' + substituteInPlace Makefile \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' + ''; - buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ]; + buildInputs = [ zlib ] + ++ lib.optional withFuse fuse; + + buildFlags = [ "CFLAGS=-Wno-error" "sqlar" ] + ++ lib.optional withFuse "sqlarfs"; installPhase = '' - install -D -t $out/bin sqlar sqlarfs + install -D -t $out/bin sqlar + '' + lib.optionalString withFuse '' + install -D -t $out/bin sqlarfs ''; meta = with lib; { From ab205c5de10ea343ad404c55b23154abc3479827 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 17 May 2021 21:39:24 +0200 Subject: [PATCH 28/38] vimPlugins: restore aliases --- pkgs/misc/vim-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 00637f6fb00..cbc6ec7380b 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -25,7 +25,7 @@ let inherit llvmPackages; }; - aliases = if (config.allowAliases or true) then final: prev: {} else (import ./aliases.nix lib); + aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {}; extensible-self = lib.makeExtensible (extends aliases From b0e2820ae21b6a7c0089c7620ec838bfa2a5fdbd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 18 May 2021 21:27:12 +0200 Subject: [PATCH 29/38] ocamlPackages.luv: 0.5.7 -> 0.5.8 --- pkgs/development/ocaml-modules/luv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index 6ad5ce5d487..41fdbc4eedc 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.7"; + version = "0.5.8"; useDune2 = true; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "0wjnw5riydnzsk1xdzljlpzdnjwpa0j597y6x6ma4990mqj54260"; + sha256 = "1y3g7jvb72frckjl92zyn7hzmzjy1fy4a48992jdk80vphsdzgmk"; }; postConfigure = '' From 4b14908706f62792bebda8e928f776fdb4243dee Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 17 May 2021 23:40:10 +0100 Subject: [PATCH 30/38] python3Packages.sequoia: fix build by providing correct libclang output broken by the big llvmPackages output split --- pkgs/tools/security/sequoia/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 35fc6e278b8..bc9a94fa5fd 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { cargo rustc git - llvmPackages_10.libclang + llvmPackages_10.libclang.lib llvmPackages_10.clang ensureNewerSourcesForZipFilesHook capnproto From 3ac820e157f882f886f20bd20d9a1b539e011303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 23:10:44 +0200 Subject: [PATCH 31/38] tachyon: fix darwin build (#123558) --- .../libraries/tachyon/darwin.patch | 31 ------------------- .../development/libraries/tachyon/default.nix | 10 ++++-- 2 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/tachyon/darwin.patch diff --git a/pkgs/development/libraries/tachyon/darwin.patch b/pkgs/development/libraries/tachyon/darwin.patch deleted file mode 100644 index dbede586f07..00000000000 --- a/pkgs/development/libraries/tachyon/darwin.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/unix/Make-arch b/unix/Make-arch -index 08afb85..822c4fc 100644 ---- a/unix/Make-arch -+++ b/unix/Make-arch -@@ -924,7 +924,7 @@ macosx-thr: - $(MAKE) all \ - "ARCH = macosx-thr" \ - "CC = cc" \ -- "CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ -+ "CFLAGS = -Os -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = strip" \ -@@ -946,7 +946,7 @@ macosx-x86-thr: - $(MAKE) all \ - "ARCH = macosx-x86-thr" \ - "CC = cc" \ -- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ -+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = strip" \ -@@ -957,7 +957,7 @@ macosx-x86-thr-ogl: - $(MAKE) all \ - "ARCH = macosx-x86-thr-ogl" \ - "CC = cc" \ -- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include -F/System/Library/Frameworks $(MISCFLAGS) -DUSEOPENGL" \ -+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include $(MISCFLAGS) -DUSEOPENGL" \ - "AR = ar" \ - "ARFLAGS = r" \ - "STRIP = strip" \ diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 47cebd62df6..5994aeb0a59 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -48,14 +48,18 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; makeFlags = [ arch ]; + patches = [ # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) ./no-absolute-paths.patch # Include new targets (like arm) ./make-archs.patch - ] ++ - # Ensure looks for nix-provided Carbon, not system frameworks - lib.optional stdenv.isDarwin ./darwin.patch; + ]; + postPatch = '' + # Ensure looks for nix-provided Carbon, not system frameworks + substituteInPlace unix/Make-arch \ + --replace '-F/System/Library/Frameworks' "" + ''; installPhase = '' cd ../compile/${arch} From 1dbb8fa2be2ed390c08c6cca79bba7d414de2701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 23:16:58 +0200 Subject: [PATCH 32/38] wagyu: fix darwin build (#123547) --- pkgs/tools/misc/wagyu/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index 8ed952a82ce..981d59e3aaf 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "wagyu"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16d1b3pamkg29nq80n6cbzc4zl9z3cgfvdxjkr2z4xrnzmkn1ysi"; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; homepage = "https://github.com/ArgusHQ/wagyu"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcc8000ad3e..13d709aeeb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9666,7 +9666,9 @@ in waf = callPackage ../development/tools/build-managers/waf { python = python3; }; wafHook = callPackage ../development/tools/build-managers/wafHook { }; - wagyu = callPackage ../tools/misc/wagyu { }; + wagyu = callPackage ../tools/misc/wagyu { + inherit (darwin.apple_sdk.frameworks) Security; + }; wakelan = callPackage ../tools/networking/wakelan { }; From 48eba07cdd329f8ec81ecff5c548ef257918dc17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 21:29:49 +0000 Subject: [PATCH 33/38] kodiPackages.pvr-iptvsimple: 7.6.4 -> 7.6.5 --- .../video/kodi-packages/pvr-iptvsimple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index 648dfabc29f..b6feec8ab03 100644 --- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.6.4"; + version = "7.6.5"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-F2uvf3BChN4p4VV1vTMAAPwQchVI5paTdxSFEi0u9a0="; + sha256 = "sha256-Z4H+5dUYJ3vAgodPxWmttVhPVdPVYTJbmYxo1lzLHNA="; }; extraBuildInputs = [ From 31e8431166076def30ec335e624b0bed3e874d6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 21:54:00 +0000 Subject: [PATCH 34/38] kea: 1.9.6 -> 1.9.7 --- pkgs/tools/networking/kea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index ac8c515642f..dafc25b3a26 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-sEFE5OfYt1mcAnGZCWqYFzIepzKNZZcd2rVhdxv/3sw="; + sha256 = "sha256-3/A0cG9AiyiWMk0GUjeUAHm0uRw5Q9PsEA2S6WZ8clo="; }; patches = [ ./dont-create-var.patch ]; From 255de2ca302eb1e792cd0559b398ea8ed7b24fb1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 19 May 2021 06:13:43 +1000 Subject: [PATCH 35/38] gh: 1.9.2 -> 1.10.0 https://github.com/cli/cli/releases/tag/v1.10.0 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 7dfca2cd80a..fa8b5acc9b2 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0lx6sx3zkjq9855va1vxbd5g47viqkrchk5d2rb6xj7zywwm4mgb"; + sha256 = "sha256-nQc10uTb7yQoH9rlMQiexttdAnnPRGaHCrzZNqkZcIc="; }; - vendorSha256 = "1zmyd566xcksgqm0f7mq0rkfnxk0fmf39k13fcp9jy30c1y9681v"; + vendorSha256 = "sha256-A7Bo0HQ5Z2SXY32jWCYgwvvInD3xYLSXvipzeaQTDiM="; nativeBuildInputs = [ installShellFiles ]; From d00a9f089b7813dc45abb76c61c8e212606a1dc9 Mon Sep 17 00:00:00 2001 From: Nathan Ringo Date: Tue, 18 May 2021 16:10:55 -0500 Subject: [PATCH 36/38] lispPackages.generic-cl: init from Quicklisp, lispPackages.trivial-arguments: init from Quicklisp, quicklispPackages: regenerate --- .../quicklisp-to-nix-output/agutil.nix | 42 ++++ .../quicklisp-to-nix-output/arrows.nix | 31 +++ .../cl-environments.nix | 44 ++++ .../quicklisp-to-nix-output/generic-cl.nix | 56 +++++ .../static-dispatch.nix | 55 +++++ .../trivial-arguments.nix | 27 +++ .../quicklisp-to-nix-overrides.nix | 2 + .../lisp-modules/quicklisp-to-nix-systems.txt | 2 + .../lisp-modules/quicklisp-to-nix.nix | 228 ++++++++++++++---- 9 files changed, 436 insertions(+), 51 deletions(-) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix new file mode 100644 index 00000000000..c159b206418 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/agutil.nix @@ -0,0 +1,42 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "agutil"; + version = "20200325-git"; + + description = "A collection of utility functions not found in other utility libraries."; + + deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/agutil/2020-03-25/agutil-20200325-git.tgz"; + sha256 = "0jfbb2x3f8sm507r63qwrzx44lyyj98i36yyyaf4kpyqfir35z2k"; + }; + + packageName = "agutil"; + + asdFilesToKeep = ["agutil.asd"]; + overrides = x: x; +} +/* (SYSTEM agutil DESCRIPTION + A collection of utility functions not found in other utility libraries. + SHA256 0jfbb2x3f8sm507r63qwrzx44lyyj98i36yyyaf4kpyqfir35z2k URL + http://beta.quicklisp.org/archive/agutil/2020-03-25/agutil-20200325-git.tgz + MD5 89e47bd15c0f9930a5025d04b9706b60 NAME agutil FILENAME agutil DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (alexandria closer-mop introspect-environment iterate lisp-namespace trivia + trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 + trivia.trivial trivial-cltl2 type-i) + VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix new file mode 100644 index 00000000000..13076ff26e8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/arrows.nix @@ -0,0 +1,31 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "arrows"; + version = "20181018-git"; + + parasites = [ "arrows/test" ]; + + description = "Implements -> and ->> from Clojure, as well as several expansions on the +idea."; + + deps = [ args."hu_dot_dwim_dot_stefil" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz"; + sha256 = "1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r"; + }; + + packageName = "arrows"; + + asdFilesToKeep = ["arrows.asd"]; + overrides = x: x; +} +/* (SYSTEM arrows DESCRIPTION + Implements -> and ->> from Clojure, as well as several expansions on the +idea. + SHA256 1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r URL + http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz + MD5 c60b5d79680de19baad018a0fe87bc48 NAME arrows FILENAME arrows DEPS + ((NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)) DEPENDENCIES + (hu.dwim.stefil) VERSION 20181018-git SIBLINGS NIL PARASITES (arrows/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix new file mode 100644 index 00000000000..803d138b2ea --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-environments.nix @@ -0,0 +1,44 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "cl-environments"; + version = "20210411-git"; + + parasites = [ "cl-environments/test" ]; + + description = "Implements the CLTL2 environment access functionality + for implementations which do not provide the + functionality to the programmer."; + + deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."optima" args."prove" args."prove-asdf" args."symbol-munger" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/cl-environments/2021-04-11/cl-environments-20210411-git.tgz"; + sha256 = "1xs1wwf6fmzq5zxmv5d9f2mfmhc7j2w03519ky6id5md75j68lhk"; + }; + + packageName = "cl-environments"; + + asdFilesToKeep = ["cl-environments.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-environments DESCRIPTION + Implements the CLTL2 environment access functionality + for implementations which do not provide the + functionality to the programmer. + SHA256 1xs1wwf6fmzq5zxmv5d9f2mfmhc7j2w03519ky6id5md75j68lhk URL + http://beta.quicklisp.org/archive/cl-environments/2021-04-11/cl-environments-20210411-git.tgz + MD5 87b7c0186d37d30d24df11d021ab4fba NAME cl-environments FILENAME + cl-environments DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate) + (NAME optima FILENAME optima) (NAME prove FILENAME prove) + (NAME prove-asdf FILENAME prove-asdf) + (NAME symbol-munger FILENAME symbol-munger)) + DEPENDENCIES + (alexandria anaphora cl-ansi-text cl-colors cl-ppcre closer-mop collectors + iterate optima prove prove-asdf symbol-munger) + VERSION 20210411-git SIBLINGS NIL PARASITES (cl-environments/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix new file mode 100644 index 00000000000..04750febab0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/generic-cl.nix @@ -0,0 +1,56 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "generic-cl"; + version = "20201220-git"; + + parasites = [ "generic-cl/test" ]; + + description = "Standard Common Lisp functions implemented using generic functions."; + + deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-ansi-text" args."cl-colors" args."cl-custom-hash-table" args."cl-environments" args."cl-ppcre" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."prove" args."prove-asdf" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/generic-cl/2020-12-20/generic-cl-20201220-git.tgz"; + sha256 = "02awl64bfykkasv3z9xpiiwq3v9vgcacqagbwvigqdk15hqrknyl"; + }; + + packageName = "generic-cl"; + + asdFilesToKeep = ["generic-cl.asd"]; + overrides = x: x; +} +/* (SYSTEM generic-cl DESCRIPTION + Standard Common Lisp functions implemented using generic functions. SHA256 + 02awl64bfykkasv3z9xpiiwq3v9vgcacqagbwvigqdk15hqrknyl URL + http://beta.quicklisp.org/archive/generic-cl/2020-12-20/generic-cl-20201220-git.tgz + MD5 76aa19981d3addb9a741fd4705d5d3ff NAME generic-cl FILENAME generic-cl + DEPS + ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) + (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) + (NAME cl-custom-hash-table FILENAME cl-custom-hash-table) + (NAME cl-environments FILENAME cl-environments) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME optima FILENAME optima) (NAME prove FILENAME prove) + (NAME prove-asdf FILENAME prove-asdf) + (NAME static-dispatch FILENAME static-dispatch) + (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (agutil alexandria anaphora arrows cl-ansi-text cl-colors + cl-custom-hash-table cl-environments cl-ppcre closer-mop collectors + introspect-environment iterate lisp-namespace optima prove prove-asdf + static-dispatch symbol-munger trivia trivia.balland2006 trivia.level0 + trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) + VERSION 20201220-git SIBLINGS (generic-cl.util) PARASITES (generic-cl/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix new file mode 100644 index 00000000000..040bf87d306 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-dispatch.nix @@ -0,0 +1,55 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "static-dispatch"; + version = "20210411-git"; + + parasites = [ "static-dispatch/test" ]; + + description = "Static generic function dispatch for Common Lisp."; + + deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-ansi-text" args."cl-colors" args."cl-environments" args."cl-interpol" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."prove" args."prove-asdf" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/static-dispatch/2021-04-11/static-dispatch-20210411-git.tgz"; + sha256 = "0dqkapripvb5qrhpim1b5y2ymn99s2zcwf38vmqyiqk3n3hvjjh1"; + }; + + packageName = "static-dispatch"; + + asdFilesToKeep = ["static-dispatch.asd"]; + overrides = x: x; +} +/* (SYSTEM static-dispatch DESCRIPTION + Static generic function dispatch for Common Lisp. SHA256 + 0dqkapripvb5qrhpim1b5y2ymn99s2zcwf38vmqyiqk3n3hvjjh1 URL + http://beta.quicklisp.org/archive/static-dispatch/2021-04-11/static-dispatch-20210411-git.tgz + MD5 7af665c6a3a1aa3315fe0a651ca559de NAME static-dispatch FILENAME + static-dispatch DEPS + ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) + (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) + (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME cl-colors FILENAME cl-colors) + (NAME cl-environments FILENAME cl-environments) + (NAME cl-interpol FILENAME cl-interpol) + (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME optima FILENAME optima) (NAME prove FILENAME prove) + (NAME prove-asdf FILENAME prove-asdf) + (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (agutil alexandria anaphora arrows cl-ansi-text cl-colors cl-environments + cl-interpol closer-mop collectors introspect-environment iterate + lisp-namespace optima prove prove-asdf symbol-munger trivia + trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 + trivia.trivial trivial-cltl2 type-i) + VERSION 20210411-git SIBLINGS NIL PARASITES (static-dispatch/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix new file mode 100644 index 00000000000..9444b0b690d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-arguments.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "trivial-arguments"; + version = "20200925-git"; + + description = "A simple library to retrieve the lambda-list of a function."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz"; + sha256 = "079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295"; + }; + + packageName = "trivial-arguments"; + + asdFilesToKeep = ["trivial-arguments.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-arguments DESCRIPTION + A simple library to retrieve the lambda-list of a function. SHA256 + 079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295 URL + http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz + MD5 3d7b76a729b272019c8827e40bfb6db8 NAME trivial-arguments FILENAME + trivial-arguments DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS + NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index ee2c4dbe0c6..dbc57cb8d1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -277,4 +277,6 @@ $out/lib/common-lisp/query-fs" md5 = ifLispNotIn ["sbcl" "ccl" "gcl"] (extraLispDeps (with quicklisp-to-nix-packages; [flexi-streams])); cl-gobject-introspection = addNativeLibs (with pkgs; [glib gobject-introspection]); + generic-cl = x: { parasites = []; }; + static-dispatch = x: { parasites = []; }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 93ca6916842..6cbd7f4115a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -123,6 +123,7 @@ fiveam flexi-streams form-fiddle fset +generic-cl gettext http-body hu.dwim.asdf @@ -189,6 +190,7 @@ swank swap-bytes symbol-munger trivia +trivial-arguments trivial-backtrace trivial-clipboard trivial-features diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index e8a5e5f026f..ed8e87162c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -289,6 +289,80 @@ let quicklisp-to-nix-packages = rec { })); + "trivia_dot_quasiquote" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_quasiquote" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + + "fare-quasiquote-readtable" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-readtable" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix { + inherit fetchurl; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + + "fare-quasiquote-optima" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-optima" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + + "fare-quasiquote-extras" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-extras" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + "type-i" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."type-i" or (x: {})) @@ -329,26 +403,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivia_dot_quasiquote" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivia_dot_quasiquote" or (x: {})) - (import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; - "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; - "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; - "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; - "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; - })); - - "trivia_dot_level2" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivia_dot_level2" or (x: {})) @@ -401,6 +455,39 @@ let quicklisp-to-nix-packages = rec { })); + "static-dispatch" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."static-dispatch" or (x: {})) + (import ./quicklisp-to-nix-output/static-dispatch.nix { + inherit fetchurl; + "agutil" = quicklisp-to-nix-packages."agutil"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "arrows" = quicklisp-to-nix-packages."arrows"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-environments" = quicklisp-to-nix-packages."cl-environments"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "optima" = quicklisp-to-nix-packages."optima"; + "prove" = quicklisp-to-nix-packages."prove"; + "prove-asdf" = quicklisp-to-nix-packages."prove-asdf"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; + })); + + "introspect-environment" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."introspect-environment" or (x: {})) @@ -409,57 +496,53 @@ let quicklisp-to-nix-packages = rec { })); - "fare-quasiquote-readtable" = buildLispPackage + "cl-environments" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."fare-quasiquote-readtable" or (x: {})) - (import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix { + (qlOverrides."cl-environments" or (x: {})) + (import ./quicklisp-to-nix-output/cl-environments.nix { inherit fetchurl; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "optima" = quicklisp-to-nix-packages."optima"; + "prove" = quicklisp-to-nix-packages."prove"; + "prove-asdf" = quicklisp-to-nix-packages."prove-asdf"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; })); - "fare-quasiquote-optima" = buildLispPackage + "arrows" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."fare-quasiquote-optima" or (x: {})) - (import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix { + (qlOverrides."arrows" or (x: {})) + (import ./quicklisp-to-nix-output/arrows.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; - "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; - "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; - "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; - "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; - "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil"; })); - "fare-quasiquote-extras" = buildLispPackage + "agutil" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."fare-quasiquote-extras" or (x: {})) - (import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix { + (qlOverrides."agutil" or (x: {})) + (import ./quicklisp-to-nix-output/agutil.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; - "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; - "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; - "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; })); @@ -1556,6 +1639,14 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-arguments" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-arguments" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-arguments.nix { + inherit fetchurl; + })); + + "trivia" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivia" or (x: {})) @@ -2414,6 +2505,41 @@ let quicklisp-to-nix-packages = rec { })); + "generic-cl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."generic-cl" or (x: {})) + (import ./quicklisp-to-nix-output/generic-cl.nix { + inherit fetchurl; + "agutil" = quicklisp-to-nix-packages."agutil"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "arrows" = quicklisp-to-nix-packages."arrows"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-custom-hash-table" = quicklisp-to-nix-packages."cl-custom-hash-table"; + "cl-environments" = quicklisp-to-nix-packages."cl-environments"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "optima" = quicklisp-to-nix-packages."optima"; + "prove" = quicklisp-to-nix-packages."prove"; + "prove-asdf" = quicklisp-to-nix-packages."prove-asdf"; + "static-dispatch" = quicklisp-to-nix-packages."static-dispatch"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; + })); + + "fset" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."fset" or (x: {})) From 813b889fbb5fa3a851767b124150cdce7adc5ef0 Mon Sep 17 00:00:00 2001 From: Nathan Ringo Date: Tue, 18 May 2021 17:59:15 -0500 Subject: [PATCH 37/38] lispPackages: add --pure to README --- pkgs/development/lisp-modules/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lisp-modules/README.txt b/pkgs/development/lisp-modules/README.txt index 08452d979ad..46d7208bcd2 100644 --- a/pkgs/development/lisp-modules/README.txt +++ b/pkgs/development/lisp-modules/README.txt @@ -1,6 +1,6 @@ Want to add a package? There are 3 simple steps! 1. Add the needed system names to quicklisp-to-nix-systems.txt. -2. cd ; nix-shell --run 'quicklisp-to-nix .' +2. cd ; nix-shell --pure --run 'quicklisp-to-nix .' You might want to specify also the --cacheSystemInfoDir and --cacheFaslDir parameters to preserve some data between runs. For example, it is very useful when you add new packages with native dependencies and fail to From 03c092579a32d05de1ecc46b8307e5da06ed57b6 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Thu, 29 Apr 2021 23:30:36 +0200 Subject: [PATCH 38/38] prometheus-xmpp-alerts: apply RFC 42 --- .../monitoring/prometheus/xmpp-alerts.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix b/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix index 44b15cb2034..980c93c9c47 100644 --- a/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix +++ b/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix @@ -4,21 +4,29 @@ with lib; let cfg = config.services.prometheus.xmpp-alerts; - - configFile = pkgs.writeText "prometheus-xmpp-alerts.yml" (builtins.toJSON cfg.configuration); - + settingsFormat = pkgs.formats.yaml {}; + configFile = settingsFormat.generate "prometheus-xmpp-alerts.yml" cfg.settings; in - { - options.services.prometheus.xmpp-alerts = { + imports = [ + (mkRenamedOptionModule + [ "services" "prometheus" "xmpp-alerts" "configuration" ] + [ "services" "prometheus" "xmpp-alerts" "settings" ]) + ]; + options.services.prometheus.xmpp-alerts = { enable = mkEnableOption "XMPP Web hook service for Alertmanager"; - configuration = mkOption { - type = types.attrs; - description = "Configuration as attribute set which will be converted to YAML"; - }; + settings = mkOption { + type = settingsFormat.type; + default = {}; + description = '' + Configuration for prometheus xmpp-alerts, see + + for supported values. + ''; + }; }; config = mkIf cfg.enable {