From 5d4a0aeee55635e0c8107933c363377adb0341fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 13:54:03 +0100 Subject: [PATCH 01/27] snipes: replace commit which doesn't belong to any branch with parent commit and recreate patch --- pkgs/games/snipes/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index 66188ba0efe..01b24ee434c 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -13,13 +13,15 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "Davidebyzero"; repo = "Snipes"; - rev = "343e14104b7848eb1f882401888e685b7918ef9f"; - sha256 = "1rl70d5miak34warbwfv27z11vln4lvf7maqqc78z0gdc5zivdv2"; + rev = "594af45108e07aa4159c3babc9b5e53609c3fd6e"; + sha256 = "0gmh38swm74jmljy0bq27ipqzb4h8y9rzwc1j6harbd9qqz5knac"; }; postPatch = '' substitute config-sample.h config.h \ --replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf + substituteInPlace GNUmakefile \ + --replace 'CFLAGS=-Werror -Wall' 'CFLAGS=-Wall' ''; enableParallelBuilding = true; From 0b90d2948659a212b40e70f9bc4087cfac856530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 13:56:41 +0100 Subject: [PATCH 02/27] hdl-dump: replace commit which doesn't belong to any branch with latest master which changes only CI after several force pushes --- pkgs/tools/misc/hdl-dump/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/hdl-dump/default.nix b/pkgs/tools/misc/hdl-dump/default.nix index 6a6af1391bd..e5f3afb03d5 100644 --- a/pkgs/tools/misc/hdl-dump/default.nix +++ b/pkgs/tools/misc/hdl-dump/default.nix @@ -1,20 +1,19 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , upx }: -let - version = "20202807"; +stdenv.mkDerivation rec { pname = "hdl-dump"; -in stdenv.mkDerivation { - inherit pname version; + version = "20202807"; # Using AkuHAK's repo because playstation2's repo is outdated src = fetchFromGitHub { owner = "AKuHAK"; repo = pname; - rev = "be37e112a44772a1341c867dc3dfee7381ce9e59"; - sha256 = "0akxak6hm11h8z6jczxgr795s4a8czspwnhl3swqxp803dvjdx41"; + rev = "0c98b235c83c0fca1da93648f05ea5f940a4aee0"; + sha256 = "1s3wflqjjlcslpa9n5chr8dbamhmfk88885dzw68apz4vf6g27iq"; }; buildInputs = [ upx ]; From b00ab7489e0f1411b0d36b3d729aa44362b3fb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:06:25 +0100 Subject: [PATCH 03/27] gr-ais: fetch commit from master and use fetchpatch for PR commit --- pkgs/applications/radio/gnuradio/ais.nix | 34 +++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 94556561439..8d6e8509772 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,10 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio -, makeWrapper, cppunit, gr-osmosdr, log4cpp -, pythonSupport ? true, python, swig +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, gnuradio +, makeWrapper +, cppunit +, gr-osmosdr +, log4cpp +, pythonSupport ? true +, python +, swig +, fetchpatch }: -assert pythonSupport -> python != null && swig != null; - stdenv.mkDerivation { pname = "gr-ais"; version = "2015-12-20"; @@ -12,14 +22,20 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + rev = "cdc1f52745853f9c739c718251830eb69704b26e"; + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; }; + patches = [ + (fetchpatch { + url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch"; + sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] - ++ lib.optionals pythonSupport [ python swig ]; + ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do From 897b67b32470c9c5744a758355ad2ceb653d38e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:14:31 +0100 Subject: [PATCH 04/27] django-crispy-forms: 2019.04.21 -> 1.10.0 --- .../python-modules/django-crispy-forms.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index c470a56b8a1..f8b91a94ccc 100644 --- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest_4, pytest-django, django }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-django +, django +}: -buildPythonPackage { +buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2019.04.21"; + version = "1.10.0"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; - rev = "e25a5326697e5b545689b3a914e516404a6911bb"; - sha256 = "12zqa76q6i7j47aqvhilivpbdplgp9zw2q8zfcjzlgclrqafaj39"; + rev = version; + sha256 = "0y6kskfxgckb9npcgwx4zrs5n9px159zh9zhinhxi3i7wlriqpf5"; }; # For reasons unknown, the source dir must contain a dash @@ -19,12 +24,10 @@ buildPythonPackage { export sourceRoot=source- ''; - checkInputs = [ pytest_4 pytest-django django ]; + checkInputs = [ django pytest-django pytestCheckHook ]; - checkPhase = '' - PYTHONPATH="$(pwd):$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings \ - pytest crispy_forms/tests + preCheck = '' + export DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings ''; meta = with lib; { From 99892a9bb57d51a7e76abcba52d5426bfcb0a5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:17:27 +0100 Subject: [PATCH 05/27] usync: use similar commit from master after probably force pushes upstream --- pkgs/applications/misc/usync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix index 8ab2a485a64..cf51a53e713 100644 --- a/pkgs/applications/misc/usync/default.nix +++ b/pkgs/applications/misc/usync/default.nix @@ -6,9 +6,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ebzzry"; - repo = pname; - rev = "9c87ea8a707a47c3d7f6ef94d07591c5ab594282"; - sha256 = "1r05gw041fz9dkkb70zd6kqw9dd8dhpv87407qxqg43pd7x47kf4"; + repo = "usync"; + rev = "99f11b0c196a81843f55ca3456abcb85149b6d51"; + sha256 = "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j"; }; installPhase = '' From 76834ccbaa3c1a1059d86797515906b45547515a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:19:29 +0100 Subject: [PATCH 06/27] pythonPackages.greatfet: Use github release tag --- pkgs/development/python-modules/greatfet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index b4048c922da..7859d2f4c08 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }: -buildPythonPackage { +buildPythonPackage rec { pname = "GreatFET"; version = "2019.5.1.dev0"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "greatfet"; - rev = "a927f21d59ccface00635146103a807c1d2b0ad8"; + rev = "v${version}"; sha256 = "054vkx4xkbhxhh5grjbs9kw3pjkv1zapp91ysrqr0c8mg1pc7zxv"; }; From 24e36fdd82e85133f2b798af40bc71df65da3d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:23:16 +0100 Subject: [PATCH 07/27] openra.mods: Add comment that commit does not exist on any branch on target repository --- pkgs/games/openra/mods.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index 4a79125dc18..cf8cd433c29 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -123,6 +123,7 @@ in { src = fetchFromGitHub { owner = "IceReaper"; repo = "OpenRA" ; + # commit does not exist on any branch on the target repository rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq"; name = "engine"; From a8758fdce5c95a1d20f599b4a6b11f862db1252f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:26:32 +0100 Subject: [PATCH 08/27] bcachefs: Add comment that commit does not exist on any branch on target repository --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index b1874bf3820..619bf48b736 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -7,6 +7,7 @@ buildLinux (args // { src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs"; + # commit does not exist on any branch on the target repository rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc"; sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc"; }; From 0e80a5f6cb1a5c6711c630153a326466f750cfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:29:59 +0100 Subject: [PATCH 09/27] linuxPackages.acpi-call: Replace commit with equivalent from master --- pkgs/os-specific/linux/acpi-call/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 87535b92e46..b79f0bd84f2 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nix-community"; repo = "acpi_call"; - rev = "3d7c9fe5ed3fc5ed5bafd39d54b1fdc7a09ce710"; - sha256 = "09kp8zl392h99wjwzqrdw2xcfnsc944hzmfwi8n1y7m2slpdybv3"; + rev = "fe4cd0124099b88b61f83006023bc0d95e742e75"; + sha256 = "1rksbg78i7y2wzam9p6kbhx8rmkaiq0kqg8nj7k0j6d25m79289s"; }; hardeningDisable = [ "pic" ]; From 7c450f4674c5ac0de4cff66db59147a4df5923bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:31:45 +0100 Subject: [PATCH 10/27] pythonPackages.nmigen-soc: Replace commit with equivalent, author changed --- pkgs/development/python-modules/nmigen-soc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index 4c15e65e62b..afc0c63a38f 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-soc"; - rev = "f1b009c7e075bca461d10ec963a7eaa3bf4dfc14"; + rev = "f5b5cd563e8e8d081b0535c4554c02b5456ee8b4"; sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad"; }; From 6edb91788431922b7d4db25c4f7bda258d8befe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:33:33 +0100 Subject: [PATCH 11/27] artyFX: Replace commit with equivalent from master --- pkgs/applications/audio/artyFX/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 84914e3e798..2bf6b2a8046 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-ArtyFX"; - rev = "492587461b50d140455aa3c98d915eb8673bebf0"; + rev = "8c542627d936a01b1d97825e7f26a8e95633f7aa"; sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; From 25e7d3949c3a2181f832b6877cb531b9db7e8e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:35:52 +0100 Subject: [PATCH 12/27] openmw: Add comment that commit does not exist on any branch on target repository --- pkgs/games/openmw/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 23572998d03..7c8f4990a61 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -6,6 +6,7 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; + # commit does not exist on any branch on the target repository rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf"; sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; From 9a4494a07583f83f6b84d3f12f922b53e3065ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:37:17 +0100 Subject: [PATCH 13/27] pyrseas: fetch pgdbconn from tag --- pkgs/development/tools/database/pyrseas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index 075cd5053be..930078b2dc7 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -1,13 +1,13 @@ { lib, pythonPackages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage { + pgdbconn = pythonPackages.buildPythonPackage rec { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { owner = "perseas"; repo = "pgdbconn"; - rev = "26c1490e4f32e4b5b925e5b82014ad106ba5b057"; + rev = "v${version}"; sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; }; # The tests are impure (they try to access a PostgreSQL server) From f8cd0b402a832123118a78efec50d735fb00d251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:41:38 +0100 Subject: [PATCH 14/27] linuxPackages.rtlwifi_new: Add comment that commit does not exist on any branch on target repository --- pkgs/os-specific/linux/rtlwifi_new/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index ef71cd82541..12f87f40955 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -12,6 +12,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rtlwifi-linux"; repo = "rtlwifi_new"; + # commit does not exist on any branch on the target repository rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348"; sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k"; }; From 47c869a42df8036f35e5f1c3da2a7744aaf58131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:53:53 +0100 Subject: [PATCH 15/27] lebretro.snes9x: Fetch commit from master The commit choosen is the parent of the commit that was here before. The change in the commit does not matter for NixOS. --- pkgs/misc/emulators/retroarch/cores.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c1b60ad63b2..7d0ba259dc5 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -925,8 +925,8 @@ in with lib.licenses; src = fetchFromGitHub { owner = "snes9xgit"; repo = core; - rev = "6db918cfe32b157239da44096091c212fdfb3b60"; - sha256 = "0y3jhy50qdhhfglybys9m0fgk9r24ksdcgv5iqpyxy5a4cjvhv8j"; + rev = "bd9246ddd75a5e9f78d6189c8c57754d843630f7"; + sha256 = "10fm7ah3aha9lf4k9hgw0dlhdvshzpig2d0ylcb12gf9zz0i22ns"; }; description = "Port of SNES9x git to libretro"; license = "Non-commercial"; From 6df9963b719bf988a25e71731ab2a3c98f5bf860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 14:59:55 +0100 Subject: [PATCH 16/27] siji: replace commit with equivalent from master, replace fetchzip with fetchFromGitHub --- pkgs/data/fonts/siji/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index ea2d2b687d5..adc6a79f10f 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }: stdenv.mkDerivation rec { name = "siji-${version}"; version = "2016-05-13"; - src = fetchzip { - url = "https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip"; + src = fetchFromGitHub { + owner = "stark"; + repo = "siji"; + rev = "3cbb7fe938c33aaadbb657803ea5946e5157d6e2"; sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; }; From 10c78e998f7504318b75c073e562a49bb2e5379b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 15:02:17 +0100 Subject: [PATCH 17/27] trellis: Don't fetch from fork repo while actually fetching master from the original --- pkgs/development/tools/trellis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 6ce1ad9a38a..8f9acd6c140 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { srcs = [ (fetchFromGitHub { - owner = "SymbiFlow"; + owner = "YosysHQ"; repo = "prjtrellis"; rev = "60c05b3f4e71fd78d4fba5c31f9974694245199e"; sha256 = "1k37mxwxv9fpm6xnrxlqqap7zqh2dvgqncphj3asi2rz0kh07ppf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) (fetchFromGitHub { - owner = "SymbiFlow"; + owner = "YosysHQ"; repo = "prjtrellis-db"; rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c"; sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g"; From f955932b8411c8023d0b7e5a7b4793eb79b9bf2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Jan 2021 15:13:19 +0100 Subject: [PATCH 18/27] myrica: Add comment that commit does not exist on any branch on target repository --- pkgs/data/fonts/myrica/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index aa5ee0ff1c3..c36292eb001 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub { owner = "tomokuni"; repo = "Myrica"; + # commit does not exist on any branch on the target repository rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; From 370df31f1cacdac2f78072a30911fef7a81fb274 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 13 Jan 2021 23:38:19 -0800 Subject: [PATCH 19/27] nixos/zfs: make zed mail optional "zed does not need the ability to send email by default" --Eelco --- nixos/modules/tasks/filesystems/zfs.nix | 46 ++++++++++++++----------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index b750820bfa5..f153cce4c72 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -326,30 +326,34 @@ in }; }; - services.zfs.zed.settings = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); - example = literalExample '' - { - ZED_DEBUG_LOG = "/tmp/zed.debug.log"; + services.zfs.zed = { + enableMail = mkEnableOption "ZED's ability to send emails"; - ZED_EMAIL_ADDR = [ "root" ]; - ZED_EMAIL_PROG = "mail"; - ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@"; + settings = mkOption { + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + example = literalExample '' + { + ZED_DEBUG_LOG = "/tmp/zed.debug.log"; - ZED_NOTIFY_INTERVAL_SECS = 3600; - ZED_NOTIFY_VERBOSE = false; + ZED_EMAIL_ADDR = [ "root" ]; + ZED_EMAIL_PROG = "mail"; + ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@"; - ZED_USE_ENCLOSURE_LEDS = true; - ZED_SCRUB_AFTER_RESILVER = false; - } - ''; - description = '' - ZFS Event Daemon /etc/zfs/zed.d/zed.rc content + ZED_NOTIFY_INTERVAL_SECS = 3600; + ZED_NOTIFY_VERBOSE = false; - See - zed8 - for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables - ''; + ZED_USE_ENCLOSURE_LEDS = true; + ZED_SCRUB_AFTER_RESILVER = false; + } + ''; + description = '' + ZFS Event Daemon /etc/zfs/zed.d/zed.rc content + + See + zed8 + for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables + ''; + }; }; }; @@ -437,7 +441,7 @@ in }; services.zfs.zed.settings = { - ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; + ZED_EMAIL_PROG = mkIf cfgZED.enableMail (mkDefault "${pkgs.mailutils}/bin/mail"); PATH = lib.makeBinPath [ cfgZfs.package pkgs.coreutils From a206194b4ec06da05f08c9b02eab4f574498df6b Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 13 Jan 2021 23:40:08 -0800 Subject: [PATCH 20/27] smartmontools: make mail support optional It's enabled by default since that's how it was before this change. --- pkgs/tools/system/smartmontools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 9eaf00b537a..954c9eb4110 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, autoreconfHook -, mailutils, inetutils +, mailutils, enableMail ? true +, inetutils , IOKit, ApplicationServices }: let @@ -26,7 +27,7 @@ in stdenv.mkDerivation rec { postPatch = "cp -v ${driverdb} drivedb.h"; configureFlags = [ - "--with-scriptpath=${lib.makeBinPath [ mailutils inetutils ]}" + "--with-scriptpath=${lib.makeBinPath ([ inetutils ] ++ lib.optional enableMail mailutils)}" ]; nativeBuildInputs = [ autoreconfHook ]; From 1ed5b6a285301a0ef17bbb8378ec43a6a79b3520 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 13 Jan 2021 23:40:46 -0800 Subject: [PATCH 21/27] zfs: disable smartmontools mail functionality --- nixos/modules/tasks/filesystems/zfs.nix | 12 +++++++++++- pkgs/os-specific/linux/zfs/default.nix | 25 ++++++++++++++++--------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index f153cce4c72..59676e99678 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -327,7 +327,9 @@ in }; services.zfs.zed = { - enableMail = mkEnableOption "ZED's ability to send emails"; + enableMail = mkEnableOption "ZED's ability to send emails" // { + default = cfgZfs.package.enableMail; + }; settings = mkOption { type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); @@ -362,6 +364,14 @@ in config = mkMerge [ (mkIf cfgZfs.enabled { assertions = [ + { + assertion = cfgZED.enableMail -> cfgZfs.package.enableMail; + message = '' + To allow ZED to send emails, ZFS needs to be configured to enable + this. To do so, one must override the `zfs` package and set + `enableMail` to true. + ''; + } { assertion = config.networking.hostId != null; message = "ZFS requires networking.hostId to be set"; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a66520b6fa1..202dc9091fd 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -8,8 +8,8 @@ , libtirpc , nfs-utils , gawk, gnugrep, gnused, systemd -, smartmontools, sysstat, sudo -, pkg-config +, smartmontools, enableMail ? false +, sysstat, sudo, pkg-config # Kernel dependencies , kernel ? null @@ -18,6 +18,8 @@ with lib; let + smartmon = smartmontools.override { inherit enableMail; }; + buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ]; @@ -148,7 +150,7 @@ let ''; postFixup = let - path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmontools sysstat ]}:$PATH"; + path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmon sysstat ]}:$PATH"; in '' for i in $out/libexec/zfs/zpool.d/*; do sed -i '2i${path}' $i @@ -157,12 +159,17 @@ let outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; - passthru.tests = if isUnstable then - [ nixosTests.zfs.unstable ] - else [ - nixosTests.zfs.installer - nixosTests.zfs.stable - ]; + passthru = { + inherit enableMail; + + tests = + if isUnstable then [ + nixosTests.zfs.unstable + ] else [ + nixosTests.zfs.installer + nixosTests.zfs.stable + ]; + }; meta = { description = "ZFS Filesystem Linux Kernel module"; From 6c4d3aa6f7aaffeaf40213fd5ae651e99440d19c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 7 Feb 2021 20:00:07 +0000 Subject: [PATCH 22/27] git-cinnabar: 0.5.4 -> 0.5.6 Also add missing installPhase hooks, and clarify license. I'm assuming GPL-2.0-only, because it doesn't seem to be specified, and the helper links with git, which is -only. --- .../git-and-tools/git-cinnabar/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index 679e8dbdf50..e7eea5e43a1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "git-cinnabar"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitHub { owner = "glandium"; repo = "git-cinnabar"; rev = version; - sha256 = "1cjn2cc6mj4m736wxab9s6qx83p5n5ha8cr3x84s9ra6rxs8d7pi"; + sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3"; fetchSubmodules = true; }; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/libexec install git-cinnabar-helper $out/bin install git-cinnabar git-remote-hg $out/libexec @@ -38,12 +40,14 @@ stdenv.mkDerivation rec { --prefix GIT_CINNABAR_EXPERIMENTS , python3 \ --set PYTHONPATH ${mercurial}/${python3.sitePackages} done + + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/glandium/git-cinnabar"; description = "git remote helper to interact with mercurial repositories"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ qyliss ]; platforms = platforms.all; }; From eaed3f7afb0ede6e7429ab0412514c0ffa78e787 Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Mon, 8 Feb 2021 19:57:23 +0100 Subject: [PATCH 23/27] fishnet: 2.2.3 -> 2.2.4 --- pkgs/servers/fishnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 2aa46b7d825..508068bd2d4 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; rev = "v${version}"; - sha256 = "159fwjy70n6lvnhdwv65azgi03r5qcc2m2zpzgz0k3r6cy06faxj"; + sha256 = "19dh69b6mqx16195w9d20fah4jl8hhbxm84xq4zwsgl4khmw7zqz"; }; - cargoSha256 = "1bfs8dy08799r6d63sb33zwcxas3gzp7jvcxv3w8n64gffan8f2n"; + cargoSha256 = "0zl2fnmqncyjd52wkn6dddx9lm9ywpw7swy895yq299z2bbbkv3h"; preBuild = '' rmdir ./assets From 337aecf983b75e16aaa23d260d78443cb79778c7 Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 10 Feb 2021 17:30:03 +0000 Subject: [PATCH 24/27] androidStudioPackages: set JAVA_HOME in wrapper to bundled version --- pkgs/applications/editors/android-studio/common.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index b760e83f8ee..1c3c4aade5f 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -73,6 +73,9 @@ let cp -r . $out wrapProgram $out/bin/studio.sh \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ + --set JAVA_HOME "$out/jre" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ # Checked in studio.sh @@ -139,9 +142,7 @@ let gnome_vfs glib GConf - ]}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set FONTCONFIG_FILE ${fontsConf} + ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ From 787d555b4669054375ed6e9d88e6335e3727b7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Wed, 10 Feb 2021 18:11:29 +0000 Subject: [PATCH 25/27] ledger-live-desktop: 2.20.0 -> 2.21.3 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index f2087c63716..d130b3d0454 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.20.0"; + version = "2.21.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "10gi29mcvs4d5flqycwid190pnlciznzbvg36250mxaxxs58rq7j"; + sha256 = "11r6gwzg5qym7h40d8mrpw8c6zbdi534c2y7ghy2k0a4k3ybk8x1"; }; appimageContents = appimageTools.extractType2 { From d27bff278e5b6137328cf103d8a2d549554d7281 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 19:58:54 +0000 Subject: [PATCH 26/27] oil: 0.8.6 -> 0.8.7 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index d633faea1cb..0c508d0e29d 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.6"; + version = "0.8.7"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-fX1miI8yXzn/T9cbbZ/7E6/tLs3RXsX3PgfC7sBxIjU="; + sha256 = "sha256-KcXu1u/MvvbCLb5a7D09NvfJPaeo0c8Z/Czuk7XR23M="; }; postPatch = '' From 6324544d7ebe259e886f64505efcd968e6a1710b Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 11 Feb 2021 00:12:31 +0100 Subject: [PATCH 27/27] pkgs/iotools: Support only x86-based Linux platforms Support only x86-based Linux platforms since everything else is untested. Signed-off-by: Felix Singer --- pkgs/tools/misc/iotools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/iotools/default.nix b/pkgs/tools/misc/iotools/default.nix index f123d54a023..12411aac6c6 100644 --- a/pkgs/tools/misc/iotools/default.nix +++ b/pkgs/tools/misc/iotools/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/adurbin/iotools"; license = licenses.gpl2Only; maintainers = with maintainers; [ felixsinger ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; }