From c95a170ac282da27c1b215996051d353de90cf90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 00:42:13 +0000 Subject: [PATCH 001/150] air: 1.27.10 -> 1.28.0 --- pkgs/development/tools/air/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index fcc3671ded5c..c57307391bd5 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.27.10"; + version = "1.28.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - sha256 = "sha256-mgFLelf0TPjJK/keQz+s52fKlruSn6+KTPj+waJuQdU="; + sha256 = "sha256-JbFSEfm8SVyJBgZju3kfIv5WK/kFYTqkU0EH5HXl9cc="; }; vendorSha256 = "sha256-MEIPkron42OJioV7PPhnLWVevjKDs5Bw3jDmvZbac9s="; From c4016f91299486254ad544e3c10b4e7c4efac26b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 11:26:48 +0000 Subject: [PATCH 002/150] minio: 2022-02-24T22-12-01Z -> 2022-02-26T02-54-46Z --- 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 e05d77d8a137..c9c9bb8af068 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-02-24T22-12-01Z"; + version = "2022-02-26T02-54-46Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-7bnT+rxQw2h1wCkXjsYm8ystU9F4EUL0KASkJmqLgXQ="; + sha256 = "sha256-+XiormhPdbQRzlqD4Y/+zcPnlIxNJnz9dU53eKYdG5Q="; }; - vendorSha256 = "sha256-fYpnYMt6VrC2eem8XvK8oAR1B0rQ4DV6ZWo0cLNCjCs="; + vendorSha256 = "sha256-omX4nT85+ZT71cQXdiPJHyR+/afEbb43GqeJuxzV0mA="; doCheck = false; From cf9d03519cfc8f02331dad87059a98792dff1294 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Mar 2022 18:21:34 +0000 Subject: [PATCH 003/150] python310Packages.pycurl: 7.45.0 -> 7.45.1 --- pkgs/development/python-modules/pycurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 0b87aba81655..f2163621506f 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.45.0"; + version = "7.45.1"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0="; + sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; }; preConfigure = '' From 2dfbdb27d5ff8c66dad3d1344a5ce71273a6aaf4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 14:02:55 +0100 Subject: [PATCH 004/150] codesearch: switch to fetchFromGitHub --- pkgs/tools/text/codesearch/default.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 9c3e9fbd8409..40ee8c58fbcc 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,24 +1,22 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "codesearch"; - version = "20150717-${lib.strings.substring 0 7 rev}"; - rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; + version = "1.0.0"; goPackagePath = "github.com/google/codesearch"; - src = fetchgit { - inherit rev; - url = "https://github.com/google/codesearch"; - sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; + src = fetchFromGitHub { + owner = "google"; + repo = "codesearch"; + rev = "v${version}"; + sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k="; }; - meta = { + meta = with lib; { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ lib.licenses.bsd3 ]; - maintainers = [ lib.maintainers.bennofs ]; - platforms = lib.platforms.unix; + license = [ licenses.bsd3 ]; + maintainers = with maintainers; [ bennofs ]; }; } From 87530053481bc6634926d0a3a695abdb9d0b3bca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 14:04:42 +0100 Subject: [PATCH 005/150] das_watchdog: switch to fetchFromGitHub --- pkgs/tools/system/das_watchdog/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index 65be63bffe12..ec7eb2b173d0 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libgtop, xmessage, which, pkg-config }: stdenv.mkDerivation { pname = "das_watchdog"; version = "unstable-2015-09-12"; - src = fetchgit { - url = "https://github.com/kmatheussen/das_watchdog.git"; + src = fetchFromGitHub { + owner = "kmatheussen"; + repo = "das_watchdog"; rev = "5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06"; - sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr"; + sha256 = "sha256-eacUn/gYCEHtHdQf3lBPYvY3kfN3Bik7AolAPpbbwQs="; }; nativeBuildInputs = [ pkg-config ]; From 646f5c7302be74328be85f50c5d94ce0d5fa1bf8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 14:12:05 +0100 Subject: [PATCH 006/150] tpm-luks: switch to fetchFromGitHub --- pkgs/tools/security/tpm-luks/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 4aab72cb5dfc..6063cdecc67a 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, trousers, cryptsetup, openssl }: stdenv.mkDerivation { pname = "tpm-luks"; version = "unstable-2015-07-11"; - src = fetchgit { - url = "https://github.com/momiji/tpm-luks"; + src = fetchFromGitHub { + owner = "momiji"; + repo = "tpm-luks"; rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa"; - sha256 = "1ms2v57f13r9km6mvf9rha5ndmlmjvrz3mcikai6nzhpj0nrjz0w"; + sha256 = "sha256-HHyZLZAXfmuimpHV8fOWldZmi4I5uV1NnSmP4E7ZQtc="; }; patches = [ From b60ee6e462d4ec9f33690eca4e62e61164a32aa0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 14:13:14 +0100 Subject: [PATCH 007/150] waitron: switch to fetchFromGitHub --- pkgs/tools/networking/waitron/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index c37d82024fe6..4f2f634d4942 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -1,17 +1,16 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { pname = "waitron"; version = "unstable-2020-01-24"; - rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; goPackagePath = "github.com/ns1/waitron"; - src = fetchgit { - inherit rev; - url = "https://github.com/ns1/waitron"; - sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6"; + src = fetchFromGitHub { + owner = "ns1"; + repo = "waitron"; + rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; + sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE="; }; patches = [ From e822bf4e6b671a9e735f913808aa50c9c0c09cd0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 14:41:59 +0100 Subject: [PATCH 008/150] ua: switch to fetchFromGitHub --- pkgs/tools/networking/ua/default.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index feb17b283de5..4190e8102147 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoPackage, fetchgit +{ lib, buildGoPackage, fetchFromGitHub , pkg-config , glib, libxml2 }: buildGoPackage rec { - pname = "ua-unstable"; - version = "2017-02-24"; - rev = "325dab92c60e0f028e55060f0c288aa70905fb17"; + pname = "ua"; + version = "unstable-2017-02-24"; goPackagePath = "github.com/sloonz/ua"; - src = fetchgit { - inherit rev; - url = "https://github.com/sloonz/ua.git"; - sha256 = "0452qknc8km9495324g6b5ja3shvk8jl7aa9nrjhdylf09dp2nif"; + src = fetchFromGitHub { + owner = "sloonz"; + repo = "ua"; + rev = "325dab92c60e0f028e55060f0c288aa70905fb17"; + sha256 = "sha256-LlpxWwKO+gZltkmpQyWaG+qhZFnmETFKIqlOxOzEohA="; }; goDeps = ./deps.nix; @@ -21,11 +21,10 @@ buildGoPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 ]; - meta = { + meta = with lib; { homepage = "https://github.com/sloonz/ua"; - license = lib.licenses.isc; + license = licenses.isc; description = "Universal Aggregator"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; }; } From 7b4607f83fd9ff54d34d40d18171d0f274b025b4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 14:46:40 +0100 Subject: [PATCH 009/150] s3gof3r: switch to fetchFromGitHub --- pkgs/tools/networking/s3gof3r/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 4623b68ad4cf..19422c3ec8e2 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,17 +1,24 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "s3gof3r"; - version = "20151109-${lib.strings.substring 0 7 rev}"; - rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445"; + version = "0.5.0"; goPackagePath = "github.com/rlmcpherson/s3gof3r"; - src = fetchgit { - inherit rev; - url = "https://github.com/rlmcpherson/s3gof3r"; - sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k"; + src = fetchFromGitHub { + owner = "rlmcpherson"; + repo = "s3gof3r"; + rev = "v${version}"; + sha256 = "sha256-88C6c4DRD/4ePTO1+1YiI8ApXWE2uUlr07dDCxGzaoE="; }; goDeps = ./deps.nix; + + meta = with lib; { + description = "Fast, concurrent, streaming access to Amazon S3, including gof3r, a CLI"; + homepage = "https://pkg.go.dev/github.com/rlmcpherson/s3gof3r"; + maintainers = with maintainers; [ ]; + license = licenses.mit; + }; } From c3d260d8d8f1b5d603f473aac87641beb3948b96 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 14:46:56 +0100 Subject: [PATCH 010/150] bud: switch to fetchFromGitHub --- pkgs/tools/networking/bud/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index 7a4bd5adcba0..3fa3988dfa07 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -1,14 +1,15 @@ -{ stdenv, lib, fetchgit, python2, util-linux }: +{ stdenv, lib, fetchFromGitHub, python2, util-linux }: stdenv.mkDerivation { pname = "bud"; - version = "0.34.1"; - src = fetchgit { - url = "https://github.com/indutny/bud.git"; + src = fetchFromGitHub { + owner = "indutny"; + repo = "bud"; rev = "b112852c9667632f692d2ce3dcd9a8312b61155a"; - sha256 = "08yr6l4lc2m6rng06253fcaznf6sq0v053wfr8bbym42c32z0xdh"; + sha256 = "sha256-sHXwxWCCVL8Wyo6PAjbA2jj7FXOjCAOezaYKRgk12SM="; + fetchSubmodules = true; }; nativeBuildInputs = [ From 96aad972429b88065aee364c78425677571fa2ac Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:23:28 +0100 Subject: [PATCH 011/150] go-upower-notify: switch to fetchFromGitHub --- pkgs/tools/misc/upower-notify/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index 79460f3a5b79..c46ad10a40af 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # @@ -8,16 +8,22 @@ # ''; buildGoPackage rec { pname = "upower-notify"; - version = "20160310-${lib.strings.substring 0 7 rev}"; - rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; + version = "unstable-2016-03-10"; goPackagePath = "github.com/omeid/upower-notify"; - src = fetchgit { - inherit rev; - url = "https://github.com/omeid/upower-notify"; + src = fetchFromGitHub { + owner = "omeid"; + repo = "upower-notify"; + rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; }; goDeps = ./deps.nix; + + meta = with lib; { + description = "simple tool to give you Desktop Notifications about your battery"; + homepage = "https://github.com/omeid/upower-notify"; + maintainers = with maintainers; [ kamilchm ]; + }; } From a92360c7a613a5f1e2b4c3ef362320efc3bf0362 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:23:46 +0100 Subject: [PATCH 012/150] sdl-jstest: switch to fetchFromGitHub --- pkgs/tools/misc/sdl-jstest/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index c299a140b079..d6c336990cf0 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation { pname = "sdl-jstest"; version = "2018-06-15"; - # Submodules - src = fetchgit { - url = "https://github.com/Grumbel/sdl-jstest"; + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "sdl-jstest"; rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b"; - sha256 = "0p4cjzcq0bbkzad19jwdklylqhq2q390q7dpg8bfzl2rwls883rk"; + sha256 = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw="; + fetchSubmodules = true; }; buildInputs = [ SDL SDL2 ncurses ]; From 6128e1515cbefe80e0c836c83ae299f1c66bd1bb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:23:55 +0100 Subject: [PATCH 013/150] i3cat: switch to fetchFromGitHub --- pkgs/tools/misc/i3cat/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index e91b17856ed7..79e93847932f 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,17 +1,24 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "i3cat"; - version = "20150321-${lib.strings.substring 0 7 rev}"; - rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; + version = "1.0"; goPackagePath = "github.com/vincent-petithory/i3cat"; - src = fetchgit { - inherit rev; - url = "https://github.com/vincent-petithory/i3cat"; - sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; + src = fetchFromGitHub { + owner = "vincent-petithory"; + repo = "i3cat"; + rev = "v${version}"; + sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q="; }; goDeps = ./deps.nix; + + meta = with lib; { + description = "combine multiple i3bar JSON inputs into one to forward to i3bar"; + homepage = "https://vincent-petithory.github.io/i3cat/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } From c0e4a932cdf7a9f8d346c8fbb5ab309ead239beb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:24:10 +0100 Subject: [PATCH 014/150] trustedGrub: switch to fetchFromGitHub --- pkgs/tools/misc/grub/trusted.nix | 46 +++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 13f3c42faa46..4947949ac5bb 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake -, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, fetchpatch +, autogen +, flex +, bison +, python2 +, autoconf +, automake +, gettext +, ncurses +, libusb-compat-0_1 +, freetype +, qemu +, lvm2 , for_HP_laptop ? false }: @@ -32,17 +47,15 @@ stdenv.mkDerivation rec { pname = "trustedGRUB2"; inherit version; - src = if for_HP_laptop - then fetchgit { - url = "https://github.com/Sirrix-AG/TrustedGRUB2"; - rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41"; - sha256 = "1760d9hsnqkdvlag9nn8f613mqhnsxmidgvdkpmb37b0yi7p6lhz"; - } - else fetchgit { - url = "https://github.com/Sirrix-AG/TrustedGRUB2"; - rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76"; - sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k"; - }; + src = fetchFromGitHub { + owner = "Sirrix-AG"; + repo = "TrustedGRUB2"; + rev = version; + sha256 = + if for_HP_laptop + then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw=" + else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns="; + }; nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] @@ -91,9 +104,10 @@ stdenv.mkDerivation rec { ]; # save target that grub is compiled for - grubTarget = if inPCSystems - then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" - else ""; + grubTarget = + if inPCSystems + then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" + else ""; doCheck = false; # On -j16 races with early header creation: From 2653975e7174c7e9191446d6383e030f1394db6e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:27:28 +0100 Subject: [PATCH 015/150] gosu: switch to fetchFromGitHub --- pkgs/tools/misc/gosu/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 033883ab1c8c..d4c233007d26 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gosu"; - version = "2017-05-09"; - rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; + version = "unstable-2017-05-09"; goPackagePath = "github.com/tianon/gosu"; - src = fetchgit { - inherit rev; - url = "https://github.com/tianon/gosu"; - sha256 = "1qp1cfx0hrr4qlnh7rhjb4xlxv9697flmgzzl6jcdkrpk1f0bz8m"; + src = fetchFromGitHub { + owner = "tianon"; + repo = "gosu"; + rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; + sha256 = "sha256-Ff0FXJg3z8akof+/St1JJu1OO1kS5gMtxSRnCLpj4eI="; }; goDeps = ./deps.nix; From 8e9dcca200a1082fea263e89b481c1d0eab2a4fb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:27:41 +0100 Subject: [PATCH 016/150] gawp: switch to fetchFromGitHub --- pkgs/tools/misc/gawp/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 5c7953a766ee..bd102e868aeb 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,18 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: - -with builtins; +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gawp"; - version = "20160121-${lib.strings.substring 0 7 rev}"; - rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; + version = "unstable-2016-01-21"; goPackagePath = "github.com/martingallagher/gawp"; - src = fetchgit { - inherit rev; - url = "https://github.com/martingallagher/gawp"; - sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c"; + src = fetchFromGitHub { + owner = "martingallagher"; + repo = "gawp"; + rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; + sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0="; }; goDeps = ./deps.nix; From 0aed0348efb2f0594fb877faa61f3ced27677f21 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:28:29 +0100 Subject: [PATCH 017/150] azure-vhd-utils: switch to fetchFromGitHub --- pkgs/tools/misc/azure-vhd-utils/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index ad48eae7a87f..79dd9d6b538b 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -1,17 +1,16 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "azure-vhd-utils"; - version = "20160614-${lib.strings.substring 0 7 rev}"; - rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + version = "unstable-2016-06-14"; goPackagePath = "github.com/Microsoft/azure-vhd-utils"; - src = fetchgit { - inherit rev; - url = "https://github.com/Microsoft/azure-vhd-utils"; - sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh"; + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "azure-vhd-utils"; + rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; + sha256 = "sha256-8EH7RpuAeYKd5z64mklKKlFi20KYcx2WhVmkRbdaMy0="; }; goDeps = ./deps.nix; From 6ffdc42cd06ea0165ed6c9634ea04dbee18e30a9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:28:47 +0100 Subject: [PATCH 018/150] go-mtpfs: switch to fetchFromGitHub --- pkgs/tools/filesystems/go-mtpfs/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index bd6e0fe67fc2..6a05d71d0218 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,20 +1,20 @@ -{ pkg-config, libusb1, buildGoPackage, fetchgit }: +{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-mtpfs"; - version = "2018-02-09"; - rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; + version = "unstable-2018-02-09"; goPackagePath = "github.com/hanwen/go-mtpfs"; + src = fetchFromGitHub { + owner = "hanwen"; + repo = "go-mtpfs"; + rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; + sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg="; + }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - src = fetchgit { - inherit rev; - url = "https://github.com/hanwen/go-mtpfs"; - sha256 = "0a0d5dy92nzp1czh87hx3xfdcpa4jh14j0b64c025ha62s9a4gxk"; - }; - goDeps = ./deps.nix; } From 27db42fb3e06004f16f30d92dd3b70dd2ddda631 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:29:01 +0100 Subject: [PATCH 019/150] vobsub2srt: switch to fetchFromGitHub --- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 624bcc08b41f..2d764d2f7da0 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: +{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract }: stdenv.mkDerivation rec { pname = "vobsub2srt"; version = "unstable-2014-08-17"; - rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; - src = fetchgit { - inherit rev; - url = "https://github.com/ruediger/VobSub2SRT.git"; - sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; + src = fetchFromGitHub { + owner = "ruediger"; + repo = "VobSub2SRT"; + rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; + sha256 = "sha256-i6V2Owb8GcTcWowgb/BmdupOSFsYiCF2SbC9hXa26uY="; }; nativeBuildInputs = [ cmake pkg-config ]; From 1441aa2f6ab94a3d32947b7975d5efb621b43543 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:29:19 +0100 Subject: [PATCH 020/150] gvolicon: switch to fetchFromGitHub --- pkgs/tools/audio/gvolicon/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 852f538d6e31..7df594d88ece 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { pname = "gvolicon"; version = "unstable-2014-04-28"; - src = fetchgit { - url = "https://github.com/Unia/gvolicon"; + src = fetchFromGitHub { + owner = "Unia"; + repo = "gvolicon"; rev = "0d65a396ba11f519d5785c37fec3e9a816217a07"; - sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln"; + sha256 = "sha256-lm5OfryV1/1T1RgsVDdp0Jg5rh8AND8M3ighfrznKes="; }; nativeBuildInputs = [ pkg-config ]; From de5c01cdd32332319b9c7100fb7c6b04c4fc28b3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:29:35 +0100 Subject: [PATCH 021/150] bash-my-aws: switch to fetchFromGitHub --- pkgs/tools/admin/bash-my-aws/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/tools/admin/bash-my-aws/default.nix index 7d2f878f742d..9ca14bbe3376 100644 --- a/pkgs/tools/admin/bash-my-aws/default.nix +++ b/pkgs/tools/admin/bash-my-aws/default.nix @@ -3,19 +3,20 @@ , awscli , jq , unixtools -, fetchgit +, fetchFromGitHub , installShellFiles , bashInteractive }: stdenv.mkDerivation rec { pname = "bash-my-aws"; - version = "20200111"; + version = "unstable-2020-01-11"; - src = fetchgit { - url = "https://github.com/bash-my-aws/bash-my-aws"; + src = fetchFromGitHub { + owner = "bash-my-aws"; + repo = "bash-my-aws"; rev = "5a97ce2c22affca1299022a5afa109d7b62242ba"; - sha256 = "459bda8b244af059d96c7c8b916cf956b01cb2732d1c2888a3ae06a4d660bea6"; + sha256 = "sha256-RZvaiyRK8FnZbHyLkWz5VrAcsnMtHCiIo64GpNZgvqY="; }; dontConfigure = true; From 2ef96d712bfa76ca4d03d9027cffe703b910da14 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:29:52 +0100 Subject: [PATCH 022/150] morty: switch to fetchFromGitHub --- pkgs/servers/web-apps/morty/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index 04f1e14d5ccf..85731d14d63f 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "morty"; @@ -6,10 +6,11 @@ buildGoPackage rec { goPackagePath = "github.com/asciimoo/morty"; - src = fetchgit { + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "morty"; rev = "v${version}"; - url = "https://github.com/asciimoo/morty"; - sha256 = "1wvrdlwbpzizfg7wrcfyf1x6qllp3aw425n88z516wc9jalfqrrm"; + sha256 = "sha256-NWfsqJKJcRPKR8gWQbgal1JsenDesczPcz/+uzhtefM="; }; goDeps = ./deps.nix; @@ -37,6 +38,6 @@ buildGoPackage rec { * No Caching/Etag * Supports GET/POST forms and IFrames * Optional HMAC URL verifier key to prevent service abuse -''; - }; + ''; + }; } From 85f87b2c7e8e188cb42a964431d266012cc96527 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:30:18 +0100 Subject: [PATCH 023/150] scylladb: switch to fetchFromGitHub --- pkgs/servers/scylladb/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index 2ae3d9f486fb..d44885360f9a 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -1,6 +1,6 @@ { lib, - fetchgit, + fetchFromGitHub, python3Packages, pkg-config, gcc8Stdenv, @@ -34,10 +34,11 @@ gcc8Stdenv.mkDerivation { pname = "scylladb"; version = "3.0.5"; - src = fetchgit { - url = "https://github.com/scylladb/scylla.git"; + src = fetchFromGitHub { + owner = "scylladb"; + repo = "scylla"; rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13"; - sha256 = "14mg0kzpkrxvwqyiy19ndy4rsc7s5gnv2gwd3xdwm1lx1ln8ywsi"; + sha256 = "sha256-UXOPLA2dhspbH40/se0r+jCdiW82BR895rvnef8Er5I="; fetchSubmodules = true; }; From 984f4a8c575f344bcb9a88ca3649a3947a40df98 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:32:43 +0100 Subject: [PATCH 024/150] ps3netsrv: switch to fetchFromGitHub --- pkgs/servers/ps3netsrv/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 6ee0e3ea366b..12c4e2545a5a 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "ps3netsrv"; @@ -6,11 +6,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; - src = fetchgit { - url = "https://github.com/dirkvdb/ps3netsrv--"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "dirkvdb"; + repo = "ps3netsrv--"; rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; - sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa"; + sha256 = "sha256-SpPyRhPwOhTONAYH/eqLGmVl2XzhA1r1nUwKj7+rGyY="; + fetchSubmodules = true; }; buildPhase = "make CXX=$CXX"; From 45740c7e89bc75d401f4423c5ca9d062348b02a3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 15:33:00 +0100 Subject: [PATCH 025/150] lightdm-enso-os-greeter: switch to fetchFromGitHub --- .../lightdm-enso-os-greeter/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index ea7fc1375747..e84f305526b4 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { - version = "0.2.1"; pname = "lightdm-enso-os-greeter"; + version = "0.2.1"; - src = fetchgit { - url = "https://github.com/nick92/Enso-OS"; + src = fetchFromGitHub { + owner = "nick92"; + repo = "Enso-OS"; rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; - sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; + sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY="; }; patches = [ From fb8a6c02bcb202c1558896d116e0d0dfa73acebb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 16:12:37 +0100 Subject: [PATCH 026/150] rippled: switch to fetchFromGitHub --- pkgs/servers/rippled/data-api.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index a2de1d8fad3a..b0d63905ff96 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, nodePackages }: +{ lib, fetchFromGitHub, nodePackages }: with lib; @@ -6,13 +6,13 @@ let np = nodePackages.override { generated = ./package.nix; self = np; }; in nodePackages.buildNodePackage rec { pname = "ripple-data-api"; - version = lib.strings.substring 0 7 rev; - rev = "c56b860105f36c1c44ae011189d495272648c589"; + version = "unstable-2015-03-26"; - src = fetchgit { - url = "https://github.com/ripple/ripple-data-api.git"; - inherit rev; - sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m"; + src = fetchFromGitHub { + owner = "ripple"; + repo = "ripple-data-api"; + rev = "c56b860105f36c1c44ae011189d495272648c589"; + sha256 = "sha256-QEBdYdW55sAz6jshIAr2dSfXuqE/vqA2/kBeoxf75a8="; }; deps = (filter (v: nixType v == "derivation") (attrValues np)); From cfc95ec96f3453605cc7d9fa616d75c5256dd2c0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 18:56:12 +0100 Subject: [PATCH 027/150] brickd: switch to fetchFromGitHub --- pkgs/servers/brickd/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index b29f9ca9e8e0..3977521a6f52 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} : +{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config, pmutils, udev} : let - -version = "2.1.1"; -daemonlib = fetchgit { - url = "https://github.com/Tinkerforge/daemonlib.git"; - rev = "refs/tags/brickd-${version}"; - sha256 = "097kaz7d0rzg0ijvcna3y620k3m5fgxpqsac5gbhah8pd7vlj1a4"; + version = "2.1.1"; + daemonlib = fetchFromGitHub { + owner = "Tinkerforge"; + repo = "daemonlib"; + rev = "brickd-${version}"; + sha256 = "sha256-0HhuC4r1S4NJa2FSJa7+fNCfcoRTBckikYbGSE+2FbE="; }; - in stdenv.mkDerivation { pname = "brickd"; inherit version; - src = fetchgit { - url = "git://github.com/Tinkerforge/brickd.git"; - rev = "refs/tags/v${version}"; - sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; + src = fetchFromGitHub { + owner = "Tinkerforge"; + repo = "brickd"; + rev = "v${version}"; + sha256 = "sha256-6w2Ew+dLMmdRf9CF3TdKHa0d5ZgmX5lKIR+5t3QAWFQ="; }; nativeBuildInputs = [ pkg-config ]; From 8af8ab0f0ea77ba560e4c1e5732848f3e3b4d59d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Mar 2022 19:11:32 +0100 Subject: [PATCH 028/150] usermount: switch to fetchFromGitHub --- pkgs/os-specific/linux/usermount/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 87b38b9af6e4..934367dcd11b 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { pname = "usermount"; version = "0.1"; - src = fetchgit { - url = "https://github.com/tom5760/usermount.git"; + src = fetchFromGitHub { + owner = "tom5760"; + repo = "usermount"; rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4"; - sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; + sha256 = "sha256-giMHUVYdAygiemYru20VxpQixr5aGgHhevNkHvkG9z4="; }; nativeBuildInputs = [ pkg-config ]; From 2cfd9d259329c99f6dfdf68508561087ab7fd577 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:25:23 +0100 Subject: [PATCH 029/150] lightum: switch to fetchFromGitHub --- pkgs/os-specific/linux/lightum/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 8da12d78bc93..95b766aec05b 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: +{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { pname = "lightum"; version = "unstable-2014-06-07"; - src = fetchgit { - url = "https://github.com/poliva/lightum"; + + src = fetchFromGitHub { + owner = "poliva"; + repo = "lightum"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; - sha256 = "01x24rcrkgksyvqpgkr9zafg3jgs8nqng8yf0hx0kbmcimar8dbp"; + sha256 = "sha256-dzWUVY2srgk6BM6jZ7FF+snxnPopz3fx9nq+mVkmogc="; }; buildInputs = [ From c3857b318e080f642b9cd6bc247598f3090a3d5d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:25:41 +0100 Subject: [PATCH 030/150] rt5677-firmware: switch to fetchFromGitHub --- pkgs/os-specific/linux/firmware/rt5677/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix index f5d84179fd29..f21d34bbe533 100644 --- a/pkgs/os-specific/linux/firmware/rt5677/default.nix +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "rt5677-firmware"; - src = fetchgit { - url = "https://github.com/raphael/linux-samus"; + src = fetchFromGitHub { + owner = "raphael"; + repo = "linux-samus"; rev = "995de6c2093797905fbcd79f1a3625dd3f50be37"; - sha256 = "0a6lz9wadm47cmva136q6wd0lw03bmymf9ispnzb091a7skwacry"; + sha256 = "sha256-PjPFpz4qJLC+vTomV31dA3AKGjfYjKB2ZYfUpnj61Cg="; }; - installPhase = '' mkdir -p $out/lib/firmware cp ./firmware/rt5677_elf_vad $out/lib/firmware From e5c1b1f17eb3764112a13592b8a10576e2974ab6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:26:01 +0100 Subject: [PATCH 031/150] xtrlock-pam: switch to fetchFromGitHub --- pkgs/misc/screensavers/xtrlock-pam/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index ffb9d0da8570..ac4c8197e554 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }: +{ lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { pname = "xtrlock-pam"; version = "3.4-post-20150909"; - src = fetchgit { - url = "https://github.com/aanatoly/xtrlock-pam"; + src = fetchFromGitHub { + owner = "aanatoly"; + repo = "xtrlock-pam"; rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6"; - sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; + sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw="; }; nativeBuildInputs = [ pkg-config ]; From 8322c182fa52f2c53454c8aacf14dfac55f256e7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:26:15 +0100 Subject: [PATCH 032/150] alock: switch to fetchFromGitHub --- pkgs/misc/screensavers/alock/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 5f0c5ad9e29e..87c81531122a 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchgit, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { pname = "alock"; version = "unstable-2017-07-20"; - src = fetchgit { - url = "https://github.com/Arkq/alock"; + src = fetchFromGitHub { + owner = "Arkq"; + repo = "alock"; rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; - sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; + sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8="; }; PAM_DEFAULT_SERVICE = "login"; From 821348523f1a9fa42d595b7134dbbdad1c582fdf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:26:31 +0100 Subject: [PATCH 033/150] ws: switch to fetchFromGitHub --- pkgs/development/tools/ws/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index bef8eb906cf1..95013006010d 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,17 +1,16 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "ws"; version = "0.2.1"; - rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; goPackagePath = "github.com/hashrocket/ws"; - src = fetchgit { - inherit rev; - url = "https://github.com/hashrocket/ws"; - sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; + src = fetchFromGitHub { + owner = "hashrocket"; + repo = "ws"; + rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; + sha256 = "sha256-q6c761Evz7Q6nH1fHgEn2uCFokoN0OzqhyxIFn6mWqQ="; }; meta = with lib; { From 2c02eb4aa93d4d2be385299ebea3fb58195660cf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:26:48 +0100 Subject: [PATCH 034/150] rtags: switch to fetchFromGitHub --- pkgs/development/tools/rtags/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 6ecbe058328f..6693e80e1161 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: +{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: stdenv.mkDerivation rec { pname = "rtags"; @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; - src = fetchgit { - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "andersbakken"; + repo = "rtags"; + rev = "v${version}"; + sha256 = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; fetchSubmodules = true; - url = "https://github.com/andersbakken/rtags.git"; - sha256 = "1iwvp7a69sj3wqjgcnyh581qrpicxzi2lfjkxqpabpyjkl5nk7hh"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' From c087e36fdda02037c873114ab9d743407923b58b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:27:03 +0100 Subject: [PATCH 035/150] ycmd: switch to fetchFromGitHub --- pkgs/development/tools/misc/ycmd/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index f77ced3a2ada..5853d40eceb1 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python +{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, boost, python , withGocode ? true, gocode , withGodef ? true, godef , withGotools? true, gotools @@ -12,10 +12,12 @@ stdenv.mkDerivation { disabled = !python.isPy3k; # required for third_party directory creation - src = fetchgit { - url = "https://github.com/Valloric/ycmd.git"; + src = fetchFromGitHub { + owner = "Valloric"; + repo = "ycmd"; rev = "9a6b86e3a156066335b678c328f226229746bae5"; - sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; + sha256 = "sha256-xzLELjp4DsG6mkzaFqpuquSa0uoaZWrYLrKr/mzrqrA="; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ] From b4e01326d7b81ee3a4e9b7339848743b4458e99e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:27:19 +0100 Subject: [PATCH 036/150] Literate: switch to fetchFromGitHub --- .../tools/literate-programming/Literate/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 88b2f63fd5a5..1582ca874026 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchgit, ldc, dub }: +{ lib, stdenv, fetchFromGitHub, ldc, dub }: stdenv.mkDerivation { pname = "Literate"; version = "unstable-2021-01-22"; - src = fetchgit { - url = "https://github.com/zyedidia/Literate.git"; + src = fetchFromGitHub { + owner = "zyedidia"; + repo = "Literate"; rev = "7004dffec0cff3068828514eca72172274fd3f7d"; - sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs"; + sha256 = "sha256-erNFe0+FlrslEENyO/YxYQbmec0voK31UWr5qVt+nXQ="; + fetchSubmodules = true; }; buildInputs = [ ldc dub ]; From ae6e3ae0e2508df7812a2a2e2c79a7f75bf2cb64 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 10:27:32 +0100 Subject: [PATCH 037/150] jd: switch to fetchFromGitHub --- pkgs/development/tools/jd/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix index 96d2807b9ab9..f6ed3f59ac0d 100644 --- a/pkgs/development/tools/jd/default.nix +++ b/pkgs/development/tools/jd/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jd"; version = "0.3.1"; - rev = "2729b5af166cfd72bd953ef8959b456c4db940fc"; goPackagePath = "github.com/tidwall/jd"; - src = fetchgit { - inherit rev; - url = "https://github.com/tidwall/jd"; - sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h"; + src = fetchFromGitHub { + owner = "tidwall"; + repo = "jd"; + rev = "2729b5af166cfd72bd953ef8959b456c4db940fc"; + sha256 = "sha256-sNiKPlpnASJs0gKLpyfRxQjZRN9JaCvPoQ0gd9GYRDY="; }; meta = with lib; { From 9aeb5a8d01c5272af88eaf3dac8be6e5cece899c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 11:52:44 +0100 Subject: [PATCH 038/150] haskellPackages.dconf2nix: switch to fetchFromGitHub --- pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 6ac6605797eb..8d6e19124711 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,14 +1,14 @@ -{ mkDerivation, base, containers, fetchgit, hedgehog, lib +{ mkDerivation, base, containers, fetchFromGitHub, hedgehog, lib , optparse-applicative, parsec, template-haskell, text }: mkDerivation { pname = "dconf2nix"; version = "0.0.11"; - src = fetchgit { - url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "1kv88bxi7l5kcm66m5y85b8fz1zsdshvw37k715g2biwa0an5s6f"; + src = fetchFromGitHub { + owner = "gvolpe"; + repo = "dconf2nix"; rev = "fe7e3d973caa87b1b706096aff3d670f65e39fda"; - fetchSubmodules = true; + sha256 = "sha256-zuhiFVA8LvFKOPMMvqFu+ofv0CrIl2pMZbPQE/tCaM8="; }; isLibrary = true; isExecutable = true; From b6ea3447c8237f4a3e7aa7432882b45368cc92fc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 11:53:01 +0100 Subject: [PATCH 039/150] gotags: switch to fetchFromGitHub --- pkgs/development/tools/gotags/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 274f7a476c2b..0a55fc66830f 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,15 +1,15 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotags"; - version = "20150803-${lib.strings.substring 0 7 rev}"; - rev = "be986a34e20634775ac73e11a5b55916085c48e7"; + version = "unstable-2015-08-03"; goPackagePath = "github.com/jstemmer/gotags"; - src = fetchgit { - inherit rev; - url = "https://github.com/jstemmer/gotags"; - sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja"; + src = fetchFromGitHub { + owner = "jstemmer"; + repo = "gotags"; + rev = "be986a34e20634775ac73e11a5b55916085c48e7"; + sha256 = "sha256-Su7AA6HCdeZai8+yRSKzlrgXvsSEgrXGot2ABRL2PBw="; }; } From ba61695222b5170245cdecdc922f296c636a881e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 11:53:19 +0100 Subject: [PATCH 040/150] go-repo-root: switch to fetchFromGitHub --- pkgs/development/tools/go-repo-root/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index b7653aa144e4..d17b2d0c5388 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-repo-root"; - version = "20140911-${lib.strings.substring 0 7 rev}"; - rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + version = "unstable-2014-09-11"; goPackagePath = "github.com/cstrahan/go-repo-root"; - src = fetchgit { - inherit rev; - url = "https://github.com/cstrahan/go-repo-root"; - sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; + src = fetchFromGitHub { + owner = "cstrahan"; + repo = "go-repo-root"; + rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y="; }; goDeps = ./deps.nix; From 79a4f02481e94ddc3c659ee6d6ed9564400a8e46 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 12:11:11 +0100 Subject: [PATCH 041/150] svg2tikz: switch to fetchFromGitHub --- pkgs/development/python-modules/svg2tikz/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 38516ab73c3e..c15e88ebeb24 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , lxml , isPy27 }: @@ -12,10 +12,12 @@ buildPythonPackage { propagatedBuildInputs = [ lxml ]; - src = fetchgit { - url = "https://github.com/kjellmf/svg2tikz"; - sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; + src = fetchFromGitHub { + owner = "kjellmf"; + repo = "svg2tikz"; rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; + sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8="; + fetchSubmodules = true; }; meta = with lib; { From 9d349d6a482cbaad82d51399bc3b223f55c9e01c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 10 Mar 2022 15:19:46 +0100 Subject: [PATCH 042/150] python3-scikits.samplerate: switch to fetchFromGitHub --- pkgs/development/python-modules/samplerate/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 9c26c9e2e2b3..99424bbc67c2 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , numpy , pkgs +, fetchFromGitHub }: buildPythonPackage { pname = "scikits.samplerate"; version = "0.3.3"; - src = pkgs.fetchgit { - url = "https://github.com/cournape/samplerate"; + src = fetchFromGitHub { + owner = "cournape"; + repo = "samplerate"; rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; - sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; + sha256 = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU="; }; buildInputs = [ pkgs.libsamplerate ]; From 97b380587f3e4416a15e0537714c207d6a7e57d3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 10 Mar 2022 18:13:19 +0100 Subject: [PATCH 043/150] python3Packages.mutag: switch to fetchFromGitHub --- pkgs/development/python-modules/mutag/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index ee190008f592..b9701073e0bd 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , isPy3k , pyparsing }: @@ -10,10 +10,11 @@ buildPythonPackage { version = "0.0.2-2ffa0258ca"; disabled = ! isPy3k; - src = fetchgit { - url = "https://github.com/aroig/mutag.git"; - sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1"; + src = fetchFromGitHub { + owner = "aroig"; + repo = "mutag"; rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; + sha256 = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs="; }; propagatedBuildInputs = [ pyparsing ]; From fca3e2ac936829c5a7213188db442b7f9dc63c9c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 10 Mar 2022 18:13:38 +0100 Subject: [PATCH 044/150] python3Packages.editorconfig: switch to fetchFromGitHub --- .../python-modules/editorconfig/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 6449a3da767c..520167c100f1 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cmake }: @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "editorconfig"; version = "0.12.3"; - # fetchgit used to ensure test submodule is available - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged - sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-py"; + rev = "v${version}"; + sha256 = "sha256-KwfGWc2mYhUP6SN4vhIO0eX0dasBRC2LSeLEOA/NqG8="; + fetchSubmodules = true; }; nativeBuildInputs = [ From 47157bf539df081f13a828e213de91b67f52516e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Mar 2022 06:37:36 +0000 Subject: [PATCH 045/150] frugal: 3.14.15 -> 3.15.0 --- pkgs/development/tools/frugal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 5cb92b3b834b..ae0db9da3074 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.15"; + version = "3.15.0"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7840HndsU5+mWKQ/HXLVYA2dV7L8NlM7so1nk8Zdc2c="; + sha256 = "sha256-EIHaCkqwCyRV1sX+9f39FbByRvhms4rJA9nQoKxxkm8="; }; subPackages = [ "." ]; From d2c297a6a5c108b07c4d16e5b426f4a84b783b83 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:16:42 +0100 Subject: [PATCH 046/150] phpExtensions.memcached: switch to fetchFromGitHub --- .../php-packages/memcached/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 0aea58572cba..2a9d6685b7ca 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -1,15 +1,14 @@ -{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }: -let +{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }: + +buildPecl rec { pname = "memcached"; version = "3.1.5"; -in -buildPecl { - inherit pname version; - src = fetchgit { - url = "https://github.com/php-memcached-dev/php-memcached"; + src = fetchFromGitHub { + owner = "php-memcached-dev"; + repo = "php-memcached"; rev = "v${version}"; - sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; + sha256 = "sha256-AA3JakWxjk7HQl+8FEEGqLVNYHrjITZg3G25OaqAqwY="; }; internalDeps = [ From dfff76aa14d6c1a5f90ad7ab7374ac1b8110ea21 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:17:03 +0100 Subject: [PATCH 047/150] haskellPackages.hercules-ci-optparse-applicative: switch to fetchFromGitHub --- .../misc/haskell/hercules-ci-optparse-applicative.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix index 17bedd5e7d32..5c0b6b0eecb3 100644 --- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix +++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -1,13 +1,14 @@ -{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck +{ mkDerivation, ansi-wl-pprint, base, fetchFromGitHub, lib, process, QuickCheck , transformers, transformers-compat }: mkDerivation { pname = "hercules-ci-optparse-applicative"; version = "0.16.1.0"; - src = fetchgit { - url = "https://github.com/hercules-ci/optparse-applicative.git"; - sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp"; + src = fetchFromGitHub { + owner = "hercules-ci"; + repo = "optparse-applicative"; rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e"; + sha256 = "sha256-11MnpQjmR89gW5WY5BwsPhpk/LwSIxEEhIa4LLiCbBc="; }; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat From 7bbf666c9ff9b19fbd50720d8bbc421bd3615be8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:17:25 +0100 Subject: [PATCH 048/150] hydraAntLogger: switch to fetchFromGitHub --- .../libraries/java/hydra-ant-logger/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 19bc3524c590..4b18cd7cfadc 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,13 +1,14 @@ -{ fetchgit, lib, stdenv, ant, jdk }: +{ fetchFromGitHub, lib, stdenv, ant, jdk }: stdenv.mkDerivation { pname = "hydra-ant-logger"; version = "2010.2"; - src = fetchgit { - url = "https://github.com/NixOS/hydra-ant-logger.git"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra-ant-logger"; rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; - sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176"; + sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; }; buildInputs = [ ant jdk ]; From 339ccbe93376df53ead60c810cb05fef830493a9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:19:51 +0100 Subject: [PATCH 049/150] lispPackages.quicklisp: switch to fetchFromGitHub --- pkgs/development/lisp-modules/lisp-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 7a7cc165fe51..fe31e2ba348b 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -14,10 +14,11 @@ let lispPackages = rec { description = "The Common Lisp package manager"; deps = []; - src = pkgs.fetchgit { - url = "https://github.com/quicklisp/quicklisp-client/"; - rev = "refs/tags/version-${version}"; - sha256 = "sha256:102f1chpx12h5dcf659a9kzifgfjc482ylf73fg1cs3w34zdawnl"; + src = pkgs.fetchFromGitHub { + owner = "quicklisp"; + repo = "quicklisp-client"; + rev = "version-${version}"; + sha256 = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA="; }; overrides = x: rec { inherit clwrapper; From 28ff2255a41c8d13129fa3942ecd0c8f77d3811e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:20:10 +0100 Subject: [PATCH 050/150] pixie: switch to fetchFromGitHub --- pkgs/development/interpreters/pixie/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index ca55eceaedbf..5b93357b2665 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, +{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -11,10 +11,11 @@ let no-jit = { flags = ""; target = "target.py"; }; no-jit-preload = { flags = ""; target = "target_preload.py"; }; }; - pixie-src = fetchgit { - url = "https://github.com/pixie-lang/pixie.git"; + pixie-src = fetchFromGitHub { + owner = "pixie-lang"; + repo = "pixie"; rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62"; - sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm"; + sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10="; }; pypy-tag = "91db1a9"; pypy-src = fetchurl { From 9feb246fb84bf7239e8e1de388a4edbd45ebc644 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:20:25 +0100 Subject: [PATCH 051/150] ceptre: switch to fetchFromGitHub --- pkgs/development/interpreters/ceptre/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 56d37dd4e947..9771a8f72d2a 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: stdenv.mkDerivation { pname = "ceptre"; version = "unstable-2016-11-27"; - src = fetchgit { - url = "https://github.com/chrisamaphone/interactive-lp"; + src = fetchFromGitHub { + owner = "chrisamaphone"; + repo = "interactive-lp"; rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; - sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8"; + sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; + fetchSubmodules = true; }; nativeBuildInputs = [ mlton ]; From aaa85855ca3e4be34bd61a3c06ca0d4898a2a89a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:20:44 +0100 Subject: [PATCH 052/150] bossa: switch to fetchFromGitHub --- pkgs/development/embedded/bossa/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index 4e35ff35f660..fbb1b4c1fd40 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wxGTK, libX11, readline }: +{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }: let # BOSSA needs a "bin2c" program to embed images. @@ -13,14 +13,15 @@ let }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bossa"; version = "1.8"; - src = fetchgit { - url = "https://github.com/shumatech/BOSSA"; - rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; - sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; + src = fetchFromGitHub { + owner = "shumatech"; + repo = "BOSSA"; + rev = version; + sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y="; }; patches = [ ./bossa-no-applet-build.patch ]; From fe193e7dd25b366c57647e4b0edc7ac6498d6545 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:20:59 +0100 Subject: [PATCH 053/150] opendylan: switch to fetchFromGitHub --- pkgs/development/compilers/opendylan/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 1ffc85a6ada5..f9ab0714b470 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -1,14 +1,15 @@ # Build Open Dylan from source using the binary builds to bootstrap. -{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: +{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { pname = "opendylan"; version = "2016.1pre"; - src = fetchgit { - url = "https://github.com/dylan-lang/opendylan"; + src = fetchFromGitHub { + owner = "dylan-lang"; + repo = "opendylan"; rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; - sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; + sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM="; fetchSubmodules = true; }; From 7c71e8438cdadbbbb8437c0bc501f6f4c3ec3a1e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:21:12 +0100 Subject: [PATCH 054/150] nim: switch to fetchFromGitHub --- pkgs/development/compilers/nim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4f3b200477f0..4b0e6e618e3a 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -78,11 +78,11 @@ let pname = "nim-bootstrap"; version = "g${lib.substring 0 7 revision}"; - src = fetchgit { - # A Git checkout is much smaller than a GitHub tarball. - url = "https://github.com/nim-lang/csources_v1.git"; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "csources_v1"; rev = revision; - sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043"; + sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A="; }; enableParallelBuilding = true; From 013d4cc072f4963e5784a700cc415103d12f303b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:24:44 +0100 Subject: [PATCH 055/150] aldor: switch to fetchFromGitHub --- pkgs/development/compilers/aldor/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 1b87b508b6a1..ace8a3d2de39 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -1,14 +1,15 @@ -{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper +{ fetchFromGitHub, lib, stdenv, gmp, which, flex, bison, makeWrapper , autoconf, automake, libtool, jdk, perl }: stdenv.mkDerivation { pname = "aldor"; version = "1.2.0"; - src = fetchgit { - url = "https://github.com/pippijn/aldor"; - sha256 = "19v07ffq4r1gjnmg7a8ifgjkwan9a3rwbj0qjz8fycwy221844m6"; + src = fetchFromGitHub { + owner = "aldorlang"; + repo = "aldor"; rev = "15471e75f3d65b93150f414ebcaf59a03054b68d"; + sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc="; }; nativeBuildInputs = [ makeWrapper ]; From 5e7566170835cbf7572f2265008e475a9907ee9c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:25:14 +0100 Subject: [PATCH 056/150] chez-srfi: switch to fetchFromGitHub --- pkgs/development/chez-modules/chez-srfi/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index 1d8579ae106e..1780a1356c5c 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez }: +{ stdenv, lib, fetchFromGitHub, chez }: stdenv.mkDerivation { pname = "chez-srfi"; version = "1.0"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-srfi.git"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-srfi"; rev = "5770486c2a85d0e3dd4ac62a97918e7c394ea507"; - sha256 = "1s47v7b7w0ycd2g6gyv8qbzmh4jjln5iday8n9l3m996ns8is9zj"; + sha256 = "sha256-8icdkbYmpTpossirFoulUhJY/8Jo+2eeaMwDftbZh+g="; }; buildInputs = [ chez ]; From e5346e0f294567a41e001ddf24a8c28c900e74ac Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:25:26 +0100 Subject: [PATCH 057/150] chez-scmutils: switch to fetchFromGitHub --- .../chez-modules/chez-scmutils/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index 39c1f73003e9..59aedd29f0ec 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }: +{ stdenv, lib, fetchFromGitHub, chez, chez-srfi, chez-mit }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "chez-scmutils"; - version = "1.0"; + version = "0.1"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-scmutils.git"; - rev = "5eaeea6289fd239358d7eed99cc9588528fb52b2"; - sha256 = "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-scmutils"; + rev = "v${version}"; + sha256 = "sha256-9GBoHbLNEnPz81s2rBYO3S0bXldetwc8eu9i5CgvYFE="; }; buildInputs = [ chez chez-srfi chez-mit ]; From aaccd19948ebeecb3107fb098fafcd20ce8eaa9b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:25:39 +0100 Subject: [PATCH 058/150] chez-mit: switch to fetchFromGitHub --- .../development/chez-modules/chez-mit/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index b3a2a44d2780..10407598fb96 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez, chez-srfi }: +{ stdenv, lib, fetchFromGitHub, chez, chez-srfi }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "chez-mit"; - version = "1.0"; + version = "0.1"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-mit.git"; - rev = "68f3d7562e77f694847dc74dabb5ecbd106cd6be"; - sha256 = "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-mit"; + rev = "v${version}"; + sha256 = "sha256-YM4/Sj8otuWJCrUBsglVnihxRGI32F6tSbODFM0a8TA="; }; buildInputs = [ chez chez-srfi ]; From 84fe8734f63afb08d70a41f43f4d1100c81d6492 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:25:59 +0100 Subject: [PATCH 059/150] rictydiminished-with-firacode: switch to fetchFromGitHub --- .../data/fonts/rictydiminished-with-firacode/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index ceed83070040..c8d8ca42f9e4 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, fontforge, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; version = "1.2.2"; - src = fetchgit { - url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; + src = fetchFromGitHub { + owner = "hakatashi"; + repo = "RictyDiminished-with-FiraCode"; rev = version; - sha256 = "0khnbp1y5xrd77gfb2b19mzi3ll07im3d0rlbciwbq0cn347f25p"; + sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; fetchSubmodules = true; }; From b5d1310056382d31c30e8fbbb4fc0efc822f85fe Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:26:16 +0100 Subject: [PATCH 060/150] btops: switch to fetchFromGitHub --- pkgs/applications/window-managers/btops/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index 5f107337ee44..a837c435204a 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -1,5 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "btops"; @@ -7,10 +6,11 @@ buildGoPackage rec { goPackagePath = "github.com/cmschuetz/btops"; - src = fetchgit { - url = "https://github.com/cmschuetz/btops.git"; + src = fetchFromGitHub { + owner = "cmschuetz"; + repo = "btops"; rev = version; - sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq"; + sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY="; }; goDeps = ./deps.nix; From ba4c657bdac39a935ee2e8e3625b4a81dcec3951 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:26:26 +0100 Subject: [PATCH 061/150] spike: switch to fetchFromGitHub --- pkgs/applications/virtualization/spike/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 7db42c71092f..cc2489356c5d 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchgit, dtc, fetchpatch, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; version = "1.0.0"; - src = fetchgit { - url = "https://github.com/riscv/riscv-isa-sim.git"; + src = fetchFromGitHub { + owner = "riscv"; + repo = "riscv-isa-sim"; rev = "v${version}"; sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww"; }; From f8684d34e99bdaf3d6c01d05dfb236a19dd10eb7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:26:37 +0100 Subject: [PATCH 062/150] cntk: switch to fetchFromGitHub --- pkgs/applications/science/math/cntk/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index ba2225b903fa..eb14982575a2 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , fetchpatch , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false @@ -22,11 +22,12 @@ in stdenv.mkDerivation rec { pname = "CNTK"; version = "2.7"; - # Submodules - src = fetchgit { - url = "https://github.com/Microsoft/CNTK"; + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "CNTK"; rev = "v${version}"; - sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; + sha256 = "sha256-2rIrPJyvZhnM5EO6tNhF6ARTocfUHce4N0IZk/SZiaI="; + fetchSubmodules = true; }; patches = [ From ee2a1e3a1986536d97a35c0ae163bcf914921b22 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:26:51 +0100 Subject: [PATCH 063/150] mmex: switch to fetchFromGitHub --- pkgs/applications/office/mmex/default.nix | 55 +++++++++++------------ 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 7113997c90f3..c5a4e93de785 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -1,35 +1,32 @@ -{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }: - -let +stdenv.mkDerivation rec { + pname = "money-manager-ex"; version = "1.3.3"; -in - stdenv.mkDerivation { - pname = "money-manager-ex"; - inherit version; - src = fetchgit { - url = "https://github.com/moneymanagerex/moneymanagerex.git"; - rev = "refs/tags/v${version}"; - sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74"; - }; + src = fetchFromGitHub { + owner = "moneymanagerex"; + repo = "moneymanagerex"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ="; + }; - nativeBuildInputs = [ - wrapGAppsHook - ]; + nativeBuildInputs = [ + wrapGAppsHook + ]; - buildInputs = [ - gettext - sqlite - wxGTK30 - wxGTK30.gtk - ]; + buildInputs = [ + gettext + sqlite + wxGTK30 + wxGTK30.gtk + ]; - meta = { - description = "Easy-to-use personal finance software"; - homepage = "https://www.moneymanagerex.org/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; - }; - } + meta = { + description = "Easy-to-use personal finance software"; + homepage = "https://www.moneymanagerex.org/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; + }; +} From 27af61265b8fcfbd156360a93eed1417ab943ef3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:27:02 +0100 Subject: [PATCH 064/150] communi: switch to fetchFromGitHub --- pkgs/applications/networking/irc/communi/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index df7168ac308e..c8c36049a2a4 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,13 +1,14 @@ -{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: +{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "communi"; version = "3.5.0"; - src = fetchgit { - url = "https://github.com/communi/communi-desktop.git"; + src = fetchFromGitHub { + owner = "communi"; + repo = "communi-desktop"; rev = "v${version}"; - sha256 = "10grskhczh8601s90ikdsbjabgr9ypcp2j7vivjkl456rmg6xbji"; + sha256 = "sha256-Ua5uXs2mEDrljvtIcdn1Kb+l5NJtRpB0AAbBz+DU+YE="; fetchSubmodules = true; }; From afb9c15341303b7d28d9326b90bddff6c1182643 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:27:23 +0100 Subject: [PATCH 065/150] git-annex-remote-b2: switch to fetchFromGitHub --- .../git-and-tools/git-annex-remote-b2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 6d3b65547330..c32d29f2561a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-annex-remote-b2"; - version = "20151212-${lib.strings.substring 0 7 rev}"; - rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; + version = "unstable-2015-12-12"; goPackagePath = "github.com/encryptio/git-annex-remote-b2"; - src = fetchgit { - inherit rev; - url = "https://github.com/encryptio/git-annex-remote-b2"; - sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; + src = fetchFromGitHub { + owner = "encryptio"; + repo = "git-annex-remote-b2"; + rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; + sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ="; }; goDeps = ./deps.nix; From bf316c83076005b15bf6c1b5ce7e161dc05eb430 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:27:46 +0100 Subject: [PATCH 066/150] tensor: switch to fetchFromGitHub --- .../networking/instant-messengers/tensor/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 2d5f6e2dfb72..cbc93857c819 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,7 +1,7 @@ { mkDerivation , lib , stdenv -, fetchgit +, fetchFromGitHub , qtbase , qtquickcontrols , qmake @@ -15,10 +15,11 @@ mkDerivation rec { pname = "tensor"; version = "unstable-2017-02-21"; - src = fetchgit { - url = "https://github.com/davidar/tensor.git"; + src = fetchFromGitHub { + owner = "davidar"; + repo = "tensor"; rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY="; fetchSubmodules = true; }; From b5bbff0e029015f46a04050b4a96ed63cbaa6402 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:28:46 +0100 Subject: [PATCH 067/150] schildichat-web: switch to fetchFromGitHub --- .../instant-messengers/schildichat/schildichat-web.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index f9e00c06470a..a7ad6fb4d9b1 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -1,5 +1,5 @@ { stdenv, lib -, fetchgit +, fetchFromGitHub , fetchYarnDeps , nodejs , yarn @@ -18,8 +18,9 @@ in stdenv.mkDerivation rec { pname = "schildichat-web"; inherit (pinData) version; - src = fetchgit { - url = "https://github.com/SchildiChat/schildichat-desktop/"; + src = fetchFromGitHub { + owner = "SchildiChat"; + repo = "schildichat-desktop"; inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; From 7288417b83740407dc9e1be7cbcdf9261a146490 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:28:56 +0100 Subject: [PATCH 068/150] schildichat-desktop: switch to fetchFromGitHub --- .../instant-messengers/schildichat/schildichat-desktop.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index a87d57ecc91f..e2b4cafe9936 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -2,7 +2,7 @@ , element-desktop # for seshat and keytar , schildichat-web , stdenv -, fetchgit +, fetchFromGitHub , makeWrapper , makeDesktopItem , copyDesktopItems @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { pname = "schildichat-desktop"; inherit (pinData) version; - src = fetchgit { - url = "https://github.com/SchildiChat/schildichat-desktop/"; + src = fetchFromGitHub { + owner = "SchildiChat"; + repo = "schildichat-desktop"; inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; From 4c7f9afd31da9d2d2c5a8a57e9012397ab2c2e8c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:29:12 +0100 Subject: [PATCH 069/150] pond: switch to fetchFromGitHub --- .../networking/instant-messengers/pond/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index f26cd0109444..c7b5d56dbba3 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, - fetchgit }: + fetchFromGitHub }: let gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { pname = "pond"; - version = "20150830-${lib.strings.substring 0 7 rev}"; - rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + version = "unstable-2015-08-30"; goPackagePath = "github.com/agl/pond"; - src = fetchgit { - inherit rev; - url = "https://github.com/agl/pond"; - sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; + src = fetchFromGitHub { + owner = "agl"; + repo = "pond"; + rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y="; }; goDeps = ./deps.nix; From de81be0d53205c142e201d84a912c6f5d3c3edd1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:31:08 +0100 Subject: [PATCH 070/150] telegram-purple: switch to fetchFromGitHub --- .../pidgin-plugins/telegram-purple/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 527af9ed98db..6f7aab564fac 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } : -let - version = "1.3.1"; -in stdenv.mkDerivation rec { pname = "telegram-purple"; - inherit version; + version = "1.3.1"; - src = fetchgit { - url = "https://github.com/majn/telegram-purple"; + src = fetchFromGitHub { + owner = "majn"; + repo = "telegram-purple"; rev = "v${version}"; - sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; + sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10="; }; NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; From 084cd8cb090ad6f15b9dbb3858ee54ae18cfeba6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:31:27 +0100 Subject: [PATCH 071/150] pidgin-mra: switch to fetchFromGitHub --- .../pidgin-plugins/pidgin-mra/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index a168eb984c33..2c6a0c5e7e64 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, pidgin } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin } : -let - version = "54b2992"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pidgin-mra"; - inherit version; + version = "unstable-2014-07-08"; - src = fetchgit { - url = "https://github.com/dreadatour/pidgin-mra"; - rev = version; - sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; + src = fetchFromGitHub { + owner = "dreadatour"; + repo = "pidgin-mra"; + rev = "54b299266265cde800289b2d51f13b81f6bf379c"; + sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk="; }; nativeBuildInputs = [ pkg-config ]; From bfccc7c38c007c8f96d64dc2a837dc770fd81c71 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:31:44 +0100 Subject: [PATCH 072/150] matrixcli: switch to fetchFromGitHub --- .../instant-messengers/matrixcli/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index 7e88a77193b6..9b501facb7f6 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,13 +1,14 @@ -{ lib, fetchgit +{ lib, fetchFromGitHub , buildPythonApplication, buildPythonPackage , pygobject3, pytest-runner, requests, responses, pytest, python-olm , canonicaljson, olm }: let - mainsrc = fetchgit { - url = "https://github.com/saadnpq/matrixcli"; + mainsrc = fetchFromGitHub { + owner = "saadnpq"; + repo = "matrixcli"; rev = "61ebde173ca2f77185c261c2b7f6db297ca89863"; - sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq"; + sha256 = "sha256-eH/8b8IyfXqUo7odSECYF+84pXTsP+5S7pFR3oWXknU="; fetchSubmodules = true; }; @@ -35,7 +36,6 @@ let in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "matrixcli"; version = "0.0.2019-08-15"; From 3a1e015627474c8f1da6a5c83577cd3e293a7475 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:32:05 +0100 Subject: [PATCH 073/150] tpmmanager: switch to fetchFromGitHub --- pkgs/applications/misc/tpmmanager/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index b2839a97efcc..e30e1c9dc5b9 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }: +{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }: stdenv.mkDerivation rec { version = "0.8.1"; pname = "tpmmanager"; - src = fetchgit { - url = "https://github.com/Sirrix-AG/TPMManager"; + src = fetchFromGitHub { + owner = "Rohde-Schwarz"; + repo = "TPMManager"; rev = "9f989206635a6d2c1342576c90fa73eb239519cd"; - sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e"; + sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4="; }; nativeBuildInputs = [ qmake4Hook ]; From 45c1cc217556a056bb91c8680e262d997008df22 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:32:16 +0100 Subject: [PATCH 074/150] nix-tour: switch to fetchFromGitHub --- pkgs/applications/misc/nix-tour/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 57b1b6256906..7eed625f1e90 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, electron, runtimeShell } : +{ lib, stdenv, fetchFromGitHub, electron, runtimeShell } : stdenv.mkDerivation rec { pname = "nix-tour"; @@ -6,10 +6,11 @@ stdenv.mkDerivation rec { buildInputs = [ electron ]; - src = fetchgit { - url = "https://github.com/nixcloud/tour_of_nix"; + src = fetchFromGitHub { + owner = "nixcloud"; + repo = "tour_of_nix"; rev = "v${version}"; - sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; + sha256 = "sha256-a/P2ZMc9OpM4PxRFklSO6oVCc96AGWkxtGF/EmnfYSU="; }; installPhase = '' From e71499940349f49696cb193454b9853ed999ed09 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:32:23 +0100 Subject: [PATCH 075/150] mop: switch to fetchFromGitHub --- pkgs/applications/misc/mop/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index f31b79c9ddf4..105728b7f044 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mop"; version = "0.2.0"; - rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; + + src = fetchFromGitHub { + owner = "mop-tracker"; + repo = "mop"; + rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; + sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4="; + }; goPackagePath = "github.com/michaeldv/mop"; goDeps = ./deps.nix; @@ -16,12 +22,6 @@ buildGoPackage rec { mv cmd mop ''; - src = fetchgit { - inherit rev; - url = "https://github.com/mop-tracker/mop"; - sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx"; - }; - meta = with lib; { description = "Simple stock tracker implemented in go"; homepage = "https://github.com/mop-tracker/mop"; From a336bbef76146d1e617e0005981e12da0e28bcba Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:32:43 +0100 Subject: [PATCH 076/150] lightdm-enso-os-greeter: switch to fetchFromGitHub --- .../display-managers/lightdm-enso-os-greeter/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index ea7fc1375747..45fedadee309 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: @@ -6,10 +6,11 @@ stdenv.mkDerivation { version = "0.2.1"; pname = "lightdm-enso-os-greeter"; - src = fetchgit { - url = "https://github.com/nick92/Enso-OS"; + src = fetchFromGitHub { + owner = "nick92"; + repo = "Enso-OS"; rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; - sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; + sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY="; }; patches = [ From d1d06e33c6487a4866bcb861a3cadeec76585a52 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 15 Mar 2022 11:38:19 +0100 Subject: [PATCH 077/150] emacs27Packages: switch to fetchFromGitHub --- .../editors/emacs/elisp-packages/emacs2nix.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 20bb0efdd663..2873be1787fa 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -1,11 +1,12 @@ let pkgs = import ../../../../.. { }; - src = pkgs.fetchgit { - url = "https://github.com/nix-community/emacs2nix.git"; - fetchSubmodules = true; + src = pkgs.fetchFromGitHub { + owner = "nix-community"; + repo = "emacs2nix"; rev = "2e8d2c644397be57455ad32c2849f692eeac7797"; sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M="; + fetchSubmodules = true; }; in pkgs.mkShell { From 5b55eb42f1b14fdab2a09669fa27d44f492eb7e4 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 22 Feb 2022 21:38:59 -0600 Subject: [PATCH 078/150] tree-sitter: add extraGrammars attribute --- pkgs/development/tools/parsing/tree-sitter/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 484254a099c3..055279c4962f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -20,6 +20,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , webUISupport ? false +, extraGrammars ? {} }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -51,19 +52,18 @@ let runCommand "grammars" { } ('' mkdir $out '' + (lib.concatStrings (lib.mapAttrsToList - (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n") + (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") (import ./grammars { inherit lib; })))); - builtGrammars = let change = name: grammar: callPackage ./grammar.nix { } { language = if grammar ? language then grammar.language else name; inherit version; - source = fetchGrammar grammar; + source = if grammar ? src then grammar.src else fetchGrammar grammar; location = if grammar ? location then grammar.location else null; }; - grammars' = (import ./grammars { inherit lib; }); + grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } // { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // @@ -71,7 +71,7 @@ let { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; in - lib.mapAttrs change grammars; + lib.mapAttrs change (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7302e057d36d..160e822735b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15867,7 +15867,7 @@ with pkgs; travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = callPackage ../development/tools/parsing/tree-sitter { + tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { inherit (darwin.apple_sdk.frameworks) Security; }; From 5e801d82ddbd2c39dcd8d5bf96d1f897a3b1c3c6 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Fri, 18 Mar 2022 15:58:31 -0400 Subject: [PATCH 079/150] lunar-client: 2.9.3 -> 2.10.0 --- pkgs/games/lunar-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index fbebe85cf007..17df2565b866 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -2,13 +2,13 @@ let name = "lunar-client"; - version = "2.9.3"; + version = "2.10.0"; desktopItem = makeDesktopItem { name = "lunar-client"; exec = "lunar-client"; icon = "lunarclient"; - comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; + comment = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client"; desktopName = "Lunar Client"; genericName = "Minecraft Client"; categories = [ "Game" ]; @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - sha256 = "sha256-2wlC+OAG2lvUB3yPxppNhhvNDZv4gxrNKpww9vAfStI="; + sha256 = "1kfi3rgy401ll3gn9k30j0a1zds1ghl5g2ibfwlsnr826nckfmzw"; }; in appimageTools.wrapType1 rec { @@ -36,7 +36,7 @@ appimageTools.wrapType1 rec { extraPkgs = pkgs: [ pkgs.libpulseaudio ]; meta = with lib; { - description = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; + description = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client"; homepage = "https://www.lunarclient.com/"; license = with licenses; [ unfree ]; maintainers = with maintainers; [ zyansheep Technical27 ]; From 00487b5a87cff8c0970a64a040377949ffa11b1a Mon Sep 17 00:00:00 2001 From: andr1an Date: Sun, 20 Feb 2022 12:08:35 +0300 Subject: [PATCH 080/150] nixos/nixos-generate-config: resolve abspath to root --- nixos/modules/installer/tools/nixos-generate-config.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 57aef50a0f6b..1a9b1d061cf1 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -52,6 +52,7 @@ for (my $n = 0; $n < scalar @ARGV; $n++) { $rootDir = $ARGV[$n]; die "$0: ‘--root’ requires an argument\n" unless defined $rootDir; $rootDir =~ s/\/*$//; # remove trailing slashes + $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path } elsif ($arg eq "--force") { $force = 1; From 611b8c4472db0bde066b97960ccfe4671ffb89fb Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Mar 2022 23:02:49 +0200 Subject: [PATCH 081/150] nixos/nixos-generate-config: fix specifying --root /mnt --dir adir it should save to `$PWD/adir` instead of `/mnt/adir` and --dir adir should save to `$PWD/adir` instead of `/adir` --- nixos/modules/installer/tools/nixos-generate-config.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 1a9b1d061cf1..fb5d3ba47325 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -51,6 +51,7 @@ for (my $n = 0; $n < scalar @ARGV; $n++) { $n++; $rootDir = $ARGV[$n]; die "$0: ‘--root’ requires an argument\n" unless defined $rootDir; + die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/"; $rootDir =~ s/\/*$//; # remove trailing slashes $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path } @@ -617,7 +618,12 @@ EOF if ($showHardwareConfig) { print STDOUT $hwConfig; } else { - $outDir = "$rootDir$outDir"; + if ($outDir eq "/etc/nixos") { + $outDir = "$rootDir$outDir"; + } else { + $outDir = File::Spec->rel2abs($outDir); + $outDir =~ s/\/*$//; # remove trailing slashes + } my $fn = "$outDir/hardware-configuration.nix"; print STDERR "writing $fn...\n"; From fa9ee43d7f17a3087f10065a9a07269313239231 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Fri, 18 Mar 2022 14:50:59 -0700 Subject: [PATCH 082/150] python3Packages.dunamai: init at 1.10.0 --- .../python-modules/dunamai/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/dunamai/default.nix diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix new file mode 100644 index 000000000000..f4a24a7a7f8a --- /dev/null +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -0,0 +1,52 @@ +{ lib +, poetry-core +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, importlib-metadata +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dunamai"; + version = "1.10.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mtkennerly"; + repo = "dunamai"; + rev = "v${version}"; + sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + # needs to be able to run dunami from PATH + preCheck = '' + export PATH=$PATH:$out/bin + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dunamai" ]; + + meta = with lib; { + description = "Dynamic version generation"; + homepage = "https://github.com/mtkennerly/dunamai"; + license = licenses.mit; + maintainers = with maintainers; [ jmgilman ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92da9eec9a6e..06c46f66ae74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2502,6 +2502,8 @@ in { dulwich = callPackage ../development/python-modules/dulwich { }; + dunamai = callPackage ../development/python-modules/dunamai { }; + dungeon-eos = callPackage ../development/python-modules/dungeon-eos { }; dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; From e552776181643872ae3a8330bd44959bad94561a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Pa=C5=9Bnikowski?= Date: Sat, 19 Mar 2022 23:11:02 +0100 Subject: [PATCH 083/150] trezor-suite: 22.1.1 -> 22.3.2 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 43f41e5aeef7..9c38a3f78615 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "22.1.1"; + version = "22.3.2"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-hRPwhKdAqiHmsaIuNm5r3ZuKhUh+IipR5/5N/9PwiLEfaSQRWink0dUwyuUoWzy4DyGabLQyIWbQRvR7eRGKJA=="; - x86_64-linux = "sha512-W4S7W4TeDtSwWCj6N6EoJJOCYG3m1pK3D+UPlsp7B7VY/0uBtI31+tS28E6TUgXZUttr8IIbqzJYWCuyLfDthQ=="; + aarch64-linux = "sha512-GW8wmfTjuWrXijyPKeDJgF+mas1pfEMgAASmlvCURfFwg+oSL0B/0Z2qm5QRXIHmyd7eg/Zd8nEZL7Fg2Lb9ww=="; + x86_64-linux = "sha512-/XQ/sI0TP++3KHlkBXLHe/SVGKcmyjT7vPkV0NCK4rlL70VE+wKLKQK6XKp4V81B5w2+3a/uPOWtmcVr5iVkSA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 87b147a1f135acc687764cbb86df7e76b3909aa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Mar 2022 09:47:07 +0000 Subject: [PATCH 084/150] python310Packages.awscrt: 0.13.5 -> 0.13.6 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index fa00971ff257..77c67e5a2aed 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.5"; + version = "0.13.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dUNljMKsbl6eByhEYivWgRJczTBw3N1RVl8r3e898mg="; + hash = "sha256-aZ1Mquc4IfrdWjOaHMipjNb6gLGGbdKS8ah5b33eqGo="; }; buildInputs = lib.optionals stdenv.isDarwin [ From 9bffd90af89201264cf02a6e2bf03692750725c3 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 20 Mar 2022 12:04:39 +0100 Subject: [PATCH 085/150] tor-browser-bundle-bin: 11.0.7 -> 11.0.9 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ce1d41834c3b..28e11814029c 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.7"; + version = "11.0.9"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "197yf0abcb98kqds0xvki0b52rlhzyzdc98zmhrn7y8gmahc84cz"; + sha256 = "0cl01bx64d6bmajknj7085nzc6841adkp65fz531r3y6nnpwr9ds"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0yylfsgmnfn6zww0r6kp1d1wmmb0lfa4lqwkgr7d8rzi6q9spmqk"; + sha256 = "0j6alhm1pqp7fb6nk55vzvr1qjz6gyd3vn6v2dkkvj9mgm57x1j5"; }; }; in From 23b44464be3648f0a0a00111db85163d8c57dec6 Mon Sep 17 00:00:00 2001 From: Ankit Pandey Date: Sun, 20 Mar 2022 15:28:26 -0700 Subject: [PATCH 086/150] emacspeak: Use bundled espeak server instead of espeak-ng Emacspeak comes with its own native speech server which is compiled in the derivation but never actually used by emacspeak. Instead emacspeak uses espeak-ng, which echoes every command issued to the server and won't shut up about tts sync states. Fix this by setting DTK_PROGRAM to the bundled espeak server. --- .../editors/emacs/elisp-packages/emacspeak/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix index 84d724c3518b..54805d43b248 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} + find "$d" -type f -not -executable -execdir chmod 644 {} + makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \ - --set DTK_PROGRAM "${espeak-ng}/bin/espeak" \ + --set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \ + --set TCLLIBPATH "${tclx}/lib" \ --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' ''; From 5e06fb8879749aa0dfe3fe636aa4824ef8021b72 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 18 Mar 2022 18:01:43 -0300 Subject: [PATCH 087/150] argocd: 2.2.5 -> 2.3.1 Drop packr (https://github.com/argoproj/argo-cd/commit/3f32a750a014ba818301b3e99e94be619eb18b1f), helm and kustomize as it does not seem necessary to use cli only maintain commit and add todo for updatescript add cmd to subpackage per https://github.com/argoproj/argo-cd/blob/master/Makefile\#L222 since it builds only cmd, doCheck = false is not needed anymore, also the fix for it is only in master at the current time note, we only build the cli from now on as i think the other componentes are a bit irelevant to nixos drop makewrapper reorganize phases based on https://nixos.org/manual/nixpkgs/stable/\#ssec-controlling-phases --- .../networking/cluster/argocd/default.nix | 44 +++++++------------ 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 360d566009d4..042249d547fd 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -1,26 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, packr, makeWrapper, installShellFiles, helm, kustomize }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "argocd"; - version = "2.2.5"; - commit = "8f981ccfcf942a9eb00bc466649f8499ba0455f5"; + version = "2.3.1"; tag = "v${version}"; + # Update commit to match the tag above + # TODO make updadeScript + commit = "b65c1699fa2a2daa031483a3890e6911eac69068"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-wSvDoRHV4BObRL8lEpHt9oGXNB06LXdIYasRYqmM5QA="; + sha256 = "sha256-YijhJz7m5wy8kR9V6IHSNYjiWh7H2ph6il9nMsrePOE="; }; - vendorSha256 = "sha256-BVhts+gOM6nhcR1lkFzy7OJnainLXw5YdeseBBRF2xE="; + vendorSha256 = "sha256-uA9sOMuVHKRRhSGoLyoKcUYU6NxtprVUITvVC+tot1g="; - nativeBuildInputs = [ packr makeWrapper installShellFiles ]; - - # run packr to embed assets - preBuild = '' - packr - ''; + # Set target as ./cmd per release-cli + # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222 + subPackages = [ "cmd" ]; ldflags = let package_url = "github.com/argoproj/argo-cd/v2/common"; in @@ -33,20 +32,7 @@ buildGoModule rec { "-X ${package_url}.gitTreeState=clean" ]; - # Test is disabled because ksonnet is missing from nixpkgs. - # Log: https://gist.github.com/superherointj/79cbdc869dfd44d28a10dc6746ecb3f9 - doCheck = false; - checkInputs = [ - helm - kustomize - #ksonnet - ]; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/argocd version --client | grep ${tag} > /dev/null - $out/bin/argocd-util version --client | grep ${tag} > /dev/null - ''; + nativeBuildInputs = [ installShellFiles ]; installPhase = '' runHook preInstall @@ -55,10 +41,12 @@ buildGoModule rec { runHook postInstall ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/argocd version --client | grep ${tag} > /dev/null + ''; + postInstall = '' - for appname in argocd-util argocd-server argocd-repo-server argocd-application-controller argocd-dex ; do - makeWrapper $out/bin/argocd $out/bin/$appname --set ARGOCD_BINARY_NAME $appname - done installShellCompletion --cmd argocd \ --bash <($out/bin/argocd completion bash) \ --zsh <($out/bin/argocd completion zsh) From 2c2d0b9379c03a68348cb6a7f7f8c94401c753ea Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 20 Mar 2022 20:49:01 -0400 Subject: [PATCH 088/150] goreleaser: 1.6.3 -> 1.7.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 492e8a83a2fd..d0f44b933e94 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZNE+DfQdIlxA6sXMI8DAIQ3x+kcgXoGApUuoPncRfpc="; + sha256 = "sha256-vTik6KFOkKOik78/H0hvAv6xI+QSALOHD4N6befPaT4="; }; - vendorSha256 = "sha256-Kwa2hzsuw3BNLubcqd7Vmpg49P78Yjt3LboLotoGWYM="; + vendorSha256 = "sha256-ujtgcH5EF+PZAD/1Y0+yI4m7y2hNJ3w4KB2pvKbdgsU="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b6e1bc045e5..6fc6981cd514 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6223,7 +6223,7 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { }; + goreleaser = callPackage ../tools/misc/goreleaser { buildGoModule = buildGo118Module; }; goreplay = callPackage ../tools/networking/goreplay { }; From d79779a1f4512bed1308ede93ada64d2cd450a82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Mar 2022 10:25:56 +0000 Subject: [PATCH 089/150] koreader: 2022.02 -> 2022.03 --- pkgs/applications/misc/koreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 2e6318f98807..21cdc9d51da8 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.02"; + version = "2022.03"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-gR81ZN0N3bmvLVqwUanXTrpBnzhPZT0bo4J8VOfaJh8="; + sha256 = "sha256-xR92sCeP7wcYukUGxoG9LQyk4k/qkmnxqmjY4Umt05I="; }; sourceRoot = "."; From 9eb200121764dfa8a57acd906dfccf60d760e2fc Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 9 Mar 2022 13:15:08 +0100 Subject: [PATCH 090/150] mupdf: Patch out which This popped up while fixing up the expression for Darwin. Apparently `which` isn't on the PATH there for Nix builds. May be considered an impurity on Linux. `command -v` is the POSIX way to do basically the same thing so I just patched out `which`. --- pkgs/applications/misc/mupdf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 7bb9a89b8b39..cbe50cfdb3ce 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; }; + patches = ./0001-Use-command-v-in-favor-of-which.patch; + postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c ''; From a149e9b220990da7fd97689742597324dcedba71 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 9 Mar 2022 13:24:16 +0100 Subject: [PATCH 091/150] mupdf: Unbreak build on Darwin Recent changes (ea5dd0974d1e74d7338a8763b0f313bb09fa5ed9) dropped a patch Darwin needed. I've added a new unconditional patch, because it doesn't affect Linux and this way it's more obvious when the patch needs updating. I decided to add the `xcbuild` dependency because the upstream build uses `xcrun` and I don't know of a good reason not to. --- pkgs/applications/misc/mupdf/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index cbe50cfdb3ce..ae8eed05b9fe 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -21,6 +21,7 @@ , enableGL ? true , freeglut , libGLU +, xcbuild }: let @@ -39,7 +40,9 @@ stdenv.mkDerivation rec { sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; }; - patches = ./0001-Use-command-v-in-favor-of-which.patch; + patches = [ ./0001-Use-command-v-in-favor-of-which.patch + ./0002-Add-Darwin-deps.patch + ]; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c @@ -54,6 +57,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] + ++ lib.optional stdenv.isDarwin xcbuild ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( From af02076c5bf57c111a789dc7123d7eae5f138b49 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 21 Mar 2022 14:07:33 +0000 Subject: [PATCH 092/150] driftctl: 0.23.2 -> 0.24.0 --- pkgs/applications/networking/cluster/driftctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 03f5ccda4009..9f53726e8f0c 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "driftctl"; - version = "0.23.2"; + version = "0.24.0"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-hGwQdR2LF1uuq11d2BD4hVjcXpPCbRNovOqJpj0J1Sw="; + sha256 = "sha256-jKaJqmJMOz+2pWXTgVtnJbYbikdTfW8nWQJKWVxqv5I="; }; vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E="; From e7d335fa8b0c4ba46104b0d885bc276365495af1 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 9 Mar 2022 14:23:48 +0100 Subject: [PATCH 093/150] mupdf: Don't build X11 binaries by default on Darwin --- pkgs/applications/misc/mupdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 7bb9a89b8b39..6471ab49fe0a 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -10,7 +10,7 @@ , libjpeg , darwin , gumbo -, enableX11 ? true +, enableX11 ? (!stdenv.isDarwin) , libX11 , libXext , libXi From 5c4f57cc5720ca7c4a500d6dc672208fe191564a Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 9 Mar 2022 17:33:08 +0100 Subject: [PATCH 094/150] mupdf: Add Darwin application --- pkgs/applications/misc/mupdf/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 6471ab49fe0a..7a272e9d491f 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , fetchpatch +, desktopToDarwinBundle , pkg-config , freetype , harfbuzz @@ -50,7 +51,9 @@ stdenv.mkDerivation rec { ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = + [ pkg-config ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] From 66f1f073c203a39db09fa4c5aaa37c78bd61348b Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 21 Mar 2022 16:35:56 +0100 Subject: [PATCH 095/150] mupdf: Add patches --- ...0001-Use-command-v-in-favor-of-which.patch | 25 ++++++++ .../misc/mupdf/0002-Add-Darwin-deps.patch | 57 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch create mode 100644 pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch diff --git a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch new file mode 100644 index 000000000000..26ed3aec9fb7 --- /dev/null +++ b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch @@ -0,0 +1,25 @@ +From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Tue, 8 Mar 2022 23:59:19 +0100 +Subject: [PATCH 1/2] Use command -v in favor of which + +--- + Makerules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makerules b/Makerules +index 0fdaecb..6d52cca 100644 +--- a/Makerules ++++ b/Makerules +@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS) + LD = xcrun ld + RANLIB = xcrun ranlib + +- ifeq (, $(shell which pkg-config)) ++ ifeq (, $(shell command -v pkg-config)) + $(warning "No pkg-config found, install it for proper integration of libcrypto") + else + HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch b/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch new file mode 100644 index 000000000000..2fe1a4afd9fd --- /dev/null +++ b/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch @@ -0,0 +1,57 @@ +From 0f0ccfc01cfe72d96eafee57ec6c5107f09c7238 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Wed, 9 Mar 2022 00:08:28 +0100 +Subject: [PATCH 2/2] Add Darwin deps + +--- + Makerules | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/Makerules b/Makerules +index 6d52cca..a6bd0ed 100644 +--- a/Makerules ++++ b/Makerules +@@ -153,6 +153,40 @@ else ifeq ($(OS),MACOS) + LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO + LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) + endif ++ # Required for mupdf-gl ++ ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) ++ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) ++ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++ endif ++ ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) ++ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) ++ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++ endif ++ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) ++ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) ++ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++ endif ++ ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) ++ SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) ++ SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) ++ endif ++ # Required for mupdf-x11 ++ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) ++ ifeq ($(HAVE_X11),yes) ++ X11_CFLAGS := $(shell pkg-config --cflags x11 xext) ++ X11_LIBS := $(shell pkg-config --libs x11 xext) ++ endif ++ # Required for mupdf-x11-curl ++ HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) ++ ifeq ($(HAVE_SYS_CURL),yes) ++ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) ++ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++ endif ++ HAVE_PTHREAD := yes ++ ifeq ($(HAVE_PTHREAD),yes) ++ PTHREAD_CFLAGS := ++ PTHREAD_LIBS := -lpthread ++ endif + endif + + else ifeq ($(OS),Linux) +-- +2.17.2 (Apple Git-113) + From 1c078c4da01cb728c22390caa105415fa73c1522 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 21 Mar 2022 23:49:07 +0800 Subject: [PATCH 096/150] brook: 20220404 -> 20220406 --- pkgs/tools/networking/brook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index f18dad8c0c13..df383409f4d2 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "brook"; - version = "20220404"; + version = "20220406"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yQuGaj5HukO+OENCpVMkoXv2AztygjrDPXgHaVBFyZ8="; + sha256 = "sha256-KCDXi86Wi01wEIJXPYYX5HkQMq7nKK2VhsN1x5yOvlk="; }; vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU="; From 131ecf27a6d8d9e836d295b3544f1249f8ad295a Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Fri, 18 Mar 2022 15:46:40 -0700 Subject: [PATCH 097/150] maintainers: add @jmgilman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3acbd8d23438..8e92057d7fd3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5869,6 +5869,12 @@ githubId = 587870; name = "Jonathan Mettes"; }; + jmgilman = { + email = "joshuagilman@gmail.com"; + github = "jmgilman"; + githubId = 2308444; + name = "Joshua Gilman"; + }; jo1gi = { email = "joakimholm@protonmail.com"; github = "jo1gi"; From 0341e3d535bd0856bd664bfcaa8f16824535d8ba Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 21 Mar 2022 11:14:40 -0500 Subject: [PATCH 098/150] lwan: indicate jemalloc should be used, or it won't be (cherry picked from commit d45a92fba512e8aeaf7bb904077ca8cd4ad988a8) --- pkgs/servers/http/lwan/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 3e90857d8db8..7d6d34a6d2db 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ jemalloc zlib ]; + # Note: tcmalloc and mimalloc are also supported (and normal malloc) + cmakeFlags = [ "-DUSE_ALTERNATIVE_MALLOC=jemalloc" ]; + meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; longDescription = "A lightweight and speedy web server with a low memory From 5ca306875ca5e432f074603846826d742c12bd71 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 12 Feb 2020 20:25:58 -0600 Subject: [PATCH 099/150] lwan: no jemalloc w/musl --- pkgs/servers/http/lwan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 7d6d34a6d2db..71f45028c314 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, jemalloc }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, enableJemalloc ? !stdenv.hostPlatform.isMusl, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ jemalloc zlib ]; + buildInputs = [ zlib ] ++ lib.optional enableJemalloc jemalloc; # Note: tcmalloc and mimalloc are also supported (and normal malloc) - cmakeFlags = [ "-DUSE_ALTERNATIVE_MALLOC=jemalloc" ]; + cmakeFlags = lib.optional enableJemalloc "-DUSE_ALTERNATIVE_MALLOC=jemalloc"; meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; From e225f918838536afbdba7e599ec26e03540e881e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 21 Mar 2022 11:24:51 -0500 Subject: [PATCH 100/150] lwan: fix build w/musl, disable PIE --- pkgs/servers/http/lwan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 71f45028c314..5aff026aa9ce 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # Note: tcmalloc and mimalloc are also supported (and normal malloc) cmakeFlags = lib.optional enableJemalloc "-DUSE_ALTERNATIVE_MALLOC=jemalloc"; + hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "pie"; + meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; longDescription = "A lightweight and speedy web server with a low memory From 7d4c1daddf958b0416ce5a74d92a98f8147ae2e5 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Mon, 21 Mar 2022 12:41:35 -0500 Subject: [PATCH 101/150] desync: 0.9.0 -> 0.9.2 Changes include: - Support for mounting a .caibx backed by a sparse cache - A generic "converter" layer to allow encrypted stores - Test suite compatibility with Go 1.15 --- pkgs/applications/networking/sync/desync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index bc2776657c20..98b29038edec 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "desync"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "folbricht"; repo = "desync"; - sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy"; + sha256 = "sha256-yGlf6Z38GnOWSc2pvt/u4arx5lCB0QpoqPdNamdL9b0="; }; - vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz"; + vendorSha256 = "sha256-c+Sz3WMKyzdEE/Hs+7dekQPn+62ddbmfvV21W0KeLDU="; # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad. doCheck = false; From 17eff63ea4e0f0577a3ee8f6af209a171418b42e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 20:29:59 +0100 Subject: [PATCH 102/150] siege: 4.1.1 -> 4.1.2 --- pkgs/tools/networking/siege/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 175595edafb8..446acbe32782 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -7,14 +7,16 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - sha256 = "1a74py0ib1gr3znv9ah5acw67ngl08b14dbc90ww9clvgdr2ag0l"; + hash = "sha256-5HKr4Zxak/a+W/1k3/JvZo2ixtIQr4ITtgycDbF+ynk="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux [ + "-lgcc_s" + ]; buildInputs = [ openssl From 6beb1f8e11f67082a5a11ac538a68d19656f7589 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Mar 2022 19:39:30 +0000 Subject: [PATCH 103/150] taskwarrior-tui: 0.20.1 -> 0.21.0 --- pkgs/applications/misc/taskwarrior-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 7b58ede38344..036421bbacad 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-NE0GKQ3ROD+AF5FCuaKJ+8g+wiYobVK8swK0F9jo2Lk="; + sha256 = "sha256-HHYObAeJtryZWRV3T+FXRz0TgBIfw/kVL9jwaQmZcEA="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-hO5rff3bm8g3JYh5vFhj2L3f/hOgP0ZA0EhO3YF5DFw="; + cargoSha256 = "sha256-oRREvqQLigpfpnTJgVZjAwAvmUs9YSZm+D5xyFYvdb4="; meta = with lib; { description = "A terminal user interface for taskwarrior "; From c13013049eb1b9f2faed3d41740ccdfa049b9be2 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Mon, 21 Mar 2022 15:14:41 -0500 Subject: [PATCH 104/150] bitbucket-cli: remove Uses unsupported API and Python 2 --- pkgs/tools/misc/bitbucket-cli/default.nix | 27 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/tools/misc/bitbucket-cli/default.nix diff --git a/pkgs/tools/misc/bitbucket-cli/default.nix b/pkgs/tools/misc/bitbucket-cli/default.nix deleted file mode 100644 index 4a770b187fe7..000000000000 --- a/pkgs/tools/misc/bitbucket-cli/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, python2 -}: - -python2.pkgs.buildPythonApplication rec { - pname = "bitbucket-cli"; - version = "0.5.1"; - - src = python2.pkgs.fetchPypi { - inherit pname version; - sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; - }; - - propagatedBuildInputs = with python2.pkgs; [ - requests - ]; - - # No tests - doCheck = false; - - meta = with lib; { - description = "Bitbucket command line interface"; - homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; - maintainers = with maintainers; [ refnil ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b68d1b0b27cd..e47c8fb0ee3d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -100,6 +100,7 @@ mapAliases ({ beegfs = throw "beegfs has been removed"; # Added 2019-11-24 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 + bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca05863803df..d4e86cbb32f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2299,8 +2299,6 @@ with pkgs; birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; - bitbucket-cli = callPackage ../tools/misc/bitbucket-cli { }; - bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; blitz = callPackage ../development/libraries/blitz { }; From 10d595efc191189951aa65a7d854b241e50a2a5b Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 21 Mar 2022 22:20:31 +0100 Subject: [PATCH 105/150] tpmmanager: fetch tag --- pkgs/applications/misc/tpmmanager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index e30e1c9dc5b9..a94363f4600c 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Rohde-Schwarz"; repo = "TPMManager"; - rev = "9f989206635a6d2c1342576c90fa73eb239519cd"; + rev = "v${version}"; sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4="; }; From 838f644e91cc422f84608c207e7c2b010493f41c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 21 Mar 2022 16:39:37 -0500 Subject: [PATCH 106/150] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-clojure.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-cpp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-cuda.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-dockerfile.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-dot.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-elixir.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-erlang.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-fennel.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-fish.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-haskell.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-java.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-latex.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-markdown.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-nix.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-norg.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-perl.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-prisma.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-vim.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-zig.json | 8 ++++---- 20 files changed, 80 insertions(+), 80 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index 3fccfc5f7b01..4527f8d000e8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,9 +1,9 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "39bf0977d223879436c1425fe6bfeb3bcfd86f92", - "date": "2021-08-15T13:16:31+09:00", - "path": "/nix/store/7kpf74gw4a68fby6jiw4n7lc4jfkgcf4-tree-sitter-clojure", - "sha256": "0ryj75znysvyvv4qaghygx1srrhlwhfmzmdilm652prkgj6yzh6b", + "rev": "1b24766fe9feacb8f5006233fe5c2ebd0ba31eff", + "date": "2022-02-19T08:24:15+09:00", + "path": "/nix/store/1vxhbw0dxg95z8rbs1b96nrcjvhrhb52-tree-sitter-clojure", + "sha256": "0sqi825gyjndn3v00kvk9scw6s5q0lr3ig6v49sccqc2addnr6di", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 47c6b811ff16..dfbdbd5d9317 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "656d7ea44b2b0daece78791e30281e283f30001e", - "date": "2022-01-17T09:06:11-06:00", - "path": "/nix/store/w4qqya24zf0cd7rqw1440szrrad8nf23-tree-sitter-cpp", - "sha256": "0vfgv9rw8pw4d41p5rndy7cjw8w0k0vnn54cwpxkm3r2vblnjn58", + "rev": "a832195eb3685a279856bb480ce19cff19554b6d", + "date": "2022-03-14T15:34:21-05:00", + "path": "/nix/store/ixca3nass3hkf0pycf7zhz15h2yq11sk-tree-sitter-cpp", + "sha256": "1y0i3w21zg8khns97wy5wpw57bhni4c8faszaz9qb0nrgarbf3i6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index d9fb78dd2723..282b95895ed7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "14cd86e18ba45e327017de5b3e0f8d8f7f8e98ec", - "date": "2022-01-24T00:39:28+01:00", - "path": "/nix/store/3lskjrhqd16ymvsbrwzcsdd80cyr7ljj-tree-sitter-cuda", - "sha256": "09qpl5mfv39788smz87zbzp04i3rdhsckjjqngvr0w24dsw30nyx", + "rev": "5178a7a5b25dc7ee4a69bf72f31bd6d3ff0a0795", + "date": "2022-03-16T21:48:20+01:00", + "path": "/nix/store/gd5s063qfyas370a9rd8mn9wc9d68s15-tree-sitter-cuda", + "sha256": "17zqpd27b09izpp9lvkgc1hcnq5nc58i98pak0qi46z85r6zgp6g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json index 951daa9e3d9f..072f0eab727b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json @@ -1,9 +1,9 @@ { "url": "https://github.com/camdencheek/tree-sitter-dockerfile", - "rev": "7af32bc04a66ab196f5b9f92ac471f29372ae2ce", - "date": "2021-12-16T07:47:57-07:00", - "path": "/nix/store/gh1pnracilf89q9z5czqr4z7lkd480xb-tree-sitter-dockerfile", - "sha256": "06hy683mrp1jcg2ypd6msbmv0pm2z85y8nqxgrnbr9vbi6syvmp5", + "rev": "d34a0cebd094e830bdd2106a28cb2f1fb22401d8", + "date": "2022-01-27T11:20:14-07:00", + "path": "/nix/store/3whf6fv79zqk5w0d6jbzfgs5jzm4cll4-tree-sitter-dockerfile", + "sha256": "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json index 63660cccfb3b..bc84c3b1f37c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -1,9 +1,9 @@ { "url": "https://github.com/rydesun/tree-sitter-dot", - "rev": "92877bac7033e409ccfb3f07fe28ef1dfd359457", - "date": "2021-10-13T19:28:51+08:00", - "path": "/nix/store/h3dyw3kcgw77lma750wjgr1n8pjllxn6-tree-sitter-dot", - "sha256": "1l8g348nqqil7lygkhzw1ydwf3q2m5786qddp1f9jg1bdrv9p8rl", + "rev": "917230743aa10f45a408fea2ddb54bbbf5fbe7b7", + "date": "2022-03-11T21:17:49+08:00", + "path": "/nix/store/3xvainpyzwpbhbm30mmvvgxpgh4agljh-tree-sitter-dot", + "sha256": "1q2rbv16dihlmrbxlpn0x03na7xp8rdhf58vwm3lryn3nfcjckn2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index b0bad04a86fb..c6257a25b157 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "de20391afe5cb03ef1e8a8e43167e7b58cc52869", - "date": "2022-01-10T10:35:12-06:00", - "path": "/nix/store/099pwd7iv86g1j4fplgq33a4jpwbvv60-tree-sitter-elixir", - "sha256": "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h", + "rev": "b4027d7cfc96935b50878bdf9faf80bd64ac73cf", + "date": "2022-03-04T15:40:04+00:00", + "path": "/nix/store/h3qh2s4q51bnq66p1v067g1fb8bd1743-tree-sitter-elixir", + "sha256": "1pf2n1j8j5w7mrh81yzvha1gh4w3vffngikj04kzd5gkx9asf3x6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json index b824f34f27a0..c948d53289b4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json @@ -1,9 +1,9 @@ { "url": "https://github.com/abstractmachineslab/tree-sitter-erlang", - "rev": "9d5fd0c329280a156bf7614a49dc5e8c58cc037c", - "date": "2021-08-03T11:57:52+02:00", - "path": "/nix/store/35ydhh12dgf4q016gjka35wnqnkwc1jg-tree-sitter-erlang", - "sha256": "0d6wl95wgys21vcix6j0bf7l000glkmk1n6shgcnp4baw9wxh009", + "rev": "fab680273af1a8f5cc0c3a0c62cbf5b1bea71f39", + "date": "2022-03-05T23:18:36+01:00", + "path": "/nix/store/vj28kyy3jg21qicwxq2g1ysrwfqd3mz9-tree-sitter-erlang", + "sha256": "0shzzik8yxwb76kxs3l0fccjwvkarck1q4wqyv5hdma6hwl52b69", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 8684e176cb69..5bea07ef1e3c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "fce4331731a960077ff5f98939bc675179f1908a", - "date": "2021-09-30T09:09:52-04:00", - "path": "/nix/store/mhpkw4gl6lzi306q21kckafqcdc0a715-tree-sitter-fennel", - "sha256": "1k8acyav26248liz0psk2r9dl7472mqgdyrjwg3pfxx94jgqjcik", + "rev": "d37fd84a702b78ff0282f223ece83c61ab062a6e", + "date": "2022-02-21T08:13:28-05:00", + "path": "/nix/store/lafx5rw9r9jp9056sv0sk89kxfjlb9x3-tree-sitter-fennel", + "sha256": "1wqvz8v877jh7shv50xbnx1bxvdlnfnpmndwzsb0smidnzx7lbw2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index b32445c2804c..a060a455955c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "04e54ab6585dfd4fee6ddfe5849af56f101b6d4f", - "date": "2021-08-02T21:46:56+01:00", - "path": "/nix/store/0n3jfh7gk16bmikix34y5m534ac12xgc-tree-sitter-fish", - "sha256": "1810z8ah1b09qpxcr4bh63bxsnxx24r6d2h46v2cpqv1lg0g4z14", + "rev": "d482d70ea8e191c05b2c1b613ed6fdff30a14da0", + "date": "2022-03-14T15:15:13+00:00", + "path": "/nix/store/5ajcf2hl1hph7iky6lwp5vh7a49k587s-tree-sitter-fish", + "sha256": "0idnm9lrvj1jhrvrgcddppkc09hr7inciz6k02d0nnxv8pqaw3w6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 31114781f58c..e1d4462e225d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "d6ccd2d9c40bdec29fee0027ef04fe5ff1ae4ceb", - "date": "2022-01-07T03:13:04+01:00", - "path": "/nix/store/biyjfajma7nr175xviaw65jksqfak893-tree-sitter-haskell", - "sha256": "0zfxi3adqhy7d1w2dvnywkms8a4vfxkjswdhar7p5sxyps8a5wry", + "rev": "ed976b81b00ce7b72b99bca75e7a616cc526220c", + "date": "2022-03-20T00:05:14+01:00", + "path": "/nix/store/wzkfkix4q3vcrlsj2v4q32ihw0vdp1li-tree-sitter-haskell", + "sha256": "19g5f59gh6s4xpphrppmrqlh0nfld0q8zffy85pkby4gd6xh73zm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 6f9344437bfa..664e31613c5d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "a24ae7d16de3517bff243a87d087d0b4877a65c5", - "date": "2022-01-12T08:57:59-08:00", - "path": "/nix/store/dipis7syj55xrmc72gvx2f9q672mn6dg-tree-sitter-java", - "sha256": "0p01xkxzdjwx32hd6k4kqidlhkgj8q9b9lp4g4fra5gx9w159iqm", + "rev": "881b84fe7078651af5077cc4cea4c85f9fddde3b", + "date": "2022-03-21T10:50:51+01:00", + "path": "/nix/store/ii1dwsg972sbllim6vrmjbcaw9fcy2b1-tree-sitter-java", + "sha256": "0kvqqrx669fyaxm55l0p5vbswf9bfknl0brsr6llyzdz81dl0vk4", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index 5cf20f27968f..739e6006c275 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "323b609de40b7729073482a3c59de76cfba7744f", - "date": "2022-02-08T21:23:53+01:00", - "path": "/nix/store/f6kvr0x41rbb64s36ii6bj30fqaallz4-tree-sitter-latex", - "sha256": "1qsw5wcqs65ip0qq17vq6bf2snnpvw61iq2ahgwl9842ir15hrbr", + "rev": "b71e4928a63a6d75bc1670004a5b5a98c850a149", + "date": "2022-03-16T20:19:11+01:00", + "path": "/nix/store/gzpihd6k8cqsl0facz7kfgn2dh294fxw-tree-sitter-latex", + "sha256": "1z2ywj57fpxaym6bv5ixvc01h8szazbhzmzzw960f49mlrima3n6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index e34455069bc3..5da2dc0585e7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "8bee14c30ecadd55c2d65633973b4e81f93525e0", - "date": "2022-01-16T14:47:09+01:00", - "path": "/nix/store/cv7xqvcj4bjifzddkx5n2jd723dc6vlf-tree-sitter-markdown", - "sha256": "0vibmpp86pkqllfhb0kg6zhaz09sh8m6a2d1xa8p2qdi7ryy7wqa", + "rev": "b49b2da50864171eff56acc8ba067c3540a3991f", + "date": "2022-02-26T15:22:17+01:00", + "path": "/nix/store/vllxsz0nvlw6z9y6s199l5z8f5dlhcpv-tree-sitter-markdown", + "sha256": "1adypmkfsf6pgahba588d8l6ib59209rb2fkyk2dv0d3va76pr8x", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 801634201c86..4a4eecf5ddb3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d", - "date": "2021-11-29T00:27:21-06:00", - "path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix", - "sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9", + "rev": "470b15a60520ff7b86f51732b8d8f1118c86041e", + "date": "2022-03-18T01:42:08-05:00", + "path": "/nix/store/c5y76kz7wmfq05hfw4xpqz2ahcdy924f-tree-sitter-nix", + "sha256": "1hl0mpy0i6r160v6v3nflrdi5fnmd8i5zbx963h5nj9fg4srkb5r", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 1743d2252cd6..a4846c64e694 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "b7f879eaf9f20852f6b670439154b0128fbb6558", - "date": "2022-02-08T12:24:02+01:00", - "path": "/nix/store/q02py98zm9cmalzc5a0yqw8lg73ybx9g-tree-sitter-norg", - "sha256": "07hm5sysb25ivlz52ijnbka02hlqksha259w7v03awap85i9ydk6", + "rev": "17d61df817c1e0a9cdef8d915d4e4c556b7cf68c", + "date": "2022-03-16T16:23:43+01:00", + "path": "/nix/store/xjsyabq06584fnwjvqbyqf6yd19i4gn9-tree-sitter-norg", + "sha256": "161pmkpfyfhf4lcgkzcl1wdi4bsmmpwxcz7kjcb0jpjy7bamikch", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 9585b6c60768..8b4175a4f3cc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "ab2b39439f2fc82fd5ea0b7e08509760d4cbacd5", - "date": "2022-01-23T13:55:11-05:00", - "path": "/nix/store/s55aybm3r5n7l7nx916mhjyry96xcvin-tree-sitter-perl", - "sha256": "16ap0yq9gmh0kbyka7zcpjw3dl368n23sxp3v82z4ccwzmgfmaw4", + "rev": "bbf86084d9b7eb4768f3fb9fe094b3e0600057b1", + "date": "2022-02-26T01:42:56+05:30", + "path": "/nix/store/cpsi8sjl3d1v5sg2rcsw3arf7zwm4l06-tree-sitter-perl", + "sha256": "037kdl6kq47p35qd3p6j4560x6w24zzmjxnz2fkd28xrm0lsh9lm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json index ec69a798aad6..ad0fbd525ed8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json @@ -1,9 +1,9 @@ { "url": "https://github.com/victorhqc/tree-sitter-prisma", - "rev": "74a721e8eed1a4a25cf495d45974ba24f315f81a", - "date": "2021-11-19T19:52:32+01:00", - "path": "/nix/store/rbr2p57ic1kn0121ca6k0bh2r8svw066-tree-sitter-prisma", - "sha256": "1b8yil6v9jz9ndx2kzln639fkjkj1xb0qfcip1njxcq5mlqlfswd", + "rev": "bf0833cbedb2c5b39250f5ba900f1239a16c6749", + "date": "2022-03-18T18:56:29+01:00", + "path": "/nix/store/9pq2l5b34xvi3v6i9zq1qxh3r2ilg2qs-tree-sitter-prisma", + "sha256": "0idgrra41w4v3sa4sb0p3ba7k6sxfw74px4fkpprddjqjdnsrl50", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 87cc40f83b89..670103d5c78d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68", - "date": "2022-02-04T13:11:35-08:00", - "path": "/nix/store/i1f2zyrqghy98pl7dfnvcpbs3jsnmhay-tree-sitter-rust", - "sha256": "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg", + "rev": "0509e440ae042db6483984b3a56b3c5f24b5d9b9", + "date": "2022-03-09T12:11:47+01:00", + "path": "/nix/store/9jrsqsrql5wlbzmqna111w4a02hf75z2-tree-sitter-rust", + "sha256": "1r8n8441b8bppizlzh4xw7yy3amz4apfxpqxm8hw0n3j3iwnw4pz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index 12322fe82b40..f4aaecb7bdf3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "bc573ef552adf8bed9e36eb687a0cccf43158634", - "date": "2022-01-24T16:13:56+01:00", - "path": "/nix/store/2i9n2fvjk0ymxv32ziq5z9ykv95svi7d-tree-sitter-viml", - "sha256": "0ckx9jh9fqfw5x9yb0sljczb0xsgxs8j6v2qbqywh5z6fcqx8sjc", + "rev": "c9d70082af14988842eb071c6c0b07e8d1d993ac", + "date": "2022-03-21T17:11:25+01:00", + "path": "/nix/store/z1bjg25frb0sq7kr0s3sp6jnz888p900-tree-sitter-viml", + "sha256": "05mf8i5ni0kp4g1gdpgwjxi2d86hna2ijp9k7c1gy9j33hsq9i8g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 5ab34fb0e25b..a9de3692209e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "93331b8bd8b4ebee2b575490b2758f16ad4e9f30", - "date": "2022-01-10T15:22:15+09:00", - "path": "/nix/store/g54w7vid7nf9shzfipch646dk4d88ah7-tree-sitter-zig", - "sha256": "0irckd6bh3i1vr5bi2lwsbvibbpih3jv3xqdq0dbsiy447dfiv50", + "rev": "42e93d02ca945094699e2dc4de785bbaf8f740ec", + "date": "2022-02-11T10:40:42+09:00", + "path": "/nix/store/2yv27si133zqb93bm9gia0ymib9q2y75-tree-sitter-zig", + "sha256": "14p02b04v67cvkvj7apipsmkmvv3jnhykm0qrrmqqxnkprac31im", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 7b01ce8d9c55c3051a3ff3e7750d2c4f6d35daef Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 21 Mar 2022 23:21:13 +0100 Subject: [PATCH 107/150] minio: 2022-02-26T02-54-46Z -> 2022-03-17T06-34-49Z --- 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 c9c9bb8af068..9823ee5dddd3 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-02-26T02-54-46Z"; + version = "2022-03-17T06-34-49Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-+XiormhPdbQRzlqD4Y/+zcPnlIxNJnz9dU53eKYdG5Q="; + sha256 = "sha256-iHwFkxfSLrtzSiOmfVFggBvfL0SL6ZLVJWMGK3RHZGU="; }; - vendorSha256 = "sha256-omX4nT85+ZT71cQXdiPJHyR+/afEbb43GqeJuxzV0mA="; + vendorSha256 = "sha256-ujkrbP7FuL7jdYTRaGMEYha1BJKJnpCssuO47XGMBGo="; doCheck = false; From 44cbf46178e4e91a56cb061b5430ba9c6529e027 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 00:41:17 +0000 Subject: [PATCH 108/150] python310Packages.pysigma-pipeline-sysmon: 0.1.2 -> 0.1.3 --- .../python-modules/pysigma-pipeline-sysmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index 02a12f93f7b7..7c1e959d7406 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "v${version}"; - hash = "sha256-Y9X9/ynrfs4gVTLl7pOvK3TH2Eh2vNF1S6Cnt3tByJM="; + hash = "sha256-uJgV7emBqQN792EvfOz85BKoZY8DCCr8aUN7Ai8R9js="; }; nativeBuildInputs = [ From 50c32e180649a98b013f78741b083a996deb848b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 00:53:21 +0000 Subject: [PATCH 109/150] amass: 3.17.1 -> 3.18.2 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 867943783ba2..cb0f52915606 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.17.1"; + version = "3.18.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-AFy0Ob6caU3yGC9s5Til5sYZ3A4qiEeU96OfeMlR/Q4="; + sha256 = "sha256-2HE+hzvEbM+68x3YJq8rIMCKAld9MLrCEuHBA4uuetI="; }; - vendorSha256 = "sha256-6qfHoP7TOmRZLIiijRfQxyct+486TXQ18cdH8pdhwmQ="; + vendorSha256 = "sha256-hYrv5z+9JY7gXkC4xQvko7qhwBtzywUy0TMqrlgqXb0="; outputs = [ "out" "wordlists" ]; From 86e74a4b9746220dad3d03452aae58c014c61cfa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 21 Mar 2022 15:15:37 +0800 Subject: [PATCH 110/150] wp-cli: ensure arguments are sent to wp-cli and not php --- pkgs/development/tools/wp-cli/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9ee452b26f9c..0d828eb8b9ed 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -41,7 +41,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ - --add-flags "-f $dir/wp-cli" + --add-flags "-f $dir/wp-cli" \ + --add-flags "--" # this is a very basic run test $out/bin/wp --info >/dev/null From e473e8c210d773f27d658cd50cc080ffa5d4e0e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 01:06:14 +0000 Subject: [PATCH 111/150] python310Packages.meshtastic: 1.2.92 -> 1.2.93 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 1972ae0ff5d4..4c92063de660 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.92"; + version = "1.2.93"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-tK711Lewr5Zc6dy/cDe9UEnq9zOEvuJg4mZyO3zBLR0="; + sha256 = "sha256-4jh5AYjr1qnr3nOeJSLwtAzdPlmpW1BBrEXfB86NrL0="; }; propagatedBuildInputs = [ From 8eb25b61d187d7a70bc8e865d70e6c184090a41a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 01:54:10 +0000 Subject: [PATCH 112/150] python310Packages.pytest-cases: 3.6.10 -> 3.6.11 --- pkgs/development/python-modules/pytest-cases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 5d4d8d1798fc..80e31e8effae 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.10"; + version = "3.6.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W8Syxgl/lPqDX2zdzvpk3Q/0aNBWM8JeUOXGDBYyamM="; + sha256 = "sha256-9rcXPoGxR3sxX3tFbv1O/T7kfrKnIB2XV1mJvSH5WQ4="; }; nativeBuildInputs = [ From 812c6acdfcf323633a95c8015599ffa1dad1886d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 02:05:14 +0000 Subject: [PATCH 113/150] buf: 1.1.0 -> 1.1.1 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 1b0ccab29644..c46cd0d0a41a 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8GwZsFvxaTtG/q7DaWvZcGdbyJ4Cm41BqSvwq3SqoEg="; + sha256 = "sha256-w/P9pNHxaBRlAly5jE7I0JsjjFeDctFaXOTbzDESaCo="; }; - vendorSha256 = "sha256-g3bvfNF0XkC12/tRZsO+o2z20w+riWiHOer8Pzp1QF0="; + vendorSha256 = "sha256-AM/MN4vdcsHEbYdOEuVOvkMCdMDnk2UiW5vUnXcj+wY="; patches = [ # Skip a test that requires networking to be available to work. From 3c8312dfef1de740c3fd5d6c54d85991faa7ad6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 02:05:34 +0000 Subject: [PATCH 114/150] clojure: 1.10.3.1087 -> 1.10.3.1093 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 09774f7fb6d5..890440971a84 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1087"; + version = "1.10.3.1093"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-prOzVHrcbabKXP4Q4Dfx/eiKePlINyu1mO9NCFnaPpQ="; + sha256 = "sha256-H6cMwsgWAjsg1YRtm0X/FA3Gjy1yEidsgkFE32Xgdso="; }; nativeBuildInputs = [ From a5fddb932438dd2f4d65b7bc07dc637751bd84d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 03:09:02 +0000 Subject: [PATCH 115/150] python310Packages.hahomematic: 0.38.2 -> 0.38.4 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index be9be54a79a9..8bde06767844 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.38.2"; + version = "0.38.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-oyO4+zxyhr2azUdeNfw0WjgN6LFxi3+svJ/B/tUEqjQ="; + sha256 = "sha256-WvcQTaYlKTOYbYwH/FbNTMoHdUhesYeeNYP8RDgQms4="; }; propagatedBuildInputs = [ From 1ed1d764f6c6fbf353fb6a4cd1257230df860ec4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 03:15:38 +0000 Subject: [PATCH 116/150] python310Packages.manimpango: 0.4.0.post2 -> 0.4.1 --- pkgs/development/python-modules/manimpango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index b717b4491173..f0f8bff52467 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.0.post2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BMRlEdvJJOUbsvKEoZx2qJqHSbL475dhBthUpnsXkn4="; + sha256 = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; }; postPatch = '' From d766699779eb86f42b67f1efe5e8d3d2b68e7159 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 04:03:20 +0000 Subject: [PATCH 117/150] dnsproxy: 0.41.4 -> 0.42.0 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index d6ec3c3f75d5..2800496aae9a 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.41.4"; + version = "0.42.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aVYjYEAEANAMGv7frZWfYWLzX7rcI8phpjvrENK8cc4="; + sha256 = "sha256-UXFDFS2TFzo7DcExazt4h0TTnGeMf6d3FAiPXZWB7Ys="; }; vendorSha256 = null; From a6fd2c461803a50732b6cced19a893804b736211 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 04:08:19 +0000 Subject: [PATCH 118/150] docker-buildx: 0.8.0 -> 0.8.1 --- pkgs/applications/virtualization/docker/buildx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 440d094b4301..9b440963f4ae 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-PSqVe4m2na6BjNxIKKZG1ja6zEzwI2AwgJlaMfaW2EM="; + sha256 = "sha256-NJNFjzbiBcmXcBF1k0qybv5LnkaQ+1ehSfF18CC85JY="; }; vendorSha256 = null; From 6823f42f0e9dca19042ab8e96e17225a43cad77b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 04:38:55 +0000 Subject: [PATCH 119/150] python310Packages.blinkpy: 0.18.0 -> 0.19.0 --- pkgs/development/python-modules/blinkpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 27b7ba03d450..ae509418b7b1 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "v${version}"; - hash = "sha256-96HoGXVQE5PbUbu0oDOC0es0HXYig4ScTeexiUhGse4="; + hash = "sha256-niUGfktP1zVdrRCDy81ou4yAoscnYveHje9423IKcso="; }; propagatedBuildInputs = [ From 054e5b573bf8629b6fdd8fa1a231ed4648167851 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 06:23:00 +0000 Subject: [PATCH 120/150] python310Packages.ibm-watson: 5.3.1 -> 6.0.0 --- pkgs/development/python-modules/ibm-watson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index e8ecdfff32ba..d169190ef8c8 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.3.1"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "1x6r8j0xyi81jb0q4pzr6l7aglykrwqz8nw45clv79v33i2sgdcs"; + sha256 = "sha256-AvWcw1VV47v2yvaqukPSql7rA7wVwrvtCDsvYtPZXKs="; }; propagatedBuildInputs = [ From 77d8cc83dec3e0cce385512bf7db134e9e5389bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 06:55:59 +0000 Subject: [PATCH 121/150] gosec: 2.10.0 -> 2.11.0 --- pkgs/development/tools/gosec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index d9e19fdac90e..ac653db1bf02 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a3MDGsTqndHlT6fbUkdsBShDqWXOHQiJFUIjyMqvMq8="; + sha256 = "sha256-AYD45L1FFT/S1toLK489C2TTasTHVXIs4Tf7TLOaye0="; }; - vendorSha256 = "sha256-3ZGzVGKwnNab8wUn0fRepl4FDo43MAqNAO3zijH90/0="; + vendorSha256 = "sha256-zzbINVp8EA5aIvwUiFlQRtD6YL0iytbgVzCHbo+clYI="; subPackages = [ "cmd/gosec" From 283acd12292c8905de453cd4971a340a76e9690f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Mar 2022 08:55:52 +0100 Subject: [PATCH 122/150] python3Packages.manimpango: disable on older Python releases --- .../python-modules/manimpango/default.nix | 50 +++++++++++++++---- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index f0f8bff52467..f77aa81bbb60 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -1,37 +1,65 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, pkg-config +, pango +, cython +, AppKit +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "manimpango"; version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; + hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; }; - postPatch = '' - substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" "" - ''; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + pango + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; propagatedBuildInputs = [ cython ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov --no-cov-on-fail" "" + ''; + preBuild = '' ${python.interpreter} setup.py build_ext --inplace ''; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "manimpango" ]; + pythonImportsCheck = [ + "manimpango" + ]; meta = with lib; { + description = "Binding for Pango"; homepage = "https://github.com/ManimCommunity/ManimPango"; license = licenses.mit; - description = "Binding for Pango"; - maintainers = [ maintainers.emilytrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } From 24781cfa0df812ebf1d7c1bd617b49b22e3d57e8 Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Tue, 22 Mar 2022 09:39:35 +0200 Subject: [PATCH 123/150] tfsec: 1.2.1 -> 1.13.0 --- .../tools/analysis/tfsec/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 87e7676da899..6c2427d3724a 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -1,31 +1,38 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "tfsec"; - version = "1.2.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KIS2o2pLus5aohRYsabWRxZs4KfYM6PXSNp0JZhhlZk="; + sha256 = "sha256-/N8p/tw97sDW4I1ysfJ2QXACGsSc5nRFSu6jHwQvPU4="; }; - goPackagePath = "github.com/aquasecurity/tfsec"; - ldflags = [ - "-w" - "-s" - "-X ${goPackagePath}/version.Version=${version}" + "-s" "-w" + "-X github.com/aquasecurity/tfsec/version.Version=${version}" + ## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6) + # "-extldflags '-fno-PIC -static'" + ]; + + vendorSha256 = "sha256-nTma96kT84mpJHRA9+/sZQVvwtz9arv/OHY9lgWJDFc="; + + subPackages = [ + "cmd/tfsec" + "cmd/tfsec-docs" + "cmd/tfsec-checkgen" ]; meta = with lib; { description = "Static analysis powered security scanner for terraform code"; homepage = "https://github.com/aquasecurity/tfsec"; license = licenses.mit; - maintainers = with maintainers; [ fab marsam ]; + maintainers = with maintainers; [ fab marsam peterromfeldhk ]; }; } From f89439a30168093ff3cea3d0f87e1956e68eef2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 08:05:42 +0000 Subject: [PATCH 124/150] python310Packages.python-kasa: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/python-kasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 17c3cb07be36..6adfbf5745d2 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-4e9jpUDorZlKCYwWtqrba61zbkJl57oWUhEpFcaS9ak="; + sha256 = "sha256-5Ohks3yfqAAe+CiLEucibezmibl6TtktDXMHAhecXzA="; }; nativeBuildInputs = [ From bf6c94077672a36acd39d2fc53bf0054d1f5e907 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Mar 2022 09:12:29 +0100 Subject: [PATCH 125/150] python3Packages.pyskyqhub: 0.1.4 -> 0.1.6 --- pkgs/development/python-modules/pyskyqhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix index 1f3ad1874621..1620db33e444 100644 --- a/pkgs/development/python-modules/pyskyqhub/default.nix +++ b/pkgs/development/python-modules/pyskyqhub/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyskyqhub"; - version = "0.1.4"; + version = "0.1.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_hub"; rev = version; - sha256 = "EVkTvynMPmCr7DPuDqfpMvVPCvpPpJHfqsNjD3tn8zg="; + sha256 = "sha256-Qc7mb51KKGLNWjeiJKAsFO/RNLefv0sRHWwXodMBi/k="; }; propagatedBuildInputs = [ From f487601491e7ca58870fa0494bb06e701c2a5803 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Mar 2022 09:14:02 +0100 Subject: [PATCH 126/150] python3Packages.pysigma: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/pysigma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 89bea0d0dc9a..be35230dbd6b 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-egyzeniid2PZZQ6hsd44W+YURI8uGaXvDMuhNIXUqO0="; + hash = "sha256-0k6m86RQoP4QTuxmCWBpxiGqaJt3alOLS5BAuOFwdb4="; }; nativeBuildInputs = [ From 8757379f78c40e119119a815269a8c8fea7c25c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Mar 2022 09:17:48 +0100 Subject: [PATCH 127/150] python3Packages.pysigma-backend-splunk: 0.1.2 -> 0.2.0 --- .../python-modules/pysigma-backend-splunk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 97d5bd84f668..ab757085d1ca 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , poetry-core , pysigma +, pysigma-pipeline-sysmon , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "v${version}"; - hash = "sha256-jKvGBUO55DtF6bpgEL82XB5Ba+kmqJsCqUdzftcpSJ0="; + hash = "sha256-EP0gcK05hZ5TCOgTePezfEGbW45dGrnnksWyI9Jo9MQ="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pysigma-pipeline-sysmon pytestCheckHook ]; From 006f552af4a93768f9ab487623cf909b127b8229 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Mar 2022 09:23:39 +0100 Subject: [PATCH 128/150] python3Packages.pyvesync: 1.4.3 -> 2.0.0 --- pkgs/development/python-modules/pyvesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 1cd6de8ef41b..96669c52634b 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "1.4.3"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DEDgZXMQrINYImXaWmv/7W7q8RvqK8oMG/B2XsDdZDM="; + sha256 = "sha256-+054tFirjMF3sGLRpTVCZ3V2KN627b57+fFl6GBMMcU="; }; propagatedBuildInputs = [ From 87909ae9c3499b4a504516524b472fd12cc22c4f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 22 Mar 2022 08:25:47 +0000 Subject: [PATCH 129/150] ko: 0.11.1 -> 0.11.2 --- pkgs/development/tools/ko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index ca187dea93da..f7add96fbad9 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VtPry8sF+W46gc2lI3uiE4wqilo1WhH+940QKPZ5cyI="; + sha256 = "sha256-BwK49dSt3D2BrYvluDOBYIH5qEt59HC1hssHl1D2Heg="; }; vendorSha256 = null; From 5dbd4b2b27e24eaed6a79603875493b15b999d4b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Mar 2022 08:12:41 +0100 Subject: [PATCH 130/150] =?UTF-8?q?ocamlPackages.ocamlscript:=202.0.3=20?= =?UTF-8?q?=E2=86=92=203.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/ocamlscript/Makefile.patch | 75 +++++++++---------- .../tools/ocaml/ocamlscript/default.nix | 26 ++++--- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch index 4fc887c070d7..e26993f760ae 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch +++ b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch @@ -1,42 +1,23 @@ ---- a/Makefile 2012-02-04 01:24:21.000000000 +0000 -+++ b/Makefile 2014-10-29 14:42:08.690188302 +0000 -@@ -4,6 +4,8 @@ - version.ml pipeline.mli pipeline.ml common.mli common.ml \ - utils.mli utils.ml ocaml.mli ocaml.ml - -+CAMLP4 := $(shell ocamlfind query camlp4) -+ - STDBIN = $(shell dirname `which ocamlfind`) - ifndef PREFIX - PREFIX = $(shell dirname $(STDBIN)) -@@ -15,7 +17,7 @@ +diff --git a/Makefile b/Makefile +index 894e94d..9adc44b 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ ifndef BINDIR endif export BINDIR -PACKS = unix str +PACKS = unix str findlib - PP = camlp4o -I . -parser pa_tryfinally.cmo -parser pa_opt.cmo - export PP + # PP = camlp4o -I . -parser pa_opt.cmo + # export PP -@@ -36,11 +38,11 @@ - - common: version.ml - ocamlc -pp 'camlp4orf -loc _loc' -c \ -- -I +camlp4 pa_opt310.ml && \ -+ -I $(CAMLP4) pa_opt310.ml && \ - cp pa_opt310.cmo pa_opt.cmo && \ - cp pa_opt310.cmi pa_opt.cmi - ocamlc -pp 'camlp4orf -loc _loc' -c \ -- -I +camlp4 pa_tryfinally310.ml && \ -+ -I $(CAMLP4) pa_tryfinally310.ml && \ - cp pa_tryfinally310.cmo pa_tryfinally.cmo && \ - cp pa_tryfinally310.cmi pa_tryfinally.cmi - ---- a/main.ml 2014-11-08 09:05:12.516401313 +0000 -+++ b/main.ml 2014-11-08 09:09:59.801311230 +0000 -@@ -250,9 +250,15 @@ - Sys.getcwd ()) - | `File script_name -> "", get_dir script_name in +diff --git a/main.ml b/main.ml +index 288526a..b67c5e9 100644 +--- a/main.ml ++++ b/main.ml +@@ -247,6 +247,11 @@ let write_header ~pos ~source ~source_option ~verbose ~prog_file lines = + Sys.getcwd ()) + | `File script_name -> "", get_dir script_name in + let findlibdir = + Filename.( @@ -46,20 +27,24 @@ let file, oc = Filename.open_temp_file "meta" ".ml" in fprintf oc "\ #%i %S;; +@@ -255,6 +260,7 @@ let () = + try Topdirs.dir_directory (Sys.getenv \"OCAML_TOPLEVEL_PATH\") + with Not_found -> () + ;; +#directory \"%s\";; #use \"topfind\";; #require \"ocamlscript\";; Ocamlscript.Common.verbose := %s;; -@@ -261,7 +267,7 @@ +@@ -263,7 +269,7 @@ Ocamlscript.Common.script_dir := %S;; open Ocamlscript;; open Utils;; #%i %S;;\n" -- pos source verbose script_dir extra_args trash pos source; -+ pos source findlibdir verbose script_dir extra_args trash pos source; - +- pos source verbose script_dir extra_args trash pos source; ++ pos source findlibdir verbose script_dir extra_args trash pos source; + List.iter (output_line oc) lines; -@@ -544,6 +550,7 @@ +@@ -550,6 +556,7 @@ let main () = exit compilation_status let _ = @@ -67,4 +52,16 @@ try main () with Failure s -> eprintf "ocamlscript: %s\n%!" s; - +diff --git a/ocaml.ml b/ocaml.ml +index a1824c6..b8f287e 100644 +--- a/ocaml.ml ++++ b/ocaml.ml +@@ -14,7 +14,7 @@ let ocamlfind = ref "ocamlfind" + let packs = ref [] (* findlib packages *) + let sources = ref [] (* extra sources *) + let use_ocamllex = ref false (* preprocess with ocamllex before camlp4 *) +-let use_camlp4 = ref true (* by default camlp4 is used *) ++let use_camlp4 = ref false (* by default camlp4 is not used *) + let use_ocamlc = ref false (* by default we want native code *) + let use_ocamlfind = ref false (* used only if necessary *) + let revised = ref false (* use this to use the revised syntax *) diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 82a495b733b5..0b4b748f0586 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -1,26 +1,32 @@ -{lib, stdenv, fetchurl, ocaml, findlib, camlp4}: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "ocamlscript is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { - pname = "ocamlscript"; - version = "2.0.3"; - src = fetchurl { - url = "https://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; + pname = "ocaml${ocaml.version}-ocamlscript"; + version = "3.0.0"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "ocamlscript"; + rev = "v${version}"; + sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql"; }; - propagatedBuildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ ocaml findlib ]; patches = [ ./Makefile.patch ]; buildFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ]; - preInstall = "mkdir $out/bin"; + preInstall = "mkdir -p $out/bin"; createFindlibDestdir = true; meta = with lib; { - homepage = "http://martin.jambon.free.fr/ocamlscript.html"; + inherit (src.meta) homepage; license = licenses.boost; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "Natively-compiled OCaml scripts"; maintainers = [ maintainers.vbgl ]; }; From ae67ae39f8dfca34f6414e3d5d0a579ee14c93c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 08:47:33 +0000 Subject: [PATCH 131/150] juju: 2.9.26 -> 2.9.27 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 0d57e252e301..b22cea57987c 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.26"; + version = "2.9.27"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-phzjjW9KG0Z5WAzxtYdI7i2Nw4FHVNeEJswQreHga4M="; + sha256 = "sha256-4G+veQkPY6n/uRMsBWQgig/6IDc0Y2nXDpMUyC1ShF4="; }; - vendorSha256 = "sha256-Jzd6I3a/2Un2a3/T2vzFuHwe9Y3eGEvfpZWSwjWokM0="; + vendorSha256 = "sha256-Ieaf+Qp/7/6nv2ftHY3pbtOg+t7dYAuMv4BvhRaAZ9E="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From 28d840de0e505231122f0a72854a73a45360bde3 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 22 Mar 2022 09:17:55 +0000 Subject: [PATCH 132/150] grype: 0.34.3 -> 0.34.4 --- pkgs/tools/security/grype/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 1b80d7ecd883..e97a1b6fb13b 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.34.3"; + version = "0.34.4"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iWmLfQ08+dhjvKQiK2iy2Tegk4jH9dGopu/6kdDRZd0="; + sha256 = "sha256-t5N9C69u8bTXXobptmxA+yuQ88Hko8Hhhp+nyC/tMFc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-WrUZFlN7dPbyN9InjX/Y9J+iYKu5v2/SHmRgDP5BJi8="; + vendorSha256 = "sha256-u11SKoybGobfxsjLq9mYFzZWw01Dms5RyKxmZA47XqI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eadc4a2c85c..549d120190e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6389,7 +6389,9 @@ with pkgs; gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - grype = callPackage ../tools/security/grype { }; + grype = callPackage ../tools/security/grype { + buildGoModule = buildGo118Module; + }; gt5 = callPackage ../tools/system/gt5 { }; From c132d20ef1f1c0aaf426167f276670c4ef281cce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 09:18:12 +0000 Subject: [PATCH 133/150] ktlint: 0.45.0 -> 0.45.1 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 08bfa727758b..ad41cf6e4af7 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.45.0"; + version = "0.45.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-M6M1hYA13QTcX4btcni+GB1NEJYEEeuITIpmY2qS9CM="; + sha256 = "sha256-fEMLZ8lV1RNFlf5ApfJOG9jI8JumpgP673+XSOWgsKI="; }; nativeBuildInputs = [ makeWrapper ]; From 8a6b3eb598a3867d0d24461d485bb5c1720c336b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 09:26:11 +0000 Subject: [PATCH 134/150] python310Packages.asyncsleepiq: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/asyncsleepiq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index 53bd099fce50..93b4aca2aa71 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.1.2"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZpxiFV9Ch46vIDxNDYm0BBD5EY8+j8AzOu6lKsQpGrY="; + sha256 = "sha256-bE9eOjOLERnioOunIBN7Hc/Nvs1zDXMSMzqZsVRg6Jo="; }; propagatedBuildInputs = [ From 5e6a95991e16ffc7a3d7e57ca8bd69de1f69c5e8 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 22 Mar 2022 09:50:19 +0000 Subject: [PATCH 135/150] terragrunt: 0.36.2 -> 0.36.6 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 110193a6ab4b..48025dfd7f72 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.2"; + version = "0.36.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Iv9ZQoU/mMYdxBuPfoYc/zQXQ14FmDBfoFwxnESC6Ns="; + sha256 = "sha256-WSvdv4E/m6mJZdo3s9FHMETKaYNB7mltWrQlTHTFJ/E="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; From 41d45d674a3460b4984c6e3917f7cf231d0ec386 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 17 Mar 2022 16:40:54 +0100 Subject: [PATCH 136/150] nixos/ipfs: add systemd hardening Use the hardened systemd unit from upstream. --- .../services/network-filesystems/ipfs.nix | 7 +++++- nixos/tests/ipfs.nix | 5 ++++ pkgs/applications/networking/ipfs/default.nix | 24 ++++++++++++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 17da020bf3e2..655785b99d87 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -239,7 +239,10 @@ in "d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -" ]; - systemd.packages = [ cfg.package ]; + # The hardened systemd unit breaks the fuse-mount function according to documentation in the unit file itself + systemd.packages = if cfg.autoMount + then [ cfg.package.systemd_unit ] + else [ cfg.package.systemd_unit_hardened ]; systemd.services.ipfs = { path = [ "/run/wrappers" cfg.package ]; @@ -275,6 +278,8 @@ in ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}" ]; User = cfg.user; Group = cfg.group; + StateDirectory = ""; + ReadWritePaths = [ "" cfg.dataDir ]; } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; }; } // optionalAttrs (!cfg.startWhenNeeded) { wantedBy = [ "default.target" ]; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index f8683b0a8580..5e7c967028e4 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Also will add a unix domain socket socket API address, see module. startWhenNeeded = true; apiAddress = "/ip4/127.0.0.1/tcp/2324"; + dataDir = "/mnt/ipfs"; }; }; @@ -35,5 +36,9 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine.succeed( f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2" ) + + # Test if setting dataDir works properly with the hardened systemd unit + machine.succeed("test -e /mnt/ipfs/config") + machine.succeed("test ! -e /var/lib/ipfs/") ''; }) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 2cceddf0bd7c..f6285ae59beb 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -29,15 +29,23 @@ buildGoModule rec { vendorSha256 = null; + outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ]; + + postPatch = '' + substituteInPlace 'misc/systemd/ipfs.service' \ + --replace '/usr/bin/ipfs' "$out/bin/ipfs" + substituteInPlace 'misc/systemd/ipfs-hardened.service' \ + --replace '/usr/bin/ipfs' "$out/bin/ipfs" + ''; + postInstall = '' - install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service - install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service - install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket - install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket - substituteInPlace $out/etc/systemd/system/ipfs.service \ - --replace /usr/bin/ipfs $out/bin/ipfs - substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \ - --replace /usr/bin/ipfs $out/bin/ipfs + install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit/etc/systemd/system/ipfs-api.socket" + install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit/etc/systemd/system/ipfs-gateway.socket" + install --mode=444 -D 'misc/systemd/ipfs.service' "$systemd_unit/etc/systemd/system/ipfs.service" + + install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-api.socket" + install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-gateway.socket" + install --mode=444 -D 'misc/systemd/ipfs-hardened.service' "$systemd_unit_hardened/etc/systemd/system/ipfs.service" ''; meta = with lib; { From 934dd07de9d14c44fb9fa040e231b6b5ce28865e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Mar 2022 11:15:31 +0100 Subject: [PATCH 137/150] sigma-cli: 0.3.2 -> 0.3.3 --- pkgs/tools/security/sigma-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index 5a6a3ab9ef54..3d83653cb00f 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; rev = "v${version}"; - hash = "sha256-We6vJXLIxGe//78pgJFrihFJHl0gRd02I53hoYWcao0="; + hash = "sha256-AUAOZrwLNu+Llg8RX4RKm4vAETgpPLKK1mcpl8jxGYE="; }; nativeBuildInputs = with python3.pkgs; [ From cb040db7ab06db02e9e6544b574ec232c61eceeb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 14 Mar 2022 17:36:05 +0000 Subject: [PATCH 138/150] pkgsStatic.gcc: fix build LTO requires building a compiler plugin, which is a shared object. The closure is a bit wild but it builds and can compile programs. --- pkgs/development/compilers/gcc/10/default.nix | 2 +- pkgs/development/compilers/gcc/11/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- pkgs/development/compilers/gcc/8/default.nix | 2 +- pkgs/development/compilers/gcc/9/default.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 4493fd936ec3..a26aaf771af3 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index a9498b1060db..b78ca339fb85 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index c192c603c883..bc7868cc4606 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 70278c237d4c..bb1a3dd7d636 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 1809d7ae42ef..7548ec56c759 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -15,7 +15,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index dcb7d0b91f6f..dfac97104eb6 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -13,7 +13,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 01deb2727b85..609dfa722a65 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -13,7 +13,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9d21ed667f6c..ea4296826661 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -15,7 +15,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf From da450f6b1d4614ae6d060fa75e99eb5906f18b8d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 17 Mar 2022 17:54:19 +0000 Subject: [PATCH 139/150] treewide: clean up obsolete version checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These checks are all redundant with the check for Nix ≥2.2 in default.nix. --- pkgs/build-support/fetchipfs/default.nix | 2 -- pkgs/build-support/fetchurl/default.nix | 2 -- pkgs/build-support/nix-gitignore/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 4 files changed, 11 deletions(-) diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index 7a66999ec569..0cbb094d6003 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -17,8 +17,6 @@ , preferLocalBuild ? true }: -assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; - let hasHash = (outputHash != "" && outputHashAlgo != "") diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 776089dab999..dcab471fc839 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -100,8 +100,6 @@ in , nativeBuildInputs ? [ ] }: -assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; - let urls_ = if urls != [] && url == "" then diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index 497dcb0660b0..d55465302e44 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -12,11 +12,6 @@ with builtins; let debug = a: trace a a; last = l: elemAt l ((length l) - 1); - - throwIfOldNix = let required = "2.0"; in - if compareVersions nixVersion required == -1 - then throw "nix (v${nixVersion} =< v${required}) is too old for nix-gitignore" - else true; in rec { # [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path filterPattern = patterns: root: @@ -31,7 +26,6 @@ in rec { # string -> [[regex bool]] gitignoreToPatterns = gitignore: - assert throwIfOldNix; let # ignore -> bool isComment = i: (match "^(#.*|$)" i) != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eadc4a2c85c..959422f326e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33779,7 +33779,6 @@ with pkgs; nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + - (lib.optionalString (!lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) "ugrade your Nix installation to a newer version and ") + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); From b2a46c270544fc6a2987264fbd92fe724b3b1f2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 11:08:19 +0000 Subject: [PATCH 140/150] python310Packages.catalogue: 2.0.6 -> 2.0.7 --- pkgs/development/python-modules/catalogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 7105e360561e..e47e77b9eb49 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "catalogue"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik"; + sha256 = "sha256-U10zrnnr0hyimFUdhdoYaui44d82sPsCRtp3QWPsLWs="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ From 6340db62495590ec33b05867cd4654123e70010f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 22 Mar 2022 17:16:55 +0800 Subject: [PATCH 141/150] libreoffice-qt: kf5 header files have moved into a subdir --- pkgs/applications/office/libreoffice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index aac85b9d4008..1fe7598d0e10 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -110,6 +110,7 @@ in (mkDrv rec { 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' '' + lib.optionalString kdeIntegration '' substituteInPlace configure.ac \ + --replace kcoreaddons_version.h KCoreAddons/kcoreaddons_version.h \ --replace '$QT5INC' ${qtbase.dev}/include \ --replace '$QT5LIB' ${qtbase.out}/lib \ --replace '-I$qt5_incdir ' '-I${qtx11extras.dev}/include '\ From 3031d3308d0a249ed99ed31a9973447a1feab26a Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 22 Mar 2022 21:33:45 +1000 Subject: [PATCH 142/150] python3Packages.dataclasses-json: 0.5.6 -> 0.5.7 https://github.com/lidatong/dataclasses-json/releases/tag/v0.5.7 --- .../python-modules/dataclasses-json/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 196d3b913776..2a4fd2cef42b 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "09253p0zjqfaqap7jgfgjl1jswwnz7mb6x7dqix09id92mnb89mf"; + sha256 = "1xv9br6mm5pcwfy10ykbc1c0n83fqyj1pa81z272kqww7wpkkp6j"; }; propagatedBuildInputs = [ @@ -30,11 +30,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # AssertionError: Type annotations check failed - "test_type_hints" - ]; - pythonImportsCheck = [ "dataclasses_json" ]; meta = with lib; { From 052632fd15550d83fe98ed599c8504eaad67f0b5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 16 Oct 2021 21:15:48 +0800 Subject: [PATCH 143/150] nixos/iwd: workaround for race condition where wlan device disappears --- nixos/modules/services/networking/iwd.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 8835f7f9372d..5c1480e7e2fb 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -1,12 +1,21 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + mkEnableOption mkIf mkOption types + recursiveUpdate; + cfg = config.networking.wireless.iwd; ini = pkgs.formats.ini { }; - configFile = ini.generate "main.conf" cfg.settings; -in { + defaults = { + # without UseDefaultInterface, sometimes wlan0 simply goes AWOL with NetworkManager + # https://iwd.wiki.kernel.org/interface_lifecycle#interface_management_in_iwd + General.UseDefaultInterface = with config.networking.networkmanager; (enable && (wifi.backend == "iwd")); + }; + configFile = ini.generate "main.conf" (recursiveUpdate defaults cfg.settings); + +in +{ options.networking.wireless.iwd = { enable = mkEnableOption "iwd"; @@ -38,10 +47,10 @@ in { ''; }]; - environment.etc."iwd/main.conf".source = configFile; + environment.etc."iwd/${configFile.name}".source = configFile; # for iwctl - environment.systemPackages = [ pkgs.iwd ]; + environment.systemPackages = [ pkgs.iwd ]; services.dbus.packages = [ pkgs.iwd ]; From 6d766ae8b7961fb0ca64639d5318dd29cccc3748 Mon Sep 17 00:00:00 2001 From: Viktor Kleen Date: Tue, 22 Mar 2022 00:16:07 +0000 Subject: [PATCH 144/150] nixos/test-driver: deduplicate VLANs Naively deduplicate VLANs in the python driver for NixOS tests. The current implementation accidentally works, since the VLan class mutates the environment. On construction it sets QEMU_VDE_SOCKET_${id} and this environment variable gets overwritten once a second VLAN with the same id is constructed. Because the NIC flags passed to qemu just use the QEMU_VDE_SOCKET_${id} environment variable, this implicitly chooses a single vde_switch process for each VLAN. However, this leads to unusable vde_switch processes being spawned in each test run and as a side effect makes it impossible to access the correct VLan objects in the interactive test driver. It also makes it remarkably hard to understand why the current implementation ever worked. --- nixos/lib/test-driver/test_driver/driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 880b1c5fdec0..0e5f013193fe 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -55,6 +55,7 @@ class Driver: tmp_dir = get_tmp_dir() with rootlog.nested("start all VLans"): + vlans = list(set(vlans)) self.vlans = [VLan(nr, tmp_dir) for nr in vlans] def cmd(scripts: List[str]) -> Iterator[NixStartScript]: From 55381a3ce18de3bc60f38990b5f3c7ddef5e6075 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 7 Mar 2022 23:53:33 -0300 Subject: [PATCH 145/150] abuild: 3.7.0 -> 3.9.0 --- pkgs/development/tools/abuild/default.nix | 40 +++++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix index 144ec8be9d4e..a597213b866c 100644 --- a/pkgs/development/tools/abuild/default.nix +++ b/pkgs/development/tools/abuild/default.nix @@ -1,32 +1,48 @@ { lib , stdenv , fetchFromGitLab +, makeWrapper , pkg-config +, file +, scdoc , openssl , zlib , busybox +, apk-tools +, perl }: stdenv.mkDerivation rec { pname = "abuild"; - version = "3.7.0"; + version = "3.9.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; - rev = "v${version}"; - sha256 = "1xsik9hyzzq861bi922sb5r8c6r4wpnpxz5kd30i9f20vvfpp5jx"; + rev = version; + sha256 = "1zs8slaqiv8q8bim8mwfy08ymar78rqpkgqksw8y1lsjrj49fqy4"; }; buildInputs = [ openssl zlib busybox + # for $out/bin/apkbuild-cpan and $out/bin/apkbuild-pypi + (perl.withPackages (ps: with ps; [ + LWP + JSON + ModuleBuildTiny + LWPProtocolHttps + IPCSystemSimple + ])) ]; nativeBuildInputs = [ pkg-config + scdoc + makeWrapper + file ]; patchPhase = '' @@ -43,6 +59,24 @@ stdenv.mkDerivation rec { "sysconfdir=${placeholder "out"}/etc" ]; + postInstall = '' + # this script requires unpackaged 'augeas' rubygem, no reason + # to ship it if we can't provide the dependencies for it + rm -f ${placeholder "out"}/bin/apkbuild-gem-resolver + + # Find all executables that are not compiled binaries and wrap + # them, make `apk-tools` available in their PATH and also the + # $out directory since many of the binaries provided call into + # other binaries + for prog in \ + $(find ${placeholder "out"}/bin -type f -exec ${file}/bin/file -i '{}' + \ + | grep -v x-executable | cut -d : -f1); do + wrapProgram $prog \ + --prefix PATH : "${lib.makeBinPath [ apk-tools ]}" \ + --prefix PATH : "${placeholder "out"}/bin" + done + ''; + meta = with lib; { description = "Alpine Linux build tools"; homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; From 216b4f181379ad704b6102eef4ad36b4a18b2d30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Mar 2022 16:19:56 +0000 Subject: [PATCH 146/150] ocenaudio: 3.11.5 -> 3.11.7 --- pkgs/applications/audio/ocenaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 8a25955e2498..50697c6c81a9 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.5"; + version = "3.11.7"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-YkSsvhBbju/NEkT7RspZQYnLkcx/5POA8VtxCAL3Wcc="; + sha256 = "sha256-fTeDRo7gCM1jXTQGm9MsmKu4KvTGDUogF3VSZWk91RM="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { rm -rf $out/opt # Create symlink bzip2 library - ln -s ${bzip2.out}/lib/libbz2.so.1 $out/libbz2.so.1.0 + ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/libbz2.so.1.0 ''; meta = with lib; { From b4c2ffaffa600ffce2121e21f65641ec92955781 Mon Sep 17 00:00:00 2001 From: Sivizius Date: Tue, 22 Mar 2022 14:25:57 +0100 Subject: [PATCH 147/150] nixos/wg-quick: add autostart option to interfaces (#162219) This adds the option `networking.wg-quick.interfaces..autostart`, which defaults to `true`, which is the previous behavior. With this option set to `false`, the systemd-unit will no longer be set to `wantedBy = [ "multi-user.target" ]` and therefore the tunnel has to be enabled/disabled via `systemctl start/stop wg-quick-`. Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> --- nixos/modules/services/networking/wg-quick.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index 414775fc3577..61e9fe5096b1 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -17,6 +17,13 @@ let description = "The IP addresses of the interface."; }; + autostart = mkOption { + description = "Whether to bring up this interface automatically during boot."; + default = true; + example = false; + type = types.bool; + }; + dns = mkOption { example = [ "192.168.2.2" ]; default = []; @@ -247,7 +254,7 @@ let description = "wg-quick WireGuard Tunnel - ${name}"; requires = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional values.autostart "multi-user.target"; environment.DEVICE = name; path = [ pkgs.kmod pkgs.wireguard-tools ]; From 168bdc3c7d124a0b638c4648df5fa252d384f44b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 22 Mar 2022 10:52:15 +0100 Subject: [PATCH 148/150] u9fs: fix man page location By convention man pages need to located at `share/man/man$section/$name.$section`. --- pkgs/servers/u9fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 60dde01e9c63..69e3c4d1fe4c 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; installPhase = '' - mkdir -p $out/bin $out/share/man4 - cp u9fs.man $out/share/man4 + mkdir -p $out/bin $out/share/man/man4 + cp u9fs.man $out/share/man/man4/u9fs.4 cp u9fs $out/bin ''; From fd02a092d28cfc9179dd43b5296d2a1e003def38 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 22 Mar 2022 10:55:06 +0100 Subject: [PATCH 149/150] u9fs: use install(1) for copying files --- pkgs/servers/u9fs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 69e3c4d1fe4c..b99bf43b5822 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation { }; installPhase = '' - mkdir -p $out/bin $out/share/man/man4 - cp u9fs.man $out/share/man/man4/u9fs.4 - cp u9fs $out/bin + install -Dm644 u9fs.man "$out/share/man/man4/u9fs.4" + install -Dm755 u9fs -t "$out/bin" ''; meta = with lib; { From 4ceb138f4b77e6ad5e15c372a895981d285bd5a8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 22 Mar 2022 12:25:10 +0100 Subject: [PATCH 150/150] haskellPackages.HaskellNet-SSL: mark unbroken It builds! --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 038060a21366..09ce57fe1d34 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1986,7 +1986,6 @@ broken-packages: - haskell-mpi - haskell-names - haskell-neo4j-client - - HaskellNet-SSL - HaskellNN - Haskelloids - haskell-openflow diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f0e6c84e6bce..a16396d316ef 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10200,8 +10200,6 @@ self: { ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaskellTorrent" = callPackage