From cd168c56c7e0b9f21d5d5a544e2d3125dfcb6918 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 Jan 2021 00:31:15 +0000 Subject: [PATCH 001/108] petsc: 3.14.2 -> 3.14.3 --- pkgs/development/libraries/science/math/petsc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index a1e9d1e30515..de1c11a98e13 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.14.2"; + version = "3.14.3"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "04vy3qyakikslc58qyv8c9qrwlivix3w6znc993i37cvfg99dch9"; + sha256 = "sha256-1rdyLNSH8jMkmIg88uHMN3ZXqTHAtzU1adybJEZzJ9M="; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; From 198ba9ef2765662b73aa99f0574a099f8c19f551 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 08:43:47 +0000 Subject: [PATCH 002/108] aws-sdk-cpp: 1.8.121 -> 1.8.130 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7b10fc463dd1..0f97ce5ec0be 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.121"; + version = "1.8.130"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ="; + sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; }; # FIXME: might be nice to put different APIs in different outputs From 402ec3b1ac7db3e9539775a43a376b65a0c20140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 15:28:43 +0000 Subject: [PATCH 003/108] dyncall: 1.1 -> 1.2 --- pkgs/development/libraries/dyncall/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 0e3fa3ac7dc0..8a829aa3c91c 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "dyncall"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz"; - # https://www.dyncall.org/r1.1/SHA256 - sha256 = "cf97fa3f142db832ff34235caa4d69a7d5f16716573d446b2d95069126e88795"; + url = "https://www.dyncall.org/r1.2/dyncall-1.2.tar.gz"; + # https://www.dyncall.org/r1.2/SHA256 + sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc="; }; # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) From 023518351ebfc18c614ee3b412680d320c391963 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Feb 2021 22:30:11 +0000 Subject: [PATCH 004/108] reproc: 14.1.0 -> 14.2.2 --- pkgs/development/libraries/reproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix index 6531414601db..e7570fdb5924 100644 --- a/pkgs/development/libraries/reproc/default.nix +++ b/pkgs/development/libraries/reproc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "reproc"; - version = "14.1.0"; + version = "14.2.2"; src = fetchFromGitHub { owner = "DaanDeMeyer"; repo = "reproc"; rev = "v${version}"; - sha256 = "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"; + sha256 = "sha256-QOQcNDQkG929cEchIZ+XzjRncUUB10DpdB4zqgPqv4A="; }; nativeBuildInputs = [ cmake ]; From e45b53d2bc45d910de702bac3ea6dd1da482f0cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Feb 2021 07:53:05 +0000 Subject: [PATCH 005/108] libebur128: 1.2.5 -> 1.2.6 --- pkgs/development/libraries/libebur128/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index db6c9f93faec..656923da3d15 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { - version = "1.2.5"; + version = "1.2.6"; pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "sha256-B6MOSbLfPvadXtXHSvxZCIpAH1Bnj6sItYRp+xH5HDA="; + sha256 = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y="; }; nativeBuildInputs = [ cmake pkg-config ]; From 52b8c89fce445849c684ab2cf3f03ab8ead98e3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Feb 2021 15:52:17 +0000 Subject: [PATCH 006/108] librelp: 1.9.0 -> 1.10.0 --- pkgs/development/libraries/librelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 8d950d66bd21..7b5a7d228d5e 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "sha256-nE7YavjZj+nHcTNkcl/xVAaP+9XfHlTEsW18aPO/ABY="; + sha256 = "sha256-aJLsUtik5aXfsdi+8QoDgbi4VUZ8gV3YPA6kIY6wzs4="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 9282a96ebcbc683766ccf490bc54c7539c29a60c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 08:47:06 +0000 Subject: [PATCH 007/108] linuxquota: 4.05 -> 4.06 --- pkgs/tools/misc/linuxquota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index 729dc41a107d..fbfb488f9067 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { - version = "4.05"; + version = "4.06"; pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "1fbsrxhhf1ls7i025db7p66yzjr0bqa2c63cni217v8l21fmnfzg"; + sha256 = "sha256-Lz4DA583jU8Nl6zbSdr1gdyq1k0uHd8SlJX9V5+9Jo0="; }; outputs = [ "out" "dev" "doc" "man" ]; From 47d3bb69bd187ba9f9ec28352e73d279120e3097 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 15:54:52 +0000 Subject: [PATCH 008/108] sshpass: 1.06 -> 1.09 --- pkgs/tools/networking/sshpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 60c9ab97a8b3..4704339aed67 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sshpass"; - version = "1.06"; + version = "1.09"; src = fetchurl { url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz"; - sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6"; + sha256 = "sha256-cXRuXgV//psAtErEBFO/RwkZMMupa76o3Ehxfe3En7c="; }; meta = with lib; { From 3298a4056435752f3ea2b6323cce0a1487270572 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 18:35:49 +0000 Subject: [PATCH 009/108] stdman: 2018.03.11 -> 2020.11.17 --- pkgs/data/documentation/stdman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 9308c538d355..e0f08e6049d4 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stdman"; - version = "2018.03.11"; + version = "2020.11.17"; src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; rev = version; - sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r"; + sha256 = "sha256-pzAVuXSuUfwI7gQpFqmH/+klSUH3KipZup2TgZs8XsY="; }; outputDevdoc = "out"; From 5c2a47d5c7deed77ebd6f09721279ba07f1f8e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 May 2021 20:45:20 +0200 Subject: [PATCH 010/108] nix: enable pie --- pkgs/tools/package-management/nix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 159fc5b39c12..4a1d6c741f2c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -38,6 +38,8 @@ common = outputs = [ "out" "dev" "man" "doc" ]; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] From 1369b86ee3f46a9f40a0e882d174afc2f99e83ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 03:46:03 +0000 Subject: [PATCH 011/108] ethash: 0.6.0 -> 0.7.0 --- pkgs/development/libraries/ethash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index dcb10b8ba08e..c1ef9cee9906 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "sha256-N30v9OZwTmDbltPPmeSa0uOGJhos1VzyS5zY9vVCWfA="; + sha256 = "sha256-QQoWOJGwL03zbBfrFNXz0Ff9Agc2dMBW9nW3jdOwEE8="; }; nativeBuildInputs = [ From ba000a9ca54522e979d894f74c0df7761dd61c42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jun 2021 14:32:56 +0000 Subject: [PATCH 012/108] leptonica: 1.81.0 -> 1.81.1 --- pkgs/development/libraries/leptonica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 363140b5f58f..723b5a0ec1ff 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.81.0"; + version = "1.81.1"; src = fetchurl { url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0="; + sha256 = "sha256-D06zFem93deX9MVf3qTh9F/Kfjs1ii/Gk/2VfOLEPKk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From bdb0bbef089df3b6b236aeef8ab9eb1212893160 Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Fri, 25 Jun 2021 16:34:32 -0400 Subject: [PATCH 013/108] tt-rss: 2021-01-29 -> 2021-06-23 and modules/tt-rss: updated config.php creation The version of tt-rss in nixpkgs was pre-php 8. This updates tt-rss to the most recent version, which uses php 8. The updates to the module are required changes, per https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337. --- nixos/modules/services/web-apps/tt-rss.nix | 156 +++++++++++---------- pkgs/servers/tt-rss/default.nix | 6 +- 2 files changed, 85 insertions(+), 77 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b78487cc9281..b9feea7ffc5b 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -22,80 +22,6 @@ let tt-rss-config = pkgs.writeText "config.php" '' Date: Thu, 1 Jul 2021 15:38:04 -0400 Subject: [PATCH 014/108] Api didn't seem to work with the systemd envs I am not sure why it was working for me, but after restarting phpfpm-tt-rss it quit working. --- nixos/modules/services/web-apps/tt-rss.nix | 157 ++++++++++----------- 1 file changed, 77 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b9feea7ffc5b..0b23ba56cabd 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -19,8 +19,84 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - tt-rss-config = pkgs.writeText "config.php" '' + tt-rss-config = let + password = + if (cfg.database.password != null) then + "${(escape ["'" "\\"] cfg.database.password)}" + else if (cfg.database.passwordFile != null) then + "file_get_contents('${cfg.database.passwordFile}'" + else + "" + ; + in pkgs.writeText "config.php" '' Date: Fri, 25 Jun 2021 16:34:32 -0400 Subject: [PATCH 015/108] tt-rss: 2021-01-29 -> 2021-06-23 and modules/tt-rss: updated config.php creation The version of tt-rss in nixpkgs was pre-php 8. This updates tt-rss to the most recent version, which uses php 8. The updates to the module are required changes, per https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337. --- nixos/modules/services/web-apps/tt-rss.nix | 156 +++++++++++---------- pkgs/servers/tt-rss/default.nix | 6 +- 2 files changed, 85 insertions(+), 77 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b78487cc9281..b9feea7ffc5b 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -22,80 +22,6 @@ let tt-rss-config = pkgs.writeText "config.php" '' Date: Thu, 1 Jul 2021 15:38:04 -0400 Subject: [PATCH 016/108] Api didn't seem to work with the systemd envs I am not sure why it was working for me, but after restarting phpfpm-tt-rss it quit working. --- nixos/modules/services/web-apps/tt-rss.nix | 157 ++++++++++----------- 1 file changed, 77 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b9feea7ffc5b..0b23ba56cabd 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -19,8 +19,84 @@ let mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; - tt-rss-config = pkgs.writeText "config.php" '' + tt-rss-config = let + password = + if (cfg.database.password != null) then + "${(escape ["'" "\\"] cfg.database.password)}" + else if (cfg.database.passwordFile != null) then + "file_get_contents('${cfg.database.passwordFile}'" + else + "" + ; + in pkgs.writeText "config.php" '' Date: Tue, 20 Jul 2021 16:56:31 +0000 Subject: [PATCH 017/108] freetds: 1.2.21 -> 1.3 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 56f0e03921be..b79fb2fd06dc 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2.21"; + version = "1.3"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pea79tbz3AgWsZy9CDCNJ6CEsEkmqqBaxn+AjqB9PY0="; + sha256 = "sha256-j5ecrU2DUJBubDZF9wRxr0eNCHWe2TzToxQn8HkrX5c="; }; buildInputs = [ From 7212f6bcb4743b17a3d6a46cc5e2e17e3f54ab94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 16:50:56 +0000 Subject: [PATCH 018/108] dnsproxy: 0.38.3 -> 0.39.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 ffa2138ffa82..f42294974c29 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.38.3"; + version = "0.39.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; + sha256 = "sha256-rHU07rh8wZPaaxZmXVBu4tpt02Jq7Yu//dwWeVDUpw4="; }; vendorSha256 = null; From 8cd70d10fd46962336f9ac16d23da23d1295ab0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Jul 2021 19:00:38 +0000 Subject: [PATCH 019/108] gotestsum: 1.6.4 -> 1.7.0 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index e9bc48b0dcf2..1e63b07d03ed 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-5iSUk/J73enbc/N3bn7M4oj2A0yoF1jTWpnXD380hFI="; + sha256 = "sha256-nZaVi39dOytJTM69xpl+d9XoUt+yHdndPgY2ggfNeMQ="; }; - vendorSha256 = "sha256-sHi8iW+ZV/coeAwDUYnSH039UNtUO9HK0Bhz9Gmtv8k="; + vendorSha256 = "sha256-wP5y8Ec6eSe+rdMEQQdX0fFTQ0HWuiyBRHxGlraZd+o="; doCheck = false; From 70338c53c99d06cc708f92a1050220d906ddc56a Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Sun, 25 Jul 2021 15:40:33 -0400 Subject: [PATCH 020/108] Added release notes and broke date apart --- .../from_md/release-notes/rl-2111.section.xml | 10 +++++++++- nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/services/web-apps/tt-rss.nix | 10 ++++++++-- pkgs/servers/tt-rss/default.nix | 13 ++++++++++++- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a95b1dd66b96..c0e8867ca0e9 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -459,7 +459,7 @@ - + yggdrasil was upgraded to a new major @@ -468,6 +468,14 @@ changelog. + + + tt-rss was upgraded to the commit on + 2021-06-21, which has breaking changes, see + this + thread in the tt-rss forums for details. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index be46591dfa16..b0fbfc2bba70 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -115,6 +115,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). +- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes, see [this thread](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for details. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 0b23ba56cabd..676683a557db 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -566,9 +566,14 @@ let "Z '${cfg.root}' 0755 ${cfg.user} tt_rss - -" ]; - systemd.services.tt-rss = - { + systemd.services = { + phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { + restartTriggers = [ + cfg.root + ]; + }; + tt-rss = { description = "Tiny Tiny RSS feeds update daemon"; preStart = let @@ -645,6 +650,7 @@ let wantedBy = [ "multi-user.target" ]; requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; + }; }; services.mysql = mkIf mysqlLocal { diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index bd82f8d28905..39615a238e35 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,7 +2,10 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "2021-06-21"; + year = "21"; + month = "06"; + day = "21"; + version = "20${year}-${month}-${day}"; rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270"; src = fetchurl { @@ -11,8 +14,16 @@ stdenv.mkDerivation rec { }; installPhase = '' + runHook preInstall + mkdir $out cp -ra * $out/ + + # see the code of Config::get_version(). you can check that the version in + # the footer of the preferences pages is not UNKNOWN + echo "${year}.${month}" > $out/version_static.txt + + runHook postInstall ''; meta = with lib; { From 1d4ae0cfb779ae252432a55f67c97735022eaa02 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 00:31:53 +0000 Subject: [PATCH 021/108] libpoly: 0.1.9 -> 0.1.10 --- pkgs/applications/science/logic/poly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index 75ad91bc54de..c80b9bf1f0c4 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; # they've pushed to the release branch, use explicit tag rev = "refs/tags/v${version}"; - sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk="; + sha256 = "sha256-22Y4L5NFnCzKwZt0A/ChMuGPU4Dk1Qyke6mdvfN063w="; }; # https://github.com/SRI-CSL/libpoly/pull/52 From ff9da5fc98cbe307a95b682b6a52fd5022a1b0a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 07:08:59 +0000 Subject: [PATCH 022/108] iosevka-bin: 7.0.4 -> 8.0.2 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 116 +++++++++++++++++++++------ 2 files changed, 93 insertions(+), 25 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 27577047ecac..96d2ee8f0138 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "7.0.4"; + version = "8.0.2"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 1f3da2a205d9..143cd225d271 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,27 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "10aa8bsykkfi3aplw4j7smj0brcbni3jxqzjbpsbv5b15wzvkm7y"; - iosevka-aile = "0pa79n41xha9rdj4vzz8cpmdhf0h4fjyphjl12i9qxh5znjr4yyz"; - iosevka-curly = "0shk75qdm5acfbxdvv985gnhaz3dys8wpshiis6y2raz8sam48qg"; - iosevka-curly-slab = "0z297s1bl2rrrmr3a4cds4cx4cw69p2y05jv999bkw9vrd6a5ij9"; - iosevka-etoile = "05h62ybd6b54b51h6m6dq3phvrw4jfcc6cyp1x44shj4az2ia17w"; - iosevka-slab = "07rp7rp3rjzzn6vnx3zbfizd924xhl702kcyq9qlif9g285l85nl"; - iosevka-ss01 = "1rvshgyhcq2cay9dssap9mhinhljn92adrbf8lbkaabf3fcyd19h"; - iosevka-ss02 = "0bscxfjhm1is7b7amr5jjj5wpxm1yps4cns47r4w26a0ad4lzf6b"; - iosevka-ss03 = "1l4mzv1w7wkjs4629hrj7svd3wwhjfvby0qsbq2fr71ngz4gdvva"; - iosevka-ss04 = "0mj5l316bji6mazgkzi5vigbfbgfnif0llmgacg0l5qayzaafqb1"; - iosevka-ss05 = "1gfc7b05fvf1m5vhlvbzxzim8qfcqf16dg8qmzdv625dk1mg2llf"; - iosevka-ss06 = "1n3mfn8h9gmf7ymc6f5ky5n70nn0nb2l8grj26hm9047cvbxcjqm"; - iosevka-ss07 = "0bffazcb6k7qd3c3fxg426mcgjzc5xncv8nsiz71frhi9crplprv"; - iosevka-ss08 = "1kv6v7n2qbgl185kfh401mjvs2iim6l3cw9zzghhfx6qv7xy0dcd"; - iosevka-ss09 = "0da9kcsxk4vllnxjlslm394lr3bhdsw4a2mi95szplipbf748jcp"; - iosevka-ss10 = "0935y7m603n3rfv38gmja7jhjmc6xrcx61psb3sznp7mlmi0dn7x"; - iosevka-ss11 = "1hh0b8qaas4bxz0sa8zi5sr4rmqrpgxfzaq53fsmxy7pzjkhjz09"; - iosevka-ss12 = "118ibl1i7981kjvf8g0rqrckh2chnxvyivk5wwmxhkw43x06ffjf"; - iosevka-ss13 = "1licqy5dy5z4s91yh086i0m362lavaqq6zr13715zaqh7ard7hva"; - iosevka-ss14 = "0y1f5hva9kpj9l3a56n6vbr8zbydd9c0knvsbpg68lcgmybfc97m"; - iosevka-ss15 = "11pm6frf74y27ym4kmh98pn2cqlab6msj0cxpah36ckpzkm5zdqq"; - iosevka-ss16 = "0z77549ydrbdhw96gc1zl3sg4s16cq7l56pwkfk9ificm1rwf1nm"; - iosevka-ss17 = "0zm34lfgrlcb97a8dx1g056qy6rr7722b1k6hm9dp676mi5va2cw"; - iosevka-ss18 = "0jmz975gny6fc7vf5cn8a4bl0y8pzdwlvfh0km9x7ijp711pw42p"; + iosevka = "1gx0hkxch4m21yqwp8sifp6hzvn579w0jf5c2vfgp771yrilhj41"; + iosevka-aile = "1x4gjwj1a6q8vpihvyy0bpqsw3s1b546b5yi7918yqlam31kbfyl"; + iosevka-curly = "11w7f2v05zgdc5ac96v3dr93a2sganw6ggpl6vdhiqiqn1asfldi"; + iosevka-curly-slab = "052cwri7fc25yn314qqnjjjw1xssjjx4nin65r11589scyxzrh97"; + iosevka-etoile = "0p677iagypvyfx8gyja4qv0b5g39i2mh27cik6cjm22ri6fq3n8y"; + iosevka-slab = "05dzpd33ivsp2fjc7zdrsgad0ym8iq2lpdj5ic5ja3lkacnm7r9j"; + iosevka-ss01 = "1ln7fz9yjwgrrw069k3v65q0jp02298a4r68f7hk2l6bgj8c6dml"; + iosevka-ss02 = "11rihmzccq0yw0r08yclspksqs0rdyrfrfkhfzv0f9fh6c5qd30q"; + iosevka-ss03 = "1zyylszp4iykj2jyx9457jsl3m7lr2irc177m1wvvv68xg1vqjrv"; + iosevka-ss04 = "14pay7d0a5yymwkdhs6vsmcvzh27nml3asdy86dlpix0byzm72qi"; + iosevka-ss05 = "00y744phcvlbwwvk4kq05m1f8l1w7b3gk400yk3y1cmx4a4168jw"; + iosevka-ss06 = "1g7pj3js22kmcnv654n6d0fdykf9jkarwbji3vzajnxqgpv03j5x"; + iosevka-ss07 = "1rv1bf9vffqc99l8dhh4v9ms6pkbxxjgzf7skq02gfr27avj1lln"; + iosevka-ss08 = "0s54csx64khdyzlb7k6m9cx9cqjj9cdymsbzhksv0fdbf3cc71ns"; + iosevka-ss09 = "0zvy010ll38dlisjggmgw8k991wwcnzzvpjyqybxpxb8hk3jfxyn"; + iosevka-ss10 = "1b5fk4hwzqg7p1b7h9vw9nc65pl0sp5h6k41jrmpdjr0nkjhm0zl"; + iosevka-ss11 = "1b9bpg43n0vh0bigaq6y510w7lpsf54v82nvdxl48vp225kibr52"; + iosevka-ss12 = "0w2ykjzjqxmp4r7yl10cpr802xpmww4nvi7nca7kj5scl30mrd4g"; + iosevka-ss13 = "1cg59jx44yyi5y6rvdvasmq0n0vqdbcli1rxhfqgwfx1rkwnxy27"; + iosevka-ss14 = "0xi6jpa8fapk72c77yljp07zdl0hdmdg9giyysllih3j2r4l1mrw"; + iosevka-ss15 = "1qv7qh4wzkq7d5rmn19hhmv447sc8hd390nrajwk2a900vfh8xlk"; + iosevka-ss16 = "1gkrhqn1k5y6q87p09nz1lcafmryl7l3s5aqx265y0dqfrni5rfg"; + iosevka-ss17 = "18plv1f9brn8kh7b3jz2imjwash72vlzbnciam41q8i4m47m7dj7"; + iosevka-ss18 = "177qy927siihpzaf4k4sfl9zbp2krbmlg56qzrcm2jbswlnmkyjx"; + sgr-iosevka = "1np4v340r33vrb92cwx68lvsk6prg2swj4a6x9iig8lbc7fjk7fy"; + sgr-iosevka-aile = "09fyslcr7vazfw7js27s0pd7immqd7ics4dihj54k12w8mjfj0fg"; + sgr-iosevka-curly = "1yva4sx4dgfh4274c5sdkllr2d973ifxpn5jkxp428xhpyx9aq5b"; + sgr-iosevka-curly-slab = "1vsngc45l30lmksvlnfr5b8xxnjsvpaqia4fzvx70napm5z6py4w"; + sgr-iosevka-etoile = "033b8w59qbjg17qlbw1lsc8shwklbcvbr0m0ldk0frd08qz2kpmk"; + sgr-iosevka-fixed = "0qyf6pmichpd4yd821k17dy0chb3rslifqm7jjhbl8kkrylf1f2c"; + sgr-iosevka-fixed-curly = "01y8zc5w7jbb7m959db63msdfhp93ckfmm4nxh8fzg6ps3zpf4dy"; + sgr-iosevka-fixed-curly-slab = "04dn2pirw771d5la702l1n8yxc46k6mlivryqlr3kd7z6c4jylca"; + sgr-iosevka-fixed-slab = "1fnzlwlp67mwrw8l4mpylpv2mfday5b9mcjjwc9diymg85gvmz38"; + sgr-iosevka-fixed-ss01 = "0259mn0p6z43ks13355czbm8pnrb7d8qwfl8kfyrnb6gaj1wa0fd"; + sgr-iosevka-fixed-ss02 = "074jdv3w6461bg3iqgwxv8wfrp0ph2sgqc51y1hg7cx26nrs727x"; + sgr-iosevka-fixed-ss03 = "0s5f2138js5w87khv1b5wzg1h96rhv77vw652m45qhqml0ivj5i6"; + sgr-iosevka-fixed-ss04 = "1mbsjgbfj8m95bb4v0dw3f30hx2kq94bz9q9xv57bs80nmyb8a9b"; + sgr-iosevka-fixed-ss05 = "1zkb9q20f9yb3qp7a092kfaag9izsqxi1nljksbg8qya4iiy22fw"; + sgr-iosevka-fixed-ss06 = "1xkd6nrh0s7dwk326bjk1wn6sa9d3d5r54q48i6giz43fg1j5six"; + sgr-iosevka-fixed-ss07 = "0vxwwy5cizq0d5dswakwbncn9jq299ppc17c7dxqjmgxwkawrd06"; + sgr-iosevka-fixed-ss08 = "08asq61zv353975h9zfv0rrn0g9x5c2l542aqhvi8kbcr702a8an"; + sgr-iosevka-fixed-ss09 = "1qldik6k3ycgq1w95z5l1iwr55jjgc94w3d10gncwl41agz8mav8"; + sgr-iosevka-fixed-ss10 = "00mylfjic10aiyfrzv0inq3i18qj97f999f86szrf8mxf9na8b73"; + sgr-iosevka-fixed-ss11 = "1ggnkqf8l8fdkyimcpjgrlc1sdkzdhd79zaygfzg4fhbfxvm7g9w"; + sgr-iosevka-fixed-ss12 = "13lgy12crxxvlj99iy3l0ag2wc20migx9l4abz04mjjh8cgvk10b"; + sgr-iosevka-fixed-ss13 = "0vk7b5xg67myrw69m5gjxchsgp4af5pwspdscklb739w66v42daq"; + sgr-iosevka-fixed-ss14 = "1dap836qgkm62p7xivdc4jmirr75m9m5w9srr1qwsc5vfly4w63j"; + sgr-iosevka-fixed-ss15 = "12alzyp3c8c9h89kqkiw7spwwahi89w9mcgrggizgjqzm5n6qvwc"; + sgr-iosevka-fixed-ss16 = "1h0wa3g6vrpi86qshx187c2a26kh7ccy89rxi2kxajqis8lc9c25"; + sgr-iosevka-fixed-ss17 = "1hlhi5fllz3sb3p25im7ymvcvhf761iafkiass2cw83l2ypbh9ph"; + sgr-iosevka-fixed-ss18 = "0cwkbj232kb0nwvy59wjinxk6ncck5yg9594p49fx6016qxsv022"; + sgr-iosevka-slab = "1imc9pamhxd5pm3xv274yv2qbnsd258rxz0skq7kc5f647bfb1dn"; + sgr-iosevka-ss01 = "0j97757fj595mlr9mgc5vkqxriskxzc1cch0sk9fb2qvr0gpyjvk"; + sgr-iosevka-ss02 = "0j1i9zakq2svfp727sxhcnqhrb0962pzdc7g0bdxgvxwdhmqzqn1"; + sgr-iosevka-ss03 = "1bz95n1xpx756sfsgyshnaqrrygvh3pmcmxjqjyc0yk5f3aawqgm"; + sgr-iosevka-ss04 = "11c4q2dsfkqbw1ppw2r2x932mhlr6bq8sc1hr6z7pvflx3kvdgdg"; + sgr-iosevka-ss05 = "1jwy3wfd4yk6q4cyrry2s3hgkg0pbnn8mmr7w5wpgph4sg2lyrs4"; + sgr-iosevka-ss06 = "0b4rilasn6zkrwf6dfxgrd957r8sjkw259acp1fnsc2wjpi27krf"; + sgr-iosevka-ss07 = "0rvprfprypd54rnjsza0z6xswx22k4mva6pq8qs8fl8kfp3b92kk"; + sgr-iosevka-ss08 = "0jfq72pi9bfmldxk8rnb3hv5kq7bps4pbs15k307avadj80dy107"; + sgr-iosevka-ss09 = "1rlckb7djrkv1bicrp8nkszvk5wkkyhm6f88br13prqhsfbkdfpi"; + sgr-iosevka-ss10 = "0v6jqs75s0xqplgxxk09ah7gpbajajwbyfcmifq2db4sv65bkalj"; + sgr-iosevka-ss11 = "1avc38qc0r7ylmvmyw9lcdimsmh3xha675qzz7gxwalp1mp6d2zp"; + sgr-iosevka-ss12 = "1y9sbvq0mdhzwkaih2gh9jg07993jzjymjgmcn52kvygyn4jc8vf"; + sgr-iosevka-ss13 = "1xsgm6301vfpvsp0z3n3wbv03557whrnkw0cb9vkb9hbww5sjcq6"; + sgr-iosevka-ss14 = "0fvj6amlgifnppfwgvl39vq76aww170wiici596zqvbddl8hhf0k"; + sgr-iosevka-ss15 = "1ihsw196wbkr6cmisf7yasd3cfipz17033crjhsmh6f5q85705l7"; + sgr-iosevka-ss16 = "1b6w69cjmaa0a29yklly9b26m5ivrn5rpygrsbzsrfadgm6h9xcb"; + sgr-iosevka-ss17 = "1zvqrpg1m5i9af80qs847lz139zj1awx6akr7m3alwpz6jm178yd"; + sgr-iosevka-ss18 = "1vw5swd09a0xplz367f26li0ksf5c54a0rf65dr62nviilvlphmx"; + sgr-iosevka-term = "0zc1n1ansv5r4ph9xshm8vaj96m718ypagg4v9in0a0mdgpdp6il"; + sgr-iosevka-term-curly = "1z487mq31afz0cpc7mfpny5x1wq8vdf2c0mmzhr46bcncinwinll"; + sgr-iosevka-term-curly-slab = "15iw3mpy75486ybws9ya4x1bn9y00v1v40clcxjcbk276bfw121p"; + sgr-iosevka-term-slab = "0y6wym3knhcvw1dlrqy9h8f68rsfpwwlb2hl9kdcfrv5zmd8mngy"; + sgr-iosevka-term-ss01 = "03q1j73jwhi54hp3dfx3yj4vabmsrgiy8g5jk6lqcmqk6d42zhgq"; + sgr-iosevka-term-ss02 = "10i1wb4if30zf61ridmqks7j2915yrs72plbv6wy7c4x1qdawhy1"; + sgr-iosevka-term-ss03 = "05ywks1ikwgwxksx0jxawp2a9gaka76gknzxxxzxxvd3x7g6qh4v"; + sgr-iosevka-term-ss04 = "15n5ky9yppcb5gz1pqm77hqihc2br0v52silg2d5yaj1fp4lzjpr"; + sgr-iosevka-term-ss05 = "05p8sc1cjj9412bnyq3xda0v8xrzgf5g6ikgkanps3glvvvlkf3m"; + sgr-iosevka-term-ss06 = "0w6zra0hpdyl0pkm9hdv4171fcgksv1s75wmwrh50dwnlv2hlns3"; + sgr-iosevka-term-ss07 = "0zg9bnrfh3kbq69v4ih8yna70hzdbkbz1x0fminp79s0j9c66fjs"; + sgr-iosevka-term-ss08 = "0sqv98xg1z5p30npg66s2z2wh139prs7960d8y06s09k0npjzlsz"; + sgr-iosevka-term-ss09 = "0cqw79mf969kwbz5gwif3qg0zxk7pdbncpvq24m6kdws7sry06p4"; + sgr-iosevka-term-ss10 = "15vaj99l2xrlcqg7712ksjcz0nwba7nlqcfc2angmw8zy163qg23"; + sgr-iosevka-term-ss11 = "0rcn1761jv9wzi1nzl7sy57msw754yxys468jkacdpskqymfrhly"; + sgr-iosevka-term-ss12 = "0l1f60gvvswnc02w8ylzsk37px0j0jv75pbc572p012x3mvkqipw"; + sgr-iosevka-term-ss13 = "0nl7qbgas1zybi7gm6jr5rgzmk2vylh3ky8ggzlkljn9zw4mm1sn"; + sgr-iosevka-term-ss14 = "0nyvayy0xj9gv21s6yjfp9xa6g4qih8lpvsrsinic4jgjhjxxn1l"; + sgr-iosevka-term-ss15 = "14p7cq5rfr8f7lzi5q7q48a5rrvrd9mghkwr09a0m9fyqav2bnwh"; + sgr-iosevka-term-ss16 = "17b88cv3ylnlybw4zlaa2y55s63p4ylrjk8y15p27knkwf0j7km3"; + sgr-iosevka-term-ss17 = "1fh3b47g6faswq4ppksa6kkq5l1wpkq8c523ffakmjgjw92za7qi"; + sgr-iosevka-term-ss18 = "161afvra35nfvk5crri1jfnwm579wbdn6r16afzq8fr5g46ddcla"; } From 57067b71455d3299c920ab77c3d1311f67055448 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Jul 2021 17:11:22 +0000 Subject: [PATCH 023/108] gitkraken: 7.7.0 -> 7.7.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 3e10add49d48..a636c2c3e599 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.7.0"; + version = "7.7.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3"; + sha256 = "sha256-nFXj40PfHctymBcZoiJNzkvAsFnABD300/aUqNpUn2c="; }; dontBuild = true; From 6a91cf75237eac464c25152ff961408ef72e45b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Jul 2021 23:07:22 +0200 Subject: [PATCH 024/108] python3Packages.pyairvisual: 5.0.8 -> 5.0.9 --- pkgs/development/python-modules/pyairvisual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 65f70efb7c5b..fadb3f58d509 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.8"; + version = "5.0.9"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QgMc0O5jk5LgKQg9ZMCZd3dNLv1typm1Rp2u8kSsqYk="; + sha256 = "1jfbwnipklpgxjgsgsx4j53anbqyrbgvj0wb84fvsm32jq9m8avf"; }; nativeBuildInputs = [ poetry-core ]; From 7aa2bf302ae563453b010cc27ea66affb055b26e Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Wed, 28 Jul 2021 20:53:38 -0400 Subject: [PATCH 025/108] Added more detail to changelog, updated permissions in directory, and changed restartTriggers --- .../manual/from_md/release-notes/rl-2111.section.xml | 7 +++++-- nixos/doc/manual/release-notes/rl-2111.section.md | 2 +- nixos/modules/services/web-apps/tt-rss.nix | 10 ++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 31031a2d2e7b..c78c99cb6476 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -558,9 +558,12 @@ tt-rss was upgraded to the commit on - 2021-06-21, which has breaking changes, see + 2021-06-21, which has breaking changes. If you use + services.tt-rss.extraConfig you should + migrate to the putenv-style configuration. + See this - thread in the tt-rss forums for details. + Discourse post in the tt-rss forums for more details. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5a6bf727c03a..eb45c9bf747d 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -142,7 +142,7 @@ pt-services.clipcat.enable). - the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0 -- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes, see [this thread](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for details. +- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details. ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 676683a557db..7a6dc5f0a4ef 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -568,9 +568,7 @@ let systemd.services = { phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { - restartTriggers = [ - cfg.root - ]; + restartTriggers = [ tt-rss-config tt-rss ]; }; tt-rss = { @@ -611,9 +609,9 @@ let ''} ln -sf "${tt-rss-config}" "${cfg.root}/config.php" chmod -R 755 "${cfg.root}" - chmod -R 777 "${cfg.root}/${lockDir}" - chmod -R 777 "${cfg.root}/${cacheDir}" - chmod -R 777 "${cfg.root}/${feedIconsDir}" + chmod -R ug+rwX "${cfg.root}/${lockDir}" + chmod -R ug+rwX "${cfg.root}/${cacheDir}" + chmod -R ug+rwX "${cfg.root}/${feedIconsDir}" '' + (optionalString (cfg.database.type == "pgsql") '' From 46f19d869e42c3671a0c0e3ef6488b5138592358 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 02:30:47 +0000 Subject: [PATCH 026/108] brave: 1.27.108 -> 1.27.109 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index c45e5298dd13..7b85a5a51099 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.27.108"; + version = "1.27.109"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "Lz6rNTRoxt/UQFMQ9vurFhXWUshLDfWMxFON4nXfIiY="; + sha256 = "RJCGaezucb3LJC1KLG/7vPIF3diVgSTsnylXEN1BaRU="; }; dontConfigure = true; From 8a9b68514dd944f4eb2c4ebc512660fb6a4d0799 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 02:49:25 +0000 Subject: [PATCH 027/108] cargo-expand: 1.0.7 -> 1.0.8 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 390850c9afa7..1403f67abdab 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-8YppfgYa5Sd/3nPCMCgaM3A93ND0vU5eUoCW02uDkiM="; + sha256 = "sha256-UkNO2uNiyN6xB74dNMiWZUCH6qq6P6u95wTq8xRvxsQ="; }; - cargoSha256 = "sha256-0lrz8awAtLuLWE6Prmi07iGfYVmNZIETv3QL55CPYHQ="; + cargoSha256 = "sha256-JTjPdTG8KGYVkiCkTqRiJyTpm7OpZkbW10EKSp9lLJ4="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 621b13046cb1f92f1dd6fc43871dc9a34b39b116 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 03:06:42 +0000 Subject: [PATCH 028/108] cloudflared: 2021.7.3 -> 2021.7.4 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index b98f6a798220..9026738133b0 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.7.3"; + version = "2021.7.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-p9FNH5obQfEQZRoOr35ORH+6dwbcNgSXjARF9WA7t9E="; + sha256 = "sha256-3HK7QLUhU6MUayRYec4LP2BfbwEsvtjtCf++o1cQsQw="; }; vendorSha256 = null; From 6cf7d82316e632ad4e3d7b3a075a00d9b3d79e8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 04:35:03 +0000 Subject: [PATCH 029/108] fend: 0.1.21 -> 0.1.22 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 4ed308643e56..e46b8fe04d42 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.21"; + version = "0.1.22"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w="; + sha256 = "sha256-JuOhJGszsEBBz9G4jjV7OhCAyrSOIktYgoDpYPMk21c="; }; - cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE="; + cargoSha256 = "sha256-rKSbsxFt+ntE68eQK6zbIPdOL9JBOgqyqLnb8paVVo0="; doInstallCheck = true; From d542ab83c6cb04b8c4aaf0ac27035c67c5c68fed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 16:17:29 +0000 Subject: [PATCH 030/108] diff-so-fancy: 1.4.2 -> 1.4.3 --- .../git-and-tools/diff-so-fancy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 95060714c24e..0d346e3598d4 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A="; + sha256 = "sha256-/xdBvq2u1s5/yzjwr3MLxpaD1CNktcPijXJTKW3Bc4c="; }; nativeBuildInputs = [ From f414a026cb40034c82e1e98899cfa8be6edf9500 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 29 Jul 2021 21:01:18 +0200 Subject: [PATCH 031/108] ipget: 0.6.0 -> 0.7.0 https://github.com/ipfs/ipget/releases/tag/v0.7.0 --- pkgs/applications/networking/ipget/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 8817d90dd6ed..19cc4445b328 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,21 @@ buildGoModule rec { pname = "ipget"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - sha256 = "14ygij6hj6bd4g4aw6jgfbi1fgpal0jgf1hr22zxm16dpx3vva6b"; + sha256 = "sha256-YD05HIVr99b8VmEJgzY2ClNv31I98d0NbfCk3XcB+xk="; }; - vendorSha256 = "0vy21pdqk6q5fw7wlcv51myhh9y79n2qhvy61rmblwhxlrkh6sdv"; + vendorSha256 = "sha256-bymHVWskCt7bf02CveMXl1VhZYhRSEH7xIoESh31iGg="; + + postPatch = '' + # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies + rm -r sharness/dependencies/ + ''; doCheck = false; From 7ac716fa2bfadcd56598918b618afc656ecc6645 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 21:28:12 +0200 Subject: [PATCH 032/108] python3Packages.brotlicffi: init at 1.0.9.2 --- .../python-modules/brotlicffi/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/brotlicffi/default.nix diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix new file mode 100644 index 000000000000..06cb2bf75805 --- /dev/null +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, cffi +, brotli +}: + +buildPythonPackage rec { + pname = "brotlicffi"; + version = "1.0.9.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-hyper"; + repo = pname; + rev = "v${version}"; + sha256 = "0qx7an7772brmx1rbbrqzqnkqqvicc70mx740nl31kzzyv4jjs00"; + }; + + buildInputs = [ + brotli + ]; + + propagatedBuildInputs = [ + cffi + ]; + + preBuild = '' + export USE_SHARED_BROTLI=1 + ''; + + # Test data is not available, only when using libbortli git checkout + doCheck = false; + + pythonImportsCheck = [ "brotlicffi" ]; + + meta = with lib; { + description = "Python CFFI bindings to the Brotli library"; + homepage = "https://github.com/python-hyper/brotlicffi"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80fec6354089..e37f4b0b6cef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1212,6 +1212,10 @@ in { brotli = callPackage ../development/python-modules/brotli { }; + brotlicffi = callPackage ../development/python-modules/brotlicffi { + inherit (pkgs) brotli; + }; + brotlipy = callPackage ../development/python-modules/brotlipy { }; brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { }; From 06a13f7353e1181aab65e640ffa971410a6a902a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Jul 2021 22:45:05 +0000 Subject: [PATCH 033/108] ipset: 7.11 -> 7.14 --- pkgs/os-specific/linux/ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 213ae45f48f3..dd9fadfd02f0 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.11"; + version = "7.14"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MVG6rTDx2eMXsqtPL1qnqfe03BH8+P5zrNDcC126v30="; + sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA="; }; nativeBuildInputs = [ pkg-config ]; From 87f0713511da47f05362916dc8a380de02665e82 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Fri, 30 Jul 2021 01:52:32 +0200 Subject: [PATCH 034/108] openafs: 1.8.7 -> 1.8.8 Signed-off-by: Marc 'risson' Schmitt --- pkgs/servers/openafs/1.8/module.nix | 43 ----------------------------- pkgs/servers/openafs/1.8/srcs.nix | 6 ++-- 2 files changed, 3 insertions(+), 46 deletions(-) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 2e33e61c0e52..a2613844d4ca 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -18,49 +18,6 @@ in stdenv.mkDerivation { buildInputs = [ libkrb5 ]; - patches = [ - # LINUX 5.8: Replace kernel_setsockopt with new funcs - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/d7fc5bf9bf031089d80703c48daf30d5b15a80ca.patch"; - sha256 = "0469ydzgvyvrl1b2s1qbl9cd8c5c1nb99c3z52z5i685da5z6pab"; - }) - # LINUX 5.8: do not set name field in backing_dev_info - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/335f37be13d2ff954e4aeea617ee66502170805e.patch"; - sha256 = "0jr6cgplnip61cjlcd3fvgsc6n3jhfk93mm9m7ak04w1vc26dk9x"; - }) - # LINUX 5.8: use lru_cache_add - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/facff58b840a47853592510617ba7a1da2e3eaa9.patch"; - sha256 = "0izafg6bi5iaigq3jjx0zlg1cxwaddz3238hk0s08fcb6nyhkvx1"; - }) - # LINUX 5.9: Remove HAVE_UNLOCKED_IOCTL/COMPAT_IOCTL - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/e7902252f15acfc28453c531f6fa3b29c9c91b92.patch"; - sha256 = "1jy4v8yx8p6mhma6b3h3g94mb38bw7hg7q6lnyc8bijkbnl0d1rl"; - }) - # Linux: Refactor test for 32bit compat - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/4ad1057ab8fd206c9fa8d5e3bdde4f1a8417afdb.patch"; - sha256 = "0v2537wkav78yi8lv6fkd1n6rf2g17igf44rpa3kd0kkidxv5lqr"; - }) - # Linux 5.11: Test 32bit compat with in_compat_syscall - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/ee53dd3bc087a05e22fc4111297a51ddb30013f0.patch"; - sha256 = "0dfab3zk0dmf6iksna5n09lf5dn4f8w43q4irl2yf5dgqm35shkr"; - }) - # Linux: Create wrapper for setattr_prepare - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/5a5d358b02b88d6d2c7a27a75149e35b1de7db38.patch"; - sha256 = "07gywsg41cz5h6iafr4pb0gb9jnsb58xkwn479lw46b3y5jgz7ki"; - }) - # Linux 5.12: Add user_namespace param to inode ops - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/c747b15dd2877e6d17e3e6b940ae78c1e1ccd3ea.patch"; - sha256 = "0bbqmx4nkmfkapk25zrv9ivhhs91rn9dizb1lkfs7a6937q1kaqh"; - }) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index f1fd7ff4c0fe..f35903e50916 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0ygsrf65w9sqji2x3jbx3h31vk6513s6nalzxi7p2ryf3xb3lm2k"; + sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "0zri99pxmp4klh8ki5ycnjpf1h21lynn4049s6ywmap1vkpq84yn"; + sha256 = "sha256-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U="; })]; } From 3d43cf8f210632818963160d2df01fc64c76769a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Jul 2021 23:22:50 +0200 Subject: [PATCH 035/108] nixos/kea: fix config reload Because the config file gets symlinked to /etc/kea to make reloads work we need to add restart triggers for the actual symlink targets. --- nixos/modules/services/networking/kea.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index 72773b83a496..b11402204aec 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -238,6 +238,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + ctrlAgentConfig + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}"; KillMode = "process"; @@ -269,6 +273,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + dhcp4Config + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-dhcp4 -c /etc/kea/dhcp4-server.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}"; # Kea does not request capabilities by itself @@ -307,6 +315,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + dhcp6Config + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-dhcp6 -c /etc/kea/dhcp6-server.conf ${lib.escapeShellArgs cfg.dhcp6.extraArgs}"; # Kea does not request capabilities by itself @@ -343,6 +355,10 @@ in KEA_PIDFILE_DIR = "/run/kea"; }; + restartTriggers = [ + dhcpDdnsConfig + ]; + serviceConfig = { ExecStart = "${package}/bin/kea-dhcp-ddns -c /etc/kea/dhcp-ddns.conf ${lib.escapeShellArgs cfg.dhcp-ddns.extraArgs}"; AmbientCapabilites = [ From 2f216e02f453cf64cb3b06c1e564ea53bdc01fa0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 04:02:17 +0000 Subject: [PATCH 036/108] libhdhomerun: 20210224 -> 20210624 --- pkgs/development/libraries/libhdhomerun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index f8db7075ca76..187382e1f3e9 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20210224"; + version = "20210624"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256:1y1kwv34qg8nayfkbrxkw8163l46krsfqx8yvkcsc97ilsd3i5mr"; + sha256 = "sha256-3q9GO7zD7vpy+XGZ77YhP3sOLI6R8bPSy/UgVqhxXRU="; }; patchPhase = lib.optionalString stdenv.isDarwin '' From 00da1ca5a5ab3f4f8c88c9b99312cc77a9bca991 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 30 Jul 2021 08:07:00 +0300 Subject: [PATCH 037/108] =?UTF-8?q?transifex-client:=200.13.9=20=E2=86=92?= =?UTF-8?q?=200.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/text/transifex-client/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 93c2e6453099..f1b2928c7941 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -1,23 +1,23 @@ { lib, buildPythonApplication, fetchPypi -, python-slugify, requests, urllib3, six, setuptools }: +, python-slugify, requests, urllib3, six, setuptools, GitPython }: buildPythonApplication rec { pname = "transifex-client"; - version = "0.13.9"; + version = "0.14.3"; propagatedBuildInputs = [ - urllib3 requests python-slugify six setuptools + urllib3 requests python-slugify six setuptools GitPython ]; src = fetchPypi { inherit pname version; - sha256 = "0lgd77vrddvyn8afkxr7a7hblmp4k5sr0i9i1032xdih2bipdd9f"; + sha256 = "sha256-sKol67lRaYPFa7Bg9KNa1rDrNoT9DtUd48NY8jqK1iw="; }; + # https://github.com/transifex/transifex-client/issues/323 prePatch = '' - substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \ - --replace "six==1.11.0" "six>=1.11.0" \ - --replace "python-slugify<2.0.0" "python-slugify>2.0.0" + substituteInPlace requirements.txt \ + --replace "python-slugify<5.0.0" "python-slugify" ''; # Requires external resources @@ -25,8 +25,8 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://www.transifex.com/"; - license = licenses.gpl2; + license = licenses.gpl2Only; description = "Transifex translation service client"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sikmir ]; }; } From 75a0d735246a8996e921f79ba05f744b76ac445f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 05:11:28 +0000 Subject: [PATCH 038/108] agi: 2.1.0-dev-20210726 -> 2.1.0-dev-20210729 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 950849cafc47..17a79cda81e6 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.1.0-dev-20210726"; + version = "2.1.0-dev-20210729"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-1joE2+lNFs0VmglqLsbyqhj16tfCZ+saQmy1XP3ATBo="; + sha256 = "sha256-CrGZf+EiJfgPYOdz7NYSc6B/hpVpgNMCdRl1jd/nJ2o="; }; nativeBuildInputs = [ From fc37170d7b3640088878a2215075596ccdcd3af1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 06:29:16 +0000 Subject: [PATCH 039/108] ceph-csi: 3.3.1 -> 3.4.0 --- pkgs/tools/filesystems/ceph-csi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index 7f468c80964c..2eaa59b27e57 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.3.1"; + version = "3.4.0"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "16nh4bh8a9s2zbxnnhq1ldww4dzp2fmf5idgq99vkyw2kfp017lf"; + sha256 = "sha256-5+eK+iN6ecWtcmNPjiThCj1rwFaHX3rVCW9lmUCWhU0="; }; preConfigure = '' From 6eade3f79291ad582a055f92fc1748dc56be86d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 07:45:20 +0000 Subject: [PATCH 040/108] droidcam: 1.7.3 -> 1.8.0 --- pkgs/applications/video/droidcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 38d3d6304c68..4284d6dbf9f6 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU="; + sha256 = "sha256-A8FHTAeDFaSDp5Bnfv5NmCC7xIFAw3IcHSD4hZp4vwU="; }; nativeBuildInputs = [ From b58b4a85c418a6821f8557d6a2c19f7a2262fc0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 06:52:49 +0000 Subject: [PATCH 041/108] containerd: 1.5.4 -> 1.5.5 --- pkgs/applications/virtualization/containerd/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 0c44805bedd3..c86f4280e821 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.4"; + version = "1.5.5"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA="; + sha256 = "sha256-6mDTTXHpXBcKOcT+VrGgt6HJzvTeKgJ0ItJ+IjCTJxk="; }; vendorSha256 = null; @@ -32,15 +32,19 @@ buildGoModule rec { BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; buildPhase = '' + runHook preBuild patchShebangs . make binaries man $buildFlags + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] installShellCompletion --bash contrib/autocomplete/ctr installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + runHook postInstall ''; passthru.tests = { inherit (nixosTests) docker; }; From f57f936eed3fdf60ad7a1012a162d789cfdcb1c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 08:48:32 +0000 Subject: [PATCH 042/108] fly: 7.3.2 -> 7.4.0 --- .../tools/continuous-integration/fly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 22b7752c5939..741bcfbe5a87 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.3.2"; + version = "7.4.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-ID/vqkFzKHLeuojHUxUFYURn+Dxb78XwxfJVV+S130A="; + sha256 = "sha256-UvEPTZtQWztl7ZC1XrBxE8+emlXQjMG4IJEti5vVxUM="; }; - vendorSha256 = "sha256-30rrRkPIH0sr8koKRLs1Twe6Z55+lr9gkgUDrY+WOTw="; + vendorSha256 = "sha256-IY+HGgoKNS/j3FGCX3F3EK1GehBjs3Z1K8V3O7a3swk="; doCheck = false; From 3040e34263ef07db6f585b98d4b10de785def419 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 09:40:55 +0000 Subject: [PATCH 043/108] gore: 0.5.2 -> 0.5.3 --- pkgs/development/tools/gore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index 43bb2d2aad7b..0131908d0aac 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gore"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oiaZvoCxA69slNb3LArLJfaqzfQ1YImxLuQHzW5tibo="; + sha256 = "sha256-uLU4uZaQA9u6BUQZ0Rb4Yqg/oJOZ529gIiOwmmyg05A="; }; - vendorSha256 = "sha256-vJG7sc+ngagtrYvTwO3OrCSFUgAA7zhaXHkU97nIhcY="; + vendorSha256 = "sha256-/yggEibpQK9Uk116RkE5XbbJe6j4WsIC3GtKPU/P2hU="; doCheck = false; From 2ec9af0f0e8817da55cb040ce2d1c1a0bb2f2c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 30 Jul 2021 10:02:49 +0000 Subject: [PATCH 044/108] just: fix aarch64 build --- pkgs/development/tools/just/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index d7a2e7338592..cad2c7e1a18a 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -16,6 +16,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + postPatch = '' + # this hard codes the compiler, which breaks the aarch64 in particular + # we rather want to set the compiler ourself + rm .cargo/config + ''; + postInstall = '' installManPage man/just.1 From 274c4f6659c0d9861b0eece04aa4ebe86519d315 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 11:37:59 +0000 Subject: [PATCH 045/108] ktlint: 0.41.0 -> 0.42.0 --- 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 61b4a570b815..fde540b057e1 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.41.0"; + version = "0.42.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "10z1010k25i40iv7v339csmbs83hmwjv1004jikckb78wncd12s3"; + sha256 = "sha256-MrIn+siqBnjwst4HKdJQ+iy1PxCldKizXkmqHH6D3Kg="; }; nativeBuildInputs = [ makeWrapper ]; From bee9155f517273e0f26402622734c03e85008b0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 11:47:55 +0000 Subject: [PATCH 046/108] kubelogin: 0.0.9 -> 0.0.10 --- pkgs/applications/networking/cluster/kubelogin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 0a928ac9299f..f8bec6e0b109 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0+4hrC7A60dbf+1uvTVU2JRynvA3O/lXfgcra1fV9bI="; + sha256 = "sha256-YLYyU3k3I74ZuczFZBwcJoJSfCR4B9Z1EbFupA+xkiE="; }; - vendorSha256 = "sha256-erGqCpWlAQanY1ghpNVRhzUEIXv3lCiBGRs888MmHN8="; + vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM="; buildFlagsArray = '' -ldflags= From 60af7ac4d8d1918cc831a23fd1fd71852d2f6e0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 11:52:46 +0000 Subject: [PATCH 047/108] kuttl: 0.9.0 -> 0.11.0 --- pkgs/applications/networking/cluster/kuttl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index dfa06cc6968f..6470cd640e2d 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.9.0"; + version = "0.11.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256:1cji0py2340mvcpplwq3licdkzjx7q5f27fdjjxvbhrgksnyw6hs"; + sha256 = "sha256-42acx1UcvuzDZX2A33zExhhdNqWGkN0i6FR/Kx76WVM="; }; - vendorSha256 = "sha256:1shra42ifa2knxp58fj5hn074jg89f3nqdqk4rqbp3ybir84ahsd"; + vendorSha256 = "sha256-TUNFUI7Lj7twJhM3bIdL6ElygIVFOlRut1MoFwVRGeo="; subPackages = [ "cmd/kubectl-kuttl" ]; From d653ff37b3061075afca7de3078c13227cf39e27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jul 2021 22:58:03 +0200 Subject: [PATCH 048/108] python3Packages.python_magic: 0.4.22 -> 0.4.24 --- .../python-modules/python-magic/default.nix | 9 ++-- .../python-magic/libmagic-path.patch | 43 ++++++++++++------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 6737f1260733..02f1cc691522 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.22"; + version = "0.4.24"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6"; + sha256 = "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0"; }; patches = [ @@ -32,9 +32,10 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py ''; - meta = { + meta = with lib; { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-magic/libmagic-path.patch b/pkgs/development/python-modules/python-magic/libmagic-path.patch index 5a1dbec7d51b..e9530d6ddf75 100644 --- a/pkgs/development/python-modules/python-magic/libmagic-path.patch +++ b/pkgs/development/python-modules/python-magic/libmagic-path.patch @@ -1,17 +1,28 @@ -diff --git a/magic/loader.py b/magic/loader.py -index 6b2bfcb..69778af 100644 ---- a/magic/loader.py -+++ b/magic/loader.py -@@ -5,11 +5,7 @@ import glob - def load_lib(): - libmagic = None - # Let's try to find magic or magic1 -- dll = ctypes.util.find_library('magic') \ -- or ctypes.util.find_library('magic1') \ -- or ctypes.util.find_library('cygmagic-1') \ -- or ctypes.util.find_library('libmagic-1') \ -- or ctypes.util.find_library('msys-magic-1') # for MSYS2 -+ dll = '@libmagic@' +diff --git i/magic/loader.py w/magic/loader.py +index 931f161..b8096d1 100644 +--- i/magic/loader.py ++++ w/magic/loader.py +@@ -35,16 +35,12 @@ def _lib_candidates(): - # necessary because find_library returns None if it doesn't find the library - if dll: + + def load_lib(): ++ lib = '@libmagic@' + +- for lib in _lib_candidates(): +- # find_library returns None when lib not found +- if lib is None: +- continue +- try: +- return ctypes.CDLL(lib) +- except OSError: +- pass +- else: +- # It is better to raise an ImportError since we are importing magic module +- raise ImportError('failed to find libmagic. Check your installation') ++ try: ++ return ctypes.CDLL(lib) ++ except OSError: ++ pass + ++ # It is better to raise an ImportError since we are importing magic module ++ raise ImportError('failed to find libmagic. Check your installation') From 4e0d282b7f92ba5d7b46d39068cb01a046d09c05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 14:01:35 +0000 Subject: [PATCH 049/108] cargo-criterion: 1.0.1 -> 1.1.0 --- pkgs/development/tools/rust/cargo-criterion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix index 38723bbf3c1c..d33f455c9b93 100644 --- a/pkgs/development/tools/rust/cargo-criterion/default.nix +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-criterion"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bheisler"; repo = pname; rev = version; - sha256 = "sha256-NiuK+PexfF2wmA8drqqkv/RQlVwYLT3q2QWvV0ghJwg="; + sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0="; }; - cargoSha256 = "sha256-5Z9Oz8jjyM3+cHAZ++thRDdNlb0Kj54Mg7JjF9JrLdw="; + cargoSha256 = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; From b8315c660b0973ce4d036cb5ce1a2bf419bf5463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 30 Jul 2021 17:00:15 +0200 Subject: [PATCH 050/108] coqPackages.QuickChick: add optional version parameter This is the only package in coqPackages for which it was forgotten. --- pkgs/development/coq-modules/QuickChick/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 6490391eb636..3a629421d6b6 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,9 +1,10 @@ -{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io }: +{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: with lib; let recent = versions.isGe "8.7" coq.coq-version; in mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; + inherit version; defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [ { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } From 6c9dba48b115e13b60751f911fde86b7099ee6fd Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Fri, 30 Jul 2021 09:04:32 -0600 Subject: [PATCH 051/108] heisenbridge: 0.99.1 -> 0.99.8 --- pkgs/servers/heisenbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 638dba8f56c7..2a97d817d9e2 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "0.99.1"; + version = "0.99.8"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; rev = "v${version}"; - sha256 = "sha256-v3ji450YFxMiyBOb4DuDJDvAGKhWYSSQ8kBB51r97PE="; + sha256 = "sha256-NUSAOixU93z77QeVAua6yNk+/eDRreS5Hv1btBWh3gs="; }; propagatedBuildInputs = with python3Packages; [ From 8a2f376b83dc55be7bd196820ebaf9a08417a480 Mon Sep 17 00:00:00 2001 From: hqurve Date: Fri, 30 Jul 2021 11:18:59 -0400 Subject: [PATCH 052/108] krunner-symbols: fix license --- pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix index 7a0b61622570..5255bb4b0501 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword"; homepage = "https://github.com/domschrei/krunner-symbols"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; platforms = platforms.linux; }; From 0312e69de4f908ff20f67176d7eaa8849059182a Mon Sep 17 00:00:00 2001 From: hqurve Date: Fri, 30 Jul 2021 11:28:58 -0400 Subject: [PATCH 053/108] pdfchain: fix license --- pkgs/tools/typesetting/pdfchain/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/tools/typesetting/pdfchain/default.nix index 09122d60bc0d..84ed38b3836d 100644 --- a/pkgs/tools/typesetting/pdfchain/default.nix +++ b/pkgs/tools/typesetting/pdfchain/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A graphical user interface for the PDF Toolkit (PDFtk)"; homepage = "https://pdfchain.sourceforge.io"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ hqurve ]; platforms = platforms.linux; }; From e2d5af502a68269a30c9f73c1d6857c268909e1f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Jul 2021 13:48:38 -0400 Subject: [PATCH 054/108] lib/systems/platforms: armv7l-hf-multiplatform: fix kernel build autoModules triggers a build system bug where ks8851_mll needs to be built-in if ks8851 is also built-in. --- lib/systems/platforms.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 92285346f754..d7efe84e2b85 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -315,6 +315,12 @@ rec { # Disable OABI to have seccomp_filter (required for systemd) # https://github.com/raspberrypi/firmware/issues/651 OABI_COMPAT n + + # >=5.12 fails with: + # drivers/net/ethernet/micrel/ks8851_common.o: in function `ks8851_probe_common': + # ks8851_common.c:(.text+0x179c): undefined reference to `__this_module' + # See: https://lore.kernel.org/netdev/20210116164828.40545-1-marex@denx.de/T/ + KS8851_MLL y ''; }; gcc = { From 14bcebe82882e4bc2c71c95da4fce1c9d1651575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 30 Jul 2021 14:11:59 -0500 Subject: [PATCH 055/108] =?UTF-8?q?scalafmt:=202.6.4=20=E2=86=92=202.7.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0565127f8d04..c440c83a80e3 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.6.4"; + version = "2.7.5"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1h19rsxsn2piifillv29nwks2k9l391jwygjbfy8pc0ha8yi63mw"; + outputHash = "1xvx9bd6lf9m1r5p05d37qnjlzny6xrbkh8m7z4q4rk7i1vl8xv0"; }; in stdenv.mkDerivation { From eb7120dc79966d5ed168321fd213de38de13a2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 22 Jul 2021 17:38:31 +0200 Subject: [PATCH 056/108] nixos/etc: Replace make-etc.sh with nix and bash The main goal of this commit is to replace the rather fragile passing of multiple arrays which could break in cases like #130935. While I could have just added proper shell escaping to the variables being passed, I opted for the more painful approach of replacing the fragile and somewhat strange construct with the 5 bash lists. While there are currently no more problems present with the current approach (at least none that I know of), the new approach seems more solid and might get around problems that could arise in the future stemming from either the multiple-lists situation or from the absence of proper shell quoting all over the script. --- nixos/modules/system/boot/systemd.nix | 2 +- nixos/modules/system/etc/etc.nix | 64 ++++++++++++++++++++++----- nixos/modules/system/etc/make-etc.sh | 45 ------------------- 3 files changed, 53 insertions(+), 58 deletions(-) delete mode 100644 nixos/modules/system/etc/make-etc.sh diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index abd8ab29caef..e19097759267 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1045,7 +1045,7 @@ in done '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) '' rm -f $out/${removePrefix "tmpfiles.d/" name} - '') config.system.build.etc.targets; + '') config.system.build.etc.passthru.targets; }) + "/*"; "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index a450f303572e..183de7292101 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -8,21 +8,61 @@ let etc' = filter (f: f.enable) (attrValues config.environment.etc); - etc = pkgs.stdenvNoCC.mkDerivation { - name = "etc"; - - builder = ./make-etc.sh; - + etc = pkgs.runCommand "etc" { preferLocalBuild = true; allowSubstitutes = false; - /* !!! Use toXML. */ - sources = map (x: x.source) etc'; - targets = map (x: x.target) etc'; - modes = map (x: x.mode) etc'; - users = map (x: x.user) etc'; - groups = map (x: x.group) etc'; - }; + # This is needed for the systemd module + passthru.targets = map (x: x.target) etc'; + } /* sh */ '' + set -euo pipefail + + makeEtcEntry() { + src="$1" + target="$2" + mode="$3" + user="$4" + group="$5" + + if [[ "$src" = *'*'* ]]; then + # If the source name contains '*', perform globbing. + mkdir -p "$out/etc/$target" + for fn in $src; do + ln -s "$fn" "$out/etc/$target/" + done + else + + mkdir -p "$out/etc/$(dirname "$target")" + if ! [ -e "$out/etc/$target" ]; then + ln -s "$src" "$out/etc/$target" + else + echo "duplicate entry $target -> $src" + if [ "$(readlink "$out/etc/$target")" != "$src" ]; then + echo "mismatched duplicate entry $(readlink "$out/etc/$target") <-> $src" + ret=1 + + continue + fi + fi + + if [ "$mode" != symlink ]; then + echo "$mode" > "$out/etc/$target.mode" + echo "$user" > "$out/etc/$target.uid" + echo "$group" > "$out/etc/$target.gid" + fi + fi + } + + mkdir -p "$out/etc" + ${concatMapStringsSep "\n" (etcEntry: escapeShellArgs [ + "makeEtcEntry" + etcEntry.source + etcEntry.target + etcEntry.mode + etcEntry.user + etcEntry.group + ]) etc'} + ''; in diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh deleted file mode 100644 index aabfb5e88a65..000000000000 --- a/nixos/modules/system/etc/make-etc.sh +++ /dev/null @@ -1,45 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/etc - -set -f -sources_=($sources) -targets_=($targets) -modes_=($modes) -users_=($users) -groups_=($groups) -set +f - -for ((i = 0; i < ${#targets_[@]}; i++)); do - source="${sources_[$i]}" - target="${targets_[$i]}" - - if [[ "$source" =~ '*' ]]; then - - # If the source name contains '*', perform globbing. - mkdir -p $out/etc/$target - for fn in $source; do - ln -s "$fn" $out/etc/$target/ - done - - else - - mkdir -p $out/etc/$(dirname $target) - if ! [ -e $out/etc/$target ]; then - ln -s $source $out/etc/$target - else - echo "duplicate entry $target -> $source" - if test "$(readlink $out/etc/$target)" != "$source"; then - echo "mismatched duplicate entry $(readlink $out/etc/$target) <-> $source" - exit 1 - fi - fi - - if test "${modes_[$i]}" != symlink; then - echo "${modes_[$i]}" > $out/etc/$target.mode - echo "${users_[$i]}" > $out/etc/$target.uid - echo "${groups_[$i]}" > $out/etc/$target.gid - fi - - fi -done From c8de54957257a810ed019c883f5bdd9e2fc0fe47 Mon Sep 17 00:00:00 2001 From: Greizgh Date: Fri, 30 Jul 2021 22:40:03 +0200 Subject: [PATCH 057/108] chirp: 20200807 -> 20210724 --- pkgs/applications/radio/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index e9b446dc5847..2e4b3b30d225 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200807"; + version = "20210724"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0"; + sha256 = "0wddzls7r0l5b8vvljnmrj5lmmp7zkzl4h73pyigyf9nbhaklybb"; }; propagatedBuildInputs = with python2.pkgs; [ From 60587b92d1a3412b41eee2304d8446e2503aedc1 Mon Sep 17 00:00:00 2001 From: Jacob Vallejo Date: Fri, 30 Jul 2021 14:14:15 -0700 Subject: [PATCH 058/108] ripcord: 0.4.28 -> 0.4.29 Signed-off-by: Jacob Vallejo --- .../networking/instant-messengers/ripcord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index dbcd447d156d..76f93d9d2173 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.28"; + version = "0.4.29"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0bczqp4kny7jlp06f4bh1xg0x17g8980dj6pk4waqc7qk88i6sfv"; + sha256 = "sha256-4yDLPEBDsPKWtLwdpmSyl3b5XCwLAr2/EVtNRrFmmJk="; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { From 56ca1d12a5d8c779e55457e08cbfd83e384b27fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:21:26 +0200 Subject: [PATCH 059/108] python3Packages.pywemo: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/pywemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index ad2574bd86c5..80d69a04333c 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.6.5"; + version = "0.6.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-8nLzNEle5eR5qc/tC1CX+Kh3WkPuKyy9VDMiAVbOykA="; + sha256 = "04h4av65x0a2iv3a4rpsq19m9pi7wk8j447rr5z7jwap870gs8nd"; }; nativeBuildInputs = [ From 1a68ddfc242d49b3117436f0b0f435150a7a4e33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:38:47 +0200 Subject: [PATCH 060/108] python3Packages.hap-python: 3.5.2 -> 4.0.0 --- pkgs/development/python-modules/hap-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index c48116776554..e48826eae9fc 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "3.5.2"; + version = "4.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1irf4dcq9fcqvvjbijkymm63n2s7a19igs1zsbv7y8fa5a2yprhd"; + sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4"; }; propagatedBuildInputs = [ From 4de3b8f551c40ae1068c30ac4fd243869f22a919 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jul 2021 23:46:42 +0200 Subject: [PATCH 061/108] python3Packages.iaqualink: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/iaqualink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index 223f3893e18d..5806104d419f 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iaqualink"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "flz"; repo = "iaqualink-py"; rev = "v${version}"; - sha256 = "13iwngjjqzr1pkmskbc2wakccvcjkf4bk65f4jp4ywpciilr4zjw"; + sha256 = "0xgxajw38jrc55xh8w8mq0dk82ml77mfs8yn05gcpv8l24y70chq"; }; nativeBuildInputs = [ pytest-runner ]; From 531cd69bcd63d79023730d59fc9c3f72d921a456 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 22:19:22 +0000 Subject: [PATCH 062/108] free42: 3.0.5 -> 3.0.6 --- pkgs/applications/misc/free42/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 2dd70acb9a73..0aae4ab3baf7 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ytRPIBE8KcuM+pyfdKt/b+Vi03x8nowdgZjSt8EddSc="; + sha256 = "sha256-PIHokB7GlGtx1A0IqFX9+HA/Vab1CDpVS/qhk/y8Nzk="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; From bc32030066d09589203afa751cfe23d4a81e4eab Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:00:41 +0300 Subject: [PATCH 063/108] easyeffects: 6.0.0 -> 6.0.3 --- pkgs/applications/audio/easyeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index ee4d16d6b36d..1e85d57c3f79 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.0.0"; + version = "6.0.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256:1m3jamnhgpx3z51nfc8xg7adhf5x7dirvw0wf129hzxx4fjl7rch"; + sha256 = "sha256-GzqPC/m/HMthLMamhJ4EXX6fxZYscdX1QmXgqHOPEcg="; }; nativeBuildInputs = [ From a7f41de6bafc95088f8e5cc4d5ec872cffea5d10 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:17:43 +0300 Subject: [PATCH 064/108] libfilezilla: 0.27.0 -> 0.30.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index c7d84d9d8af6..8107ff3c98ec 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.27.0"; + version = "0.30.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs="; + sha256 = "sha256-wW322s2y3tT24FFBtGge2pGloboFKQCiSp+E5lpQ3EA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 55c1dc095e8d551c889bc8a4f72abca29468e89b Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:18:45 +0300 Subject: [PATCH 065/108] filezilla: 3.53.1 -> 3.55.0 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 5472782758cb..56dd02e9786f 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.53.1"; + version = "3.55.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-ZWh08ursVGcscvQepeoUnFAZfFDeXWdIu0HXIr/D93k="; + sha256 = "sha256-rnDrQYDRNr4pu61vzdGI5JfiBfxBbqPkE9znzYyrnII="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 From fea6f5cd190790dbc2c77f65582e4b0e3385178a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 30 Jul 2021 16:57:28 -0600 Subject: [PATCH 066/108] yubikey-manager: 4.0.3 -> 4.0.5 --- pkgs/tools/misc/yubikey-manager/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index ed4f76fa6270..cf2226cad54c 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -1,15 +1,20 @@ -{ python3Packages, fetchurl, lib, - yubikey-personalization, libu2f-host, libusb1 }: +{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1 }: python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "4.0.3"; + version = "4.0.5"; - srcs = fetchurl { - url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - hash = "sha256-p7tv/bj6PMCnCU5j8Vhi60LxLiPmR1Cuf8xVdDVtZvQ="; + src = fetchFromGitHub { + repo = "yubikey-manager"; + rev = version; + owner = "Yubico"; + sha256 = "sha256:0ycp7k6lkxzqwkc16fifhyqaqi7hl3351pwddsn18r5l83jnzdn2"; }; + format = "pyproject"; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; + propagatedBuildInputs = with python3Packages; [ click From a995595c5244d389e03b544e26212271879e47c1 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 31 Jul 2021 02:41:01 +0300 Subject: [PATCH 067/108] jitsi-meet-electron: 2.8.8 -> 2.8.9 --- .../instant-messengers/jitsi-meet-electron/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index b932e699ac61..a80e65482f0d 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,20 +2,20 @@ , fetchurl , appimageTools , makeWrapper -, electron_12 +, electron_13 , xorg }: let - electron = electron_12; + electron = electron_13; in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.8"; + version = "2.8.9"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-ORj0xSFzdyOVuybaDyTrawsVkJymKEHLbFxGUgzXNWY="; + sha256 = "sha256-PsMP0bDxlXAkRu3BgaUWcqnTfUKOGB81oHT94Xi8t8E="; name = "${pname}-${version}.AppImage"; }; From 79bb3ad9047901e121669ac95172546bafbca543 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 30 Jul 2021 16:50:18 -0700 Subject: [PATCH 068/108] rpiboot-unstable: unstable-2020-10-20 -> 2021.07.01 --- pkgs/development/misc/rpiboot/unstable.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index d0cb663fb74b..941c7ce904ef 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libusb1 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rpiboot"; - version = "unstable-2020-10-20"; + version = "2021.07.01"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "d3760e119385a179765f43a50a8e051a44127c25"; - sha256 = "0vygzh2h27xplqp1x4isj6kgrgmvmvc1mr3ghmsi98kzp91w772r"; + rev = "v${version}"; + sha256 = "sha256-BkNyYCrasfiRs7CbJa7tCo2k70TLGcXkOX+zGPyZGGE="; }; nativeBuildInputs = [ libusb1 ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/raspberrypi/usbboot"; - description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; + description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; license = licenses.asl20; maintainers = with maintainers; [ cartr ]; platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ]; From 1a182deb8c3c656a14875c6a56c710ae640c41a2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 30 Jul 2021 16:50:30 -0700 Subject: [PATCH 069/108] rpiboot-unstable -> rpiboot --- pkgs/development/misc/rpiboot/{unstable.nix => default.nix} | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/misc/rpiboot/{unstable.nix => default.nix} (100%) diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/default.nix similarity index 100% rename from pkgs/development/misc/rpiboot/unstable.nix rename to pkgs/development/misc/rpiboot/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85a63f37802b..d50316d2a40c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -711,6 +711,7 @@ mapAliases ({ radare2-cutter = cutter; # added 2021-03-30 redkite = throw "redkite was archived by upstream"; # added 2021-04-12 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 + rpiboot-unstable = rpiboot; # added 2021-07-30 ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_2_9 = throw "ruby_2_2_9 was deprecated on 2018-02-13: use a newer version of ruby"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3e5fafb151..eaec5e11d81d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8567,7 +8567,7 @@ in rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; - rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; + rpiboot = callPackage ../development/misc/rpiboot { }; rpm = callPackage ../tools/package-management/rpm { python = python3; From 6463828755b6a03f6af7e549216bef837b03b3e1 Mon Sep 17 00:00:00 2001 From: Artturi Date: Sat, 31 Jul 2021 03:40:22 +0300 Subject: [PATCH 070/108] openmw: add wrapQtAppsHook (#132131) dontWrapQtApps was blanket added in 5590e365e4775f138610b1036a75f8886921843e --- pkgs/games/openmw/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 8e6ed3cdb823..cfde63ac7264 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, wrapQtAppsHook , openscenegraph , mygui , bullet @@ -37,7 +38,7 @@ mkDerivation rec { sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x"; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ SDL2 @@ -57,8 +58,6 @@ mkDerivation rec { "-DOpenGL_GL_PREFERENCE=LEGACY" ]; - dontWrapQtApps = true; - meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; From 876513113b420f7134b1a3d07463bd343576eb8c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 24 Jun 2021 12:02:32 -0400 Subject: [PATCH 071/108] builbot: add updateScript --- pkgs/development/python-modules/buildbot/default.nix | 1 + pkgs/development/python-modules/buildbot/update.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100755 pkgs/development/python-modules/buildbot/update.sh diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 8d8e5ec00dc4..c242a2eaaa8a 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -97,6 +97,7 @@ let passthru = { inherit withPlugins; tests.buildbot = nixosTests.buildbot; + updateScript = ./update.sh; }; meta = with lib; { diff --git a/pkgs/development/python-modules/buildbot/update.sh b/pkgs/development/python-modules/buildbot/update.sh new file mode 100755 index 000000000000..3406f05db3e8 --- /dev/null +++ b/pkgs/development/python-modules/buildbot/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update +set -eu -o pipefail + +nix-update python3Packages.buildbot +nix-update --version=skip python3Packages.buildbot-worker +nix-update --version=skip python3Packages.buildbot-pkg +nix-update --version=skip python3Packages.buildbot-plugins.www +nix-update --version=skip python3Packages.buildbot-plugins.console-view +nix-update --version=skip python3Packages.buildbot-plugins.waterfall-view +nix-update --version=skip python3Packages.buildbot-plugins.grid-view +nix-update --version=skip python3Packages.buildbot-plugins.wsgi-dashboards From 906997c95bf1cc9a3330234ed5c46b79964f0de4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 24 Jun 2021 12:06:41 -0400 Subject: [PATCH 072/108] buildbot: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++----- pkgs/development/python-modules/buildbot/worker.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index c242a2eaaa8a..f6405e1b68db 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -26,11 +26,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0vh2v1qs65kwcj1x8r1wj2g456kflspyz7mjara9ph9qs7j97y74"; + sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index b00a2ece5684..94cca457b9c8 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "13bcshfas3r7hl205il9fzdjfhd18jf0lxrr5wd8r6qzdrl6i1y6"; + sha256 = "sha256-6PpR/zDy1ZZWFN2qzIeNWk9kmDpecZH40IEMoqyprnk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 62f32a00fb45..f01967337a1d 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1qb82s72mrm39123kwkypa2nhdsks6v9nkpw4vvscnq4p9xbzw2c"; + sha256 = "sha256-6dG8yCHmysQELodaPXOrI8J8Uc1/7YHwplnvYZyeuo0="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0kwzj28dmhkcr44nf39s82xjc9y5p27w4ywxfpm55cim3hwxbcb1"; + sha256 = "sha256-bjDVA5478pHtBXIVPSZJURRqU9EVFVXG/933oDQZCpk="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0vvp6z0d0qf5i5kykzph28hr3g9wgzrmmbbzdnm94yk4wsqq7w86"; + sha256 = "sha256-I31sryOUW6JVsWpkgvQe9ICyoDZUVewRPtG0JdIVJo8="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0y839swv9vdkwi4i1hjiyrjbj1bs74sbkpr5f58ivkjlf5alb56b"; + sha256 = "sha256-FWi67S3wXuISLP0f4VzXisEWXN60xlgU4I946QkX9Eo="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1zsh1bvrl3byx0ycz5jnhijzifxglm8w7kcxp79k7frw7i02fpvy"; + sha256 = "sha256-6kXB+hu75V59KMo7tIHbE2Wvig6raTbPc7vYVVl/1y0="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 4313d16d0b77..f873eeee98a9 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0q16vgvlhiybq5rhva9kcj5v2mhfpdb5czm2vng4rrfqqiqq918m"; + sha256 = "sha256-pIXdqahCWJGRiXKDyih2UjGYdyzwhxnYgMwCzdQfYUo="; }; propagatedBuildInputs = [ twisted future ]; From b4ce66c0bbd37c1bc53bc9a5e048031cd21aca90 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Jul 2021 22:46:57 -0400 Subject: [PATCH 073/108] buildbot: fix compatibility with SQLAlchemy 1.4 --- .../python-modules/buildbot/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index f6405e1b68db..de34be979f36 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k , python, twisted, jinja2, zope_interface, sqlalchemy , sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq , txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial @@ -78,6 +78,19 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + # Fix compatibility with SQLAlchemy 1.4 + (fetchpatch { + url = "https://github.com/buildbot/buildbot/pull/6156.patch"; + sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my"; + stripLen = 1; + excludes = [ + ".bbtravis.yml" + "buildbot/test/unit/db/test_enginestrategy.py" + "buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py" + "requirements-ci.txt" + "requirements-cidb.txt" + ]; + }) ]; postPatch = '' From a3a0a6edc2a1d45a978394ba51ef59f3ca72bb00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 03:42:57 +0000 Subject: [PATCH 074/108] i3status-rust: 0.20.2 -> 0.20.3 --- pkgs/applications/window-managers/i3/status-rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index fe0cde61c6f3..d9d4df4c00f5 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PXvQrh0gmn/G+b7sbQffQkPnUKu1eVrvUoJlRBsOEM="; + sha256 = "sha256-JNTTSVWGPqJT9xShF1bgwTGtlp37Ocsdovow8F4EH3g="; }; - cargoSha256 = "sha256-6orDR2Ml1Fy20uT47EDkEk0rGFxO0djHZsFiqlS1Tk8="; + cargoSha256 = "sha256-sm7Iorux2GKja0qzw2wM4sdsRwijtezIlef5vh1Nt54="; nativeBuildInputs = [ pkg-config makeWrapper ]; From c8ff5bc6f74a2960fab5ae417cd2bb055eab1002 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 30 Jul 2021 20:19:16 -0700 Subject: [PATCH 075/108] coqPackages.category-theory: v20210730, for Coq versions 8.10-8.13 --- pkgs/development/coq-modules/category-theory/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 339bcb9d6b09..d24cf1479307 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -5,6 +5,8 @@ with lib; mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; + release."20210730".rev = "d87937faaf7460bcd6985931ac36f551d67e11af"; + release."20210730".sha256 = "04x7433yvibxknk6gy4971yzb4saa3z4dnfy9n6irhyafzlxyf0f"; release."20190414".rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; release."20190414".sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay"; release."20180709".rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; @@ -12,6 +14,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.13"; out = "20210730"; } { case = range "8.8" "8.9"; out = "20190414"; } { case = range "8.6" "8.7"; out = "20180709"; } ] null; From f4491a0f38b0d8b591c7e35adcf19bc552664a52 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Sat, 31 Jul 2021 14:17:45 +0800 Subject: [PATCH 076/108] archiver: add meta.mainProgram --- pkgs/applications/misc/archiver/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 1691ab073610..4d46047bb964 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "Easily create & extract archives, and compress & decompress files of various formats"; homepage = "https://github.com/mholt/archiver"; + mainProgram = "arc"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; From f5b0f06a5da43e7ff72a4b4a01c13a89fc67912b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 31 Jul 2021 03:34:18 -0300 Subject: [PATCH 077/108] yabasic: 2.89.1 -> 2.90.1 --- pkgs/development/interpreters/yabasic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix index 414171082e30..02d3dbeb9fd1 100644 --- a/pkgs/development/interpreters/yabasic/default.nix +++ b/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yabasic"; - version = "2.89.1"; + version = "2.90.1"; src = fetchurl { url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; - hash = "sha256-k8QmQCpszLyotEiWDrG878RM2wqSq7I4W9j6Z2Ub3Yg="; + hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo="; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.yabasic.de/"; + homepage = "http://2484.de/yabasic/"; description = "Yet another BASIC"; longDescription = '' Yabasic is a traditional basic-interpreter. It comes with goto and various From 95f1154f993bc788bad7df1feed1b98c7e7381cb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 31 Jul 2021 14:31:23 +0700 Subject: [PATCH 078/108] coqPackages.interval: 4.1.1 -> 4.3.0 (#131818) --- pkgs/development/coq-modules/interval/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index cdb904523651..82d88b4a62ea 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,16 +1,18 @@ -{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, version ? null }: +{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }: -with lib; mkCoqDerivation { +with lib; mkCoqDerivation rec { pname = "interval"; owner = "coqinterval"; domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.8" ; out = "4.1.1"; } + { case = isGe "8.8" ; out = "4.3.0"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko="; + release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE="; release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU="; release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp"; release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0"; @@ -18,8 +20,11 @@ with lib; mkCoqDerivation { releaseRev = v: "interval-${v}"; nativeBuildInputs = [ which autoconf ]; - propagatedBuildInputs = [ bignums coquelicot flocq ]; + propagatedBuildInputs = [ bignums coquelicot flocq ] + ++ lib.optionals (versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; + mlPlugin = true; + enableParallelBuilding = true; meta = with lib; { description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant"; From 99cea37cd52b2ef72e75c220c5378f5f02034584 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 10:05:50 +0200 Subject: [PATCH 079/108] tfsec: 0.52.1 -> 0.55.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 570054a36867..45ba1223e84a 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.52.1"; + version = "0.55.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "1ky2pp924c10ylgk0pgdgj822sajd51ijamlgshy9jc2s3n9acay"; + sha256 = "1l71r9il45svdwydvi08hnyh310j0gha11qhyqvdz14d8czf8ahn"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 809562692ce929a2014ba35034975a295030211c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 31 Jul 2021 10:19:21 +0200 Subject: [PATCH 080/108] python3Packages.praw: 7.3.0 -> 7.4.0 --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index e104dbff4f62..1196a6575da8 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "0pj987v04y5askczlma2ilwllwfsg7p5mwhv0h1lcl1lg0fbsvn9"; + sha256 = "1wcr59k1bncwfza5k8mllaxz8fwfyqbwgm5xp908w2449i71wl7r"; }; propagatedBuildInputs = [ From 088b985a714d46d7fa09191173450120e42747d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 19:08:59 +0000 Subject: [PATCH 081/108] erlang: 24.0.4 -> 24.0.5 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index b4e9ebba7978..8d1d114e12ce 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.4"; - sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM="; + version = "24.0.5"; + sha256 = "4ZyYcBhep67aPr8SY7JK/3YXD5Th8UcyjTP7UIZ5c5Q="; } From 66b3e4a71f2d487b7bdee020e8431d657d835a24 Mon Sep 17 00:00:00 2001 From: Lara Date: Wed, 28 Jul 2021 20:38:05 +0200 Subject: [PATCH 082/108] maintainers: add yayayayaka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4c2469d7211c..2e9e546005b9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11692,6 +11692,12 @@ githubId = 3705333; name = "Dmitry V."; }; + yayayayaka = { + email = "nixpkgs@uwu.is"; + github = "yayayayaka"; + githubId = 73759599; + name = "Lara A."; + }; yegortimoshenko = { email = "yegortimoshenko@riseup.net"; github = "yegortimoshenko"; From 2cb0107550a9c40664cf423931ff8adeb3b1000f Mon Sep 17 00:00:00 2001 From: Lara Date: Wed, 28 Jul 2021 16:59:08 +0000 Subject: [PATCH 083/108] arch-install-scripts: init at 24 --- .../misc/arch-install-scripts/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/tools/misc/arch-install-scripts/default.nix diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix new file mode 100644 index 000000000000..0b6984526e4b --- /dev/null +++ b/pkgs/tools/misc/arch-install-scripts/default.nix @@ -0,0 +1,68 @@ +{ lib +, resholvePackage +, fetchFromGitHub +, asciidoc +, bash +, coreutils +, gawk +, gnum4 +, testVersion +, util-linux +}: + +resholvePackage rec { + pname = "arch-install-scripts"; + version = "24"; + + src = fetchFromGitHub { + owner = "archlinux"; + repo = "arch-install-scripts"; + rev = "v${version}"; + sha256 = "06rydiliis34lbz5fsayhbczs1xqi1a80jnhxafpjf6k3rfji6iq"; + }; + + nativeBuildInputs = [ asciidoc gnum4 ]; + + preBuild = '' + substituteInPlace ./Makefile \ + --replace "PREFIX = /usr/local" "PREFIX ?= /usr/local" + + # https://github.com/archlinux/arch-install-scripts/pull/10 + substituteInPlace ./common \ + --replace "print '%s' \"\$1\"" "printf '%s' \"\$1\"" + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + doCheck = true; + + solutions = { + # Give each solution a short name. This is what you'd use to + # override its settings, and it shows in (some) error messages. + profile = { + # the only *required* arguments are the 3 below + + # Specify 1 or more $out-relative script paths. Unlike many + # builders, resholvePackage modifies the output files during + # fixup (to correctly resolve in-package sourcing). + scripts = [ "bin/arch-chroot" "bin/genfstab" "bin/pacstrap" ]; + + # "none" for no shebang, "${bash}/bin/bash" for bash, etc. + interpreter = "${bash}/bin/bash"; + + # packages resholve should resolve executables from + inputs = [ coreutils gawk util-linux ]; + }; + }; + + meta = with lib; { + description = "Useful scripts for installing Arch Linux"; + longDescription = '' + A small suite of scripts aimed at automating some menial tasks when installing Arch Linux. + ''; + homepage = "https://github.com/archlinux/arch-install-scripts"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ yayayayaka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaec5e11d81d..c1b3d8d17dd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -870,6 +870,8 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; + arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; + auditwheel = callPackage ../tools/package-management/auditwheel { }; amidst = callPackage ../tools/games/minecraft/amidst { }; From cf3dcef38b69f7c02847ab35b38b03be4a81010e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Jul 2021 16:11:56 +0000 Subject: [PATCH 084/108] cargo-release: 0.16.0 -> 0.16.2 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index aeb18f2efdef..6b4e450a70cb 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-+vQXaI6v8HXzsfXZFxmBJe+1u9nmW0z3SBjo38orJYA="; + sha256 = "sha256-o3AKA/uP6VWMO4c62H3ey0P98KIhbzhnng5ggKjNeZ8="; }; - cargoSha256 = "sha256-Zcg1MAAESD6qrh7domslisT2wG4ZaYyZtPCQ5IQrLVo="; + cargoSha256 = "sha256-SHLiUVH5LiQNd/Ipj/xrjSG0X2HXfcAwswqsbqweJBs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From d55bba14daa28dc4df9014a1f2774cab998b82a4 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 31 Jul 2021 11:42:52 +0900 Subject: [PATCH 085/108] wrangler: 1.18.0 -> 1.19.0 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index b26d5a8a9dba..55c2d3139e93 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ue9HCAYqv8DXiEZEuGRFPywNegakxBpb66RELP1Y+cg="; + sha256 = "sha256-z6fL2uvv8E6NDBbbQKZ2Xhc6PI+e0Zl6mUvxIRhduH0="; }; - cargoSha256 = "sha256-HCsJG//RnlcmRSrBdf7iZTUOiQabMV2rICPLKvuE4AI="; + cargoSha256 = "sha256-xGoOVp0Pt6cpCBK8IkyFCIcBNucDo98o3f7T3TQQhZY="; nativeBuildInputs = [ pkg-config ]; From e721776cbbaeedf7d7da434fba5845f2d81685b4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Jul 2021 09:04:52 +0000 Subject: [PATCH 086/108] Revert "notmuch: skip T568-lib-thread" This reverts commit a4380866507afa5899cf0f1e05f0a7179145d3cf. > This should be fixed in commit a37d5f5, which was part of Notmuch > 0.31.4. https://nmbug.notmuchmail.org/nmweb/show/878s1o54c1.fsf%40tethera.net --- .../applications/networking/mailreaders/notmuch/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dceb9c92deb8..e1a235c8309e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -86,12 +86,6 @@ stdenv.mkDerivation rec { gdb man emacs ]; - # Expects there to always be a thread with ID - # thread:0000000000000009, but notmuch new is non-deterministic so - # this isn't always the case. Upstream bug report: - # https://nmbug.notmuchmail.org/nmweb/show/871reno6g7.fsf%40alyssa.is - NOTMUCH_SKIP_TESTS = "lib-thread"; - installTargets = [ "install" "install-man" "install-info" ]; postInstall = lib.optionalString withEmacs '' From 3b3ef3b8653eaddeb4e61fad0e4880dbd921894f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 09:16:43 +0000 Subject: [PATCH 087/108] bibletime: 3.0 -> 3.0.1 --- pkgs/applications/misc/bibletime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index aae4a960a371..30088f52436c 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -4,14 +4,14 @@ mkDerivation rec { - version = "3.0"; + version = "3.0.1"; pname = "bibletime"; src = fetchurl { url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "08i6nb9a7z0jpsq76q0kr62hw6ph9chqjpjcvkimbcj4mmifzgnn"; + sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA="; }; nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; From 15eec2111fc06cca2b0abd7b3de1b6922fabf21e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Jul 2021 09:34:41 +0000 Subject: [PATCH 088/108] notmuch: 0.32.1 -> 0.32.2; clarify license Also fix an incorrect (but apparently harmless) use of lib.optional. --- .../networking/mailreaders/notmuch/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dceb9c92deb8..71cb68d0debe 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.32.1"; + version = "0.32.2"; pname = "notmuch"; passthru = { @@ -20,10 +20,9 @@ stdenv.mkDerivation rec { inherit version; }; - src = fetchgit { - url = "https://git.notmuchmail.org/git/notmuch"; - sha256 = "sha256:06r0hdz8mxnzag74md62a9m6c2zm0fxn45n4n1c26j5cmrys7j16"; - rev = version; + src = fetchurl { + url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; + sha256 = "1myylb19hj5nb1vriqng252vfjwwkgbi3gxj93pi2q1fzyw7w2lf"; }; nativeBuildInputs = [ @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL - ] ++ optional withEmacs [ emacs ]; + ] ++ optional withEmacs emacs; buildInputs = [ gnupg # undefined dependencies @@ -103,7 +102,7 @@ stdenv.mkDerivation rec { meta = { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; }; From c5b20238a32a4de07a787a138dff31fa315452b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 09:54:00 +0000 Subject: [PATCH 089/108] cargo-watch: 7.8.1 -> 8.0.0 --- pkgs/development/tools/rust/cargo-watch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index c7cdf92dcd83..f2d5793f767e 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.8.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g6k/7jo8pvTn5snU05uSGzprNMt8/x+bJsLb/y0jHRg="; + sha256 = "sha256-3IgzMUCkcKUkhTb/ZNRONdvB6Ci0OBB1dcjtc65U8xE="; }; - cargoSha256 = "sha256-pfjWTkDw4D7eMADkPX01vapka8I6o0ZvkNjQt5X2pUk="; + cargoSha256 = "sha256-Xp/pxPKs41TXO/EUY5x8Bha7NUioMabbb73///fFr6U="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; From 7d0285d139bac124364e59687771cf523d01329c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 10:29:45 +0000 Subject: [PATCH 090/108] crawl: 0.26.1 -> 0.27.0 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 11ac23fcef3a..6595f1ee0dc5 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-lh0lCMZRH+c6jSHjLFDU3wjy6Oyp59ZcPaqg5PWVrkk="; + sha256 = "sha256-TTdzFWoWn9OfxosEsxUjmDtPmtHukpT0J/0y4kUvBvo="; }; # Patch hard-coded paths and remove force library builds From 6eef84d697b1e07c85892241e53c746a9ecc6bf5 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 31 Jul 2021 12:33:43 +0200 Subject: [PATCH 091/108] mu: 1.6.0 -> 1.6.1 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index da7ef58f1994..b6fce962d751 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "d2REyoSbznMhqV4PNntvg8uQmU66Bsi4OwH2Gj7gQ10="; + sha256 = "7mSP1F2RxW0CEDRWbMzDRfoehrr24b11sCLM2gQFjuI="; }; postPatch = lib.optionalString (batchSize != null) '' From 682442d027e2d00085f71e46cf7e78322598d301 Mon Sep 17 00:00:00 2001 From: Yuka Date: Sat, 31 Jul 2021 12:55:43 +0200 Subject: [PATCH 092/108] tdesktop: 2.8.11 -> 2.9.0 (#132195) --- .../telegram/tdesktop/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5f023e1cc9bb..972fb1eab279 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , extra-cmake-modules , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash @@ -25,7 +25,7 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.11"; + version = "2.9.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -34,17 +34,9 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "020ycgb77vx7rza590i3csrvq1zgm15rvpxqqcp0xkb4yh71i3hb"; + sha256 = "0964as7rkjq1px6z15z6kmkiz4zw69wmm3namwn940bsja123qls"; }; - patches = [(fetchpatch { - # ref: https://github.com/desktop-app/lib_webview/pull/9 - url = "https://github.com/desktop-app/lib_webview/commit/75e924934eee8624020befbef1f3cb5b865d3b86.patch"; - sha256 = "sha256-rN4FVK4KT+xNf9IVdcpbxMqT0+t3SINJPRRQPyMiDP0="; - stripLen = 1; - extraPrefix = "Telegram/lib_webview/"; - })]; - postPatch = '' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' From a2e6029290a87bdfdca4c1f0af6a267263e09c5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 11:03:16 +0000 Subject: [PATCH 093/108] docker-buildx: 0.6.0 -> 0.6.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 020e22db6019..4cdb253505b0 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.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU="; + sha256 = "sha256-BzF0SvXMFlQ/pvwNJ04C4hx3xc0T3E4zeAlSctPKfcE="; }; vendorSha256 = null; From ce28b01ea34c346d697348b6082c90c0b9613ede Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 31 Jul 2021 12:55:16 +0200 Subject: [PATCH 094/108] maintainers/haskell/package-list: Only read one line from password-cmd --- .../scripts/haskell/upload-nixos-package-list-to-hackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index c49ea68fbfbc..9e243052f25a 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -12,10 +12,10 @@ # ~/.cabal/config file. # e.g. username: maralorn -# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression.) +# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.) # Those fields are specified under `upload` on the `cabal` man page. package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //") password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //") -curl -u "$username:$($password_command)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv From 75524662af31ac0f513edafddcba8d32f6ccfb98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 13:53:12 +0000 Subject: [PATCH 095/108] hugo: 0.86.0 -> 0.86.1 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index e8c927b79a6f..42d3985244b1 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.86.0"; + version = "0.86.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ELOQT4zLjtsLKyAsfSIUGGW4wH5+kpw33Fw5hCPR50="; + sha256 = "sha256-2tCR4iabTLD9SynXjUM7+zNsFCCAa/n88brPnZ1DQ0Q="; }; vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk="; From 501ec4cf5d9eb49ded40fe05ec33ad01f6fcffc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 14:02:22 +0000 Subject: [PATCH 096/108] hydroxide: 0.2.19 -> 0.2.20 --- pkgs/applications/networking/hydroxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index a8c6e87ab20b..451449420bdf 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FKZdsFEUlXk0w11v7Y6sKiu4bOjmau2yAifcTpN0J+U="; + sha256 = "sha256-VTUpiuSsI795XDSxJJvLQlVNPLiekHyKcCazRBky9nU="; }; - vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY="; + vendorSha256 = "sha256-AuZnHpJ1Xel/L9dG3ATdXnoTeUxtieah/ea+0svw3oA="; doCheck = false; From 45547332afaa948ec9a47ced6f393762779dcd2d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Jul 2021 16:17:17 +0200 Subject: [PATCH 097/108] python3Packages.pytesseract: 0.3.7 -> 0.3.8 ChangeLog: https://github.com/madmaze/pytesseract/releases/tag/v0.3.8 --- pkgs/development/python-modules/pytesseract/default.nix | 4 ++-- .../python-modules/pytesseract/tesseract-binary.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index a7af2d1db032..6fcb9f97d32c 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "4ecfc898d00a70fcc38d2bce729de1597c67e7bc5d2fa26094714c9f5b573645"; + sha256 = "sha256-YUigHkN1dghi6PVupxjiK10TsoFFTfRuqNrJgHeT/Fo="; }; patches = [ diff --git a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch index 27b042bbaa52..78dfacb94ab3 100644 --- a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch +++ b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch @@ -1,7 +1,7 @@ -diff --git a/src/pytesseract.py b/src/pytesseract.py +diff --git a/pytesseract/pytesseract.py b/pytesseract/pytesseract.py index 132f59b..f161e5c 100755 ---- a/src/pytesseract.py -+++ b/src/pytesseract.py +--- a/pytesseract/pytesseract.py ++++ b/pytesseract/pytesseract.py @@ -23,7 +23,7 @@ except ImportError: import Image From 2bace832c4fc2b28215fd10b4664e9ba536c56d1 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Jul 2021 10:23:56 -0400 Subject: [PATCH 098/108] buildbot: 3.2.0 -> 3.3.0 --- .../python-modules/buildbot/default.nix | 19 +++---------------- .../python-modules/buildbot/pkg.nix | 2 +- .../python-modules/buildbot/plugins.nix | 10 +++++----- .../python-modules/buildbot/worker.nix | 2 +- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index de34be979f36..a2471e45cfa4 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k , python, twisted, jinja2, zope_interface, sqlalchemy , sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq , txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial @@ -26,11 +26,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ji/1anphYaGoP0kaOpArKDKPe9YUFTU1Zd9O4g6V9OA="; + sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE="; }; propagatedBuildInputs = [ @@ -78,19 +78,6 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch - # Fix compatibility with SQLAlchemy 1.4 - (fetchpatch { - url = "https://github.com/buildbot/buildbot/pull/6156.patch"; - sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my"; - stripLen = 1; - excludes = [ - ".bbtravis.yml" - "buildbot/test/unit/db/test_enginestrategy.py" - "buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py" - "requirements-ci.txt" - "requirements-cidb.txt" - ]; - }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 94cca457b9c8..45254ca83f8a 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-6PpR/zDy1ZZWFN2qzIeNWk9kmDpecZH40IEMoqyprnk="; + sha256 = "sha256-PVmDJN3/PMsvZrrwSNaUUQLPkOMWO6edIEEfZSwspTs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index f01967337a1d..12c4146b5132 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-6dG8yCHmysQELodaPXOrI8J8Uc1/7YHwplnvYZyeuo0="; + sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-bjDVA5478pHtBXIVPSZJURRqU9EVFVXG/933oDQZCpk="; + sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-I31sryOUW6JVsWpkgvQe9ICyoDZUVewRPtG0JdIVJo8="; + sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-FWi67S3wXuISLP0f4VzXisEWXN60xlgU4I946QkX9Eo="; + sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-6kXB+hu75V59KMo7tIHbE2Wvig6raTbPc7vYVVl/1y0="; + sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index f873eeee98a9..a31ba928bb98 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-pIXdqahCWJGRiXKDyih2UjGYdyzwhxnYgMwCzdQfYUo="; + sha256 = "sha256-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU="; }; propagatedBuildInputs = [ twisted future ]; From 293ff939461b5b7fd0eca0d057645d4db4acbe12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Jul 2021 14:44:37 +0000 Subject: [PATCH 099/108] keycloak: 14.0.0 -> 15.0.0 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 8cfefcf9796d..61d5cd26b4b4 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "14.0.0"; + version = "15.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-NH2uNiYZZrEYE5DG2kDXzLN7/GgXR8IfBqRb6EoKA9s="; + sha256 = "sha256-DOqqf4RWA2eo4m60tzs4HgKktci0fIV7CiJekDcjCXE="; }; nativeBuildInputs = [ makeWrapper ]; From 9b0a99f64c9e61b6176238d9c3eabdcfa61723db Mon Sep 17 00:00:00 2001 From: brprice Date: Sat, 31 Jul 2021 14:54:37 +0000 Subject: [PATCH 100/108] nixos-rebuild: print run-*-vm location with bootloader (#130385) Previously when doing a nixos-rebuild build-vm we see a message saying how to run the VM, but with nixos-rebuild build-vm-with-bootloader we did not. We now show it in both cases. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 6d082cb100e2..b0363fa7a7cc 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -520,7 +520,7 @@ if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = d fi -if [ "$action" = build-vm ]; then +if [ "$action" = build-vm -o "$action" = build-vm-with-bootloader ]; then cat >&2 < Date: Sat, 31 Jul 2021 15:19:00 +0000 Subject: [PATCH 101/108] nixos/tt-rss: fix eval --- nixos/modules/services/web-apps/tt-rss.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 7a6dc5f0a4ef..ed13845915c4 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -568,7 +568,7 @@ let systemd.services = { phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { - restartTriggers = [ tt-rss-config tt-rss ]; + restartTriggers = [ tt-rss-config pkgs.tt-rss ]; }; tt-rss = { From e17c7def698a6efede9fc09e7d6f70e4c467f25c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Jul 2021 18:05:27 +0200 Subject: [PATCH 102/108] diffoscope: fix build, 178 -> 179 ChangeLog: https://diffoscope.org/news/diffoscope-179-released/ Also fixed the build by disabling a failing test because of `file-v5.40`[1][2]. [1] Upstream bug: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 [2] Similar to: https://github.com/archlinux/svntogit-community/commit/3f906acae3d3c276bae7ed65727052017be84938 --- pkgs/tools/misc/diffoscope/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 629c8accfb9e..d804b5200d2c 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "178"; + version = "179"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM="; + sha256 = "sha256-SIFLWlmENuhgwG0YbIDTWG6uCHEfuoc0IMVz4cp5NX4="; }; outputs = [ "out" "man" ]; @@ -66,6 +66,10 @@ python3Packages.buildPythonApplication rec { "test_diff_meta" "test_diff_meta2" "test_obj_no_differences" + + # Failing because of file-v5.40 has a slightly different output. + # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 + "test_text_proper_indentation" ]; meta = with lib; { From 2f94991628ea21ff82227c79aac8a57582c9576d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 1 Aug 2021 00:01:50 +0700 Subject: [PATCH 103/108] treewide: fix redirected URLs Using the script in maintainers/scripts/update-redirected-urls.sh --- pkgs/applications/audio/friture/default.nix | 2 +- pkgs/applications/audio/spectmorph/default.nix | 2 +- pkgs/applications/editors/ne/default.nix | 2 +- pkgs/applications/graphics/scantailor/default.nix | 2 +- pkgs/applications/misc/audio/wavesurfer/default.nix | 2 +- pkgs/applications/misc/mkgmap/default.nix | 4 ++-- pkgs/applications/misc/mkgmap/splitter/default.nix | 4 ++-- pkgs/applications/misc/mkgmap/splitter/testinputs.nix | 2 +- pkgs/applications/misc/mkgmap/testinputs.nix | 2 +- pkgs/applications/networking/cluster/hadoop/default.nix | 2 +- pkgs/applications/office/osmo/default.nix | 2 +- pkgs/applications/science/logic/verifast/default.nix | 2 +- pkgs/applications/science/math/nauty/default.nix | 6 +++--- pkgs/applications/virtualization/bochs/default.nix | 2 +- pkgs/data/fonts/terminus-font-ttf/default.nix | 4 ++-- pkgs/development/compilers/terra/default.nix | 2 +- pkgs/development/interpreters/io/default.nix | 2 +- pkgs/development/libraries/libnetfilter_acct/default.nix | 2 +- .../development/libraries/libnetfilter_cthelper/default.nix | 2 +- pkgs/development/libraries/libnetfilter_queue/default.nix | 2 +- pkgs/development/libraries/libnfnetlink/default.nix | 2 +- pkgs/development/libraries/librdf/raptor.nix | 2 +- pkgs/development/libraries/librdf/raptor2.nix | 2 +- pkgs/development/libraries/librdf/rasqal.nix | 2 +- pkgs/development/libraries/librdf/redland.nix | 2 +- pkgs/development/libraries/libroxml/default.nix | 2 +- pkgs/development/libraries/libvmi/default.nix | 2 +- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- pkgs/development/libraries/raylib/default.nix | 2 +- pkgs/development/libraries/snack/default.nix | 2 +- pkgs/development/node-packages/node-packages.nix | 6 +++--- pkgs/development/ocaml-modules/cudf/default.nix | 2 +- pkgs/development/ocaml-modules/dose3/default.nix | 2 +- pkgs/development/python-modules/autologging/default.nix | 2 +- pkgs/development/python-modules/pweave/default.nix | 2 +- pkgs/development/python-modules/pyfantom/default.nix | 2 +- pkgs/development/python-modules/pyqtgraph/default.nix | 2 +- pkgs/development/python-modules/python-uinput/default.nix | 2 +- pkgs/development/python-modules/vispy/default.nix | 2 +- .../python-modules/xstatic-jquery-file-upload/default.nix | 2 +- pkgs/development/tools/ammonite/default.nix | 2 +- pkgs/development/tools/lattice-diamond/default.nix | 2 +- pkgs/development/tools/ocaml/camlidl/default.nix | 2 +- pkgs/development/web/remarkjs/node-packages.nix | 2 +- pkgs/games/freedroidrpg/default.nix | 2 +- .../linux/firmware/broadcom-bt-firmware/default.nix | 2 +- pkgs/os-specific/linux/ipset/default.nix | 4 ++-- pkgs/os-specific/windows/jom/default.nix | 2 +- pkgs/servers/monitoring/munin/default.nix | 4 ++-- pkgs/servers/nosql/aerospike/default.nix | 2 +- pkgs/tools/misc/kermit/default.nix | 2 +- pkgs/tools/package-management/holo-build/default.nix | 2 +- pkgs/tools/text/jumanpp/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 6 +++--- pkgs/tools/video/vnc2flv/default.nix | 2 +- 55 files changed, 66 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index e4bd79a08e31..99ce726ca177 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -38,7 +38,7 @@ in py.buildPythonApplication rec { meta = with lib; { description = "A real-time audio analyzer"; - homepage = "http://friture.org/"; + homepage = "https://friture.org/"; license = licenses.gpl3; platforms = platforms.linux; # fails on Darwin maintainers = [ maintainers.laikq ]; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 6292d771a512..9b549e02f77d 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "spectmorph"; version = "0.5.2"; src = fetchurl { - url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; + url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f"; }; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index fde6542f1605..172b30dbb0ff 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The nice editor"; - homepage = "http://ne.di.unimi.it/"; + homepage = "https://ne.di.unimi.it/"; longDescription = '' ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any UN*X machine. ne is easy to use for the beginner, diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 291825770ac7..898cc3336a55 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ qt4 libjpeg libtiff boost ]; meta = { - homepage = "http://scantailor.org/"; + homepage = "https://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index b7e738cfc125..9c8a99a59347 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; - homepage = "http://www.speech.kth.se/wavesurfer/"; + homepage = "https://www.speech.kth.se/wavesurfer/"; license = lib.licenses.bsd0; }; } diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index f82881eb5bdf..d6fa24c19baf 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "4608"; src = fetchurl { - url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; + url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; sha256 = "uj/iZZHML4nqEKdFBQSDdegkalZFJdzEE4xQrOruEp0="; }; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; homepage = "http://www.mkgmap.org.uk"; - downloadPage = "http://www.mkgmap.org.uk/download/mkgmap.html"; + downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index c78d81771caa..9e034b58110d 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "598"; src = fetchurl { - url = "http://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; + url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M="; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for splitting OpenStreetMap maps into tiles"; homepage = "http://www.mkgmap.org.uk"; - downloadPage = "http://www.mkgmap.org.uk/download/splitter.html"; + downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix index ab81b07ed8dd..0d73f9710291 100644 --- a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix +++ b/pkgs/applications/misc/mkgmap/splitter/testinputs.nix @@ -2,7 +2,7 @@ let fetchTestInput = { res, sha256 }: fetchurl { inherit sha256; - url = "http://www.mkgmap.org.uk/testinput/${res}"; + url = "https://www.mkgmap.org.uk/testinput/${res}"; name = builtins.replaceStrings [ "/" ] [ "__" ] res; }; in diff --git a/pkgs/applications/misc/mkgmap/testinputs.nix b/pkgs/applications/misc/mkgmap/testinputs.nix index 0c4516190e00..93c858a38895 100644 --- a/pkgs/applications/misc/mkgmap/testinputs.nix +++ b/pkgs/applications/misc/mkgmap/testinputs.nix @@ -2,7 +2,7 @@ let fetchTestInput = { res, sha256 }: fetchurl { inherit sha256; - url = "http://www.mkgmap.org.uk/testinput/${res}"; + url = "https://www.mkgmap.org.uk/testinput/${res}"; name = builtins.replaceStrings [ "/" ] [ "__" ] res; }; in diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index ef93b5cbdb07..589ce21fe87b 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -109,7 +109,7 @@ let ''; meta = with lib; { - homepage = "http://hadoop.apache.org/"; + homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 77cc087c66b4..975305a72173 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A handy personal organizer"; - homepage = "http://clayo.org/osmo/"; + homepage = "https://clayo.org/osmo/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index e426f7b80989..a33c4941ac4f 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; - homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; + homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index a941a6334508..c435c63ab2ef 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "nauty"; version = "27r1"; src = fetchurl { - url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; + url = "https://pallini.di.uniroma1.it/nauty${version}.tar.gz"; sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn"; }; outputs = [ "out" "dev" ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # I'm not sure if the filename will remain the same for future changelog or # if it will track changes to minor releases. Lets see. Better than nothing # in any case. - changelog = "http://pallini.di.uniroma1.it/changes24-27.txt"; - homepage = "http://pallini.di.uniroma1.it/"; + changelog = "https://pallini.di.uniroma1.it/changes24-27.txt"; + homepage = "https://pallini.di.uniroma1.it/"; }; } diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index e614b3da2b0c..002848380c2b 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://bochs.sourceforge.io/"; + homepage = "https://bochs.sourceforge.io/"; description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 1a65798891f5..1ebf987fcd56 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "terminus-font-ttf-${version}"; - url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; postFetch = '' unzip -j $downloadedFile @@ -26,7 +26,7 @@ in fetchzip { Monospaced bitmap font designed for long work with computers (TTF version, mainly for Java applications) ''; - homepage = "http://files.ax86.net/terminus-ttf"; + homepage = "https://files.ax86.net/terminus-ttf"; license = licenses.ofl; maintainers = with maintainers; [ okasu ]; }; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 3174744fdde8..9919973de241 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A low-level counterpart to Lua"; - homepage = "http://terralang.org/"; + homepage = "https://terralang.org/"; platforms = platforms.x86_64; maintainers = with maintainers; [ jb55 seylerius thoughtpolice ]; license = licenses.mit; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 48462a333bcb..9f6ecb2516ed 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Io programming language"; - homepage = "http://iolanguage.org/"; + homepage = "https://iolanguage.org/"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 72766471d2f1..6c52d7f7b560 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; meta = with lib; { - homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; + homepage = "https://www.netfilter.org/projects/libnetfilter_acct/"; description = "Userspace library providing interface to extended accounting infrastructure"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index b8b05e57dad2..294f776192d7 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { library, you register, configure, enable and disable user-space helpers. This library is used by conntrack-tools. ''; - homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/"; + homepage = "https://www.netfilter.org/projects/libnetfilter_cthelper/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 7dafcd42223f..d1783289965e 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnfnetlink ]; meta = with lib; { - homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; + homepage = "https://www.netfilter.org/projects/libnetfilter_queue/"; description = "Userspace API to packets queued by the kernel packet filter"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 4c7b4a5cc2dd..a070d2e3af2e 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { This library is not meant as a public API for application developers. It is only used by other netfilter.org projects, like the aforementioned ones. ''; - homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html"; + homepage = "https://www.netfilter.org/projects/libnfnetlink/index.html"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 8d1b1f2a0ea4..ef755b821550 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = "http://librdf.org/raptor"; + homepage = "https://librdf.org/raptor"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index bb8aeefa102c..656558146857 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = "http://librdf.org/raptor"; + homepage = "https://librdf.org/raptor"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 88acc372f7f5..0dd5b87377f3 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; - homepage = "http://librdf.org/rasqal"; + homepage = "https://librdf.org/rasqal"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 731d1cf18684..5ac2c711104b 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C libraries that provide support for the Resource Description Framework (RDF)"; - homepage = "http://librdf.org/"; + homepage = "https://librdf.org/"; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index de1877f2ab40..39c8eab5a65b 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; }; meta = with lib; { - homepage = "http://www.libroxml.net/"; + homepage = "https://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; license = licenses.lgpl3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 9d9e47407b62..36fd026eeedd 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libvmi.com/"; + homepage = "https://libvmi.com/"; description = "A C library for virtual machine introspection"; longDescription = '' LibVMI is a C library with Python bindings that makes it easy to monitor the low-level diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index ed93d86a1979..5856e0b84b5c 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -229,7 +229,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { - homepage = "http://qt-project.org/"; + homepage = "https://qt-project.org/"; description = "A cross-platform application framework for C++"; license = lib.licenses.lgpl21Plus; # or gpl3 maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ]; diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 836bafd4280f..9843141fc008 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and easy-to-use library to enjoy videogames programming"; - homepage = "http://www.raylib.com/"; + homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 8750bdf2ac6c..8c97d0224c66 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "The Snack Sound Toolkit (Tcl)"; - homepage = "http://www.speech.kth.se/snack/"; + homepage = "https://www.speech.kth.se/snack/"; license = lib.licenses.gpl2; broken = true; }; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 45cc5cdeac62..3acc583f8a0e 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -89128,7 +89128,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = "http://github.com/remy/inliner"; + homepage = "https://github.com/remy/inliner"; license = "MIT"; }; production = true; @@ -90816,7 +90816,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = "https://jshint.com/"; license = "MIT"; }; production = true; @@ -103950,7 +103950,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "http://pm2.keymetrics.io/"; + homepage = "https://pm2.keymetrics.io/"; license = "AGPL-3.0"; }; production = true; diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index d2090cda6769..22de0e690c8b 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A library for CUDF format"; - homepage = "http://www.mancoosi.org/cudf/"; + homepage = "https://www.mancoosi.org/cudf/"; downloadPage = "https://gforge.inria.fr/projects/cudf/"; license = licenses.lgpl3; maintainers = with maintainers; [ superherointj ]; diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 3397527fd63f..733427cdb914 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -46,7 +46,7 @@ buildDunePackage rec { meta = with lib; { description = "Dose library (part of Mancoosi tools)"; downloadPage = "https://gitlab.com/irill/dose3/"; - homepage = "http://www.mancoosi.org/software/"; + homepage = "https://www.mancoosi.org/software/"; license = licenses.lgpl3Plus; longDescription = '' The dose suite provides libraries for handling package meta-data, and various tools for analyzing package relationships in a large package repository. diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index fdd935303d02..1b3a7d652185 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "http://ninthtest.info/python-autologging/"; + homepage = "https://ninthtest.info/python-autologging/"; description = "Easier logging and tracing for Python classes"; license = licenses.mit; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index 1b8e1a3cc6f1..b97d51496521 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; - homepage = "http://mpastell.com/pweave/"; + homepage = "https://mpastell.com/pweave/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index d7c77e763e76..d27cccfbd8c0 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { doCheck = false; meta = with lib; { - homepage = "http://pyfantom.ni.fr.eu.org/"; + homepage = "https://pyfantom.ni.fr.eu.org/"; description = "Wrapper for the LEGO Mindstorms Fantom Driver"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 54a136d5dcd4..49401bf1f843 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Scientific Graphics and GUI Library for Python"; - homepage = "http://www.pyqtgraph.org/"; + homepage = "https://www.pyqtgraph.org/"; changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 8d82ffb6b3b9..efb1288943af 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic API to Linux uinput kernel module"; - homepage = "http://tjjr.fi/sw/python-uinput/"; + homepage = "https://tjjr.fi/sw/python-uinput/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 5524258a7e82..849f25ef0df3 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "vispy" ]; meta = with lib; { - homepage = "http://vispy.org/index.html"; + homepage = "https://vispy.org/index.html"; description = "Interactive scientific visualization in Python"; license = licenses.bsd3; maintainers = with maintainers; [ goertzenator ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index 0316a8493762..ce3f8c76dfa6 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xstatic-jquery ]; meta = with lib;{ - homepage = "http://plugins.jquery.com/project/jQuery-File-Upload"; + homepage = "https://plugins.jquery.com/project/jQuery-File-Upload"; description = "jquery-file-upload packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index ffd3b78cedd7..ab1ea2a82a33 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -66,7 +66,7 @@ let with a lot of ergonomic improvements and configurability that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. ''; - homepage = "http://www.lihaoyi.com/Ammonite/"; + homepage = "https://www.lihaoyi.com/Ammonite/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.nequissimus ]; diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index ce3525420613..e8bc4c1b1be5 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation { for cost- sensitive, low-power Lattice FPGA architectures. It is the next-generation replacement for ispLEVER. ''; - homepage = "http://www.latticesemi.com/latticediamond"; + homepage = "https://www.latticesemi.com/latticediamond"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index a464996ff381..36a1c7f755e1 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -2,7 +2,7 @@ let pname = "camlidl"; - webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/"; + webpage = "https://caml.inria.fr/pub/old_caml_site/camlidl/"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 5f5d3576b761..9add677c2488 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -3674,7 +3674,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = "https://jshint.com/"; license = "MIT"; }; production = true; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 53b008d11dde..e0582c524eca 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { ''; - homepage = "http://www.freedroid.org/"; + homepage = "https://www.freedroid.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index 5118d0a0b9bf..a0985cad0dbe 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; - homepage = "http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth"; + homepage = "https://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index dd9fadfd02f0..7b4322657e54 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "7.14"; src = fetchurl { - url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; + url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA="; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-kmod=no" ]; meta = with lib; { - homepage = "http://ipset.netfilter.org/"; + homepage = "https://ipset.netfilter.org/"; description = "Administration tool for IP sets"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index a2fbdde95aa9..f3a953576ec9 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://qt-project.org/wiki/jom"; + homepage = "https://qt-project.org/wiki/jom"; description = "Clone of nmake supporting multiple independent commands in parallel"; license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index a86dd8471ce6..ac9b015480ee 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # needs to find a local perl module during build PERL_USE_UNSAFE_INC = "1"; - # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1 + # TODO: tests are failing https://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass doCheck = false; @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { interface. Munin can help analyze resource trends and 'what just happened to kill our performance?' problems. ''; - homepage = "http://munin-monitoring.org/"; + homepage = "https://munin-monitoring.org/"; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 33347a73a20c..db7b39ac5c7a 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flash-optimized, in-memory, NoSQL database"; - homepage = "http://aerospike.com/"; + homepage = "https://aerospike.com/"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index 1a561f0bef47..8af0674f54bf 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://www.kermitproject.org/ck90.html"; + homepage = "https://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix index 8f88ae08762b..20e3b555fd2f 100644 --- a/pkgs/tools/package-management/holo-build/default.nix +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -52,7 +52,7 @@ buildGoModule rec { meta = with lib; { description = "Cross-distribution system package compiler"; - homepage = "http://holocm.org/"; + homepage = "https://holocm.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 5578ed417a27..5fb5ec88d679 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { plausibility of word sequences by using a recurrent neural network language model (RNNLM). ''; - homepage = "http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; + homepage = "https://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index e2f5952077f3..7cfb2d2d6a4b 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "${appname}-${version}"; src = fetchzip { - url = "http://getpopfile.org/downloads/${appname}-${version}.zip"; + url = "https://getpopfile.org/downloads/${appname}-${version}.zip"; sha256 = "0gcib9j7zxk8r2vb5dbdz836djnyfza36vi8215nxcdfx1xc7l63"; stripRoot = false; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = (with perlPackages; [ ## These are all taken from the popfile documentation as applicable to Linux - ## http://getpopfile.org/docs/howtos:allplatformsrequireperl + ## https://getpopfile.org/docs/howtos:allplatformsrequireperl perl DBI DBDSQLite @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Should work on macOS, but havent tested it. # Windows support is more complicated. - # http://getpopfile.org/docs/faq:systemrequirements + # https://getpopfile.org/docs/faq:systemrequirements platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 88ec2f22b89b..fdaf2ee27466 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; - homepage = "http://www.unixuser.org/~euske/python/vnc2flv/"; + homepage = "https://www.unixuser.org/~euske/python/vnc2flv/"; license = lib.licenses.mit; }; } From cbcee79dad077676c1521a39995eacd3f83f58d4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 31 Jul 2021 20:10:55 +0300 Subject: [PATCH 104/108] kazam: switch to a maintained fork --- pkgs/applications/video/kazam/default.nix | 55 ++++++++++++++--------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index f99b4930870e..4ba0fe98df05 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,24 +1,44 @@ -{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection -, gtk3, libwnck, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio -, fetchpatch }: +{ lib +, fetchFromGitHub +, substituteAll +, python3Packages +, gst_all_1 +, wrapGAppsHook +, gobject-introspection +, gtk3 +, libwnck +, keybinder3 +, intltool +, libcanberra-gtk3 +, libappindicator-gtk3 +, libpulseaudio +, libgudev +}: -python3.pkgs.buildPythonApplication rec { - name = "kazam-${version}"; - version = "1.4.5"; - namePrefix = ""; +python3Packages.buildPythonApplication rec { + pname = "kazam"; + version = "unstable-2021-06-22"; - src = fetchurl { - url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; - sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f"; + src = fetchFromGitHub { + owner = "niknah"; + repo = "kazam"; + rev = "13f6ce124e5234348f56358b9134a87121f3438c"; + sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah"; }; - nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection python3Packages.distutils_extra intltool wrapGAppsHook ]; buildInputs = [ - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck - keybinder3 libappindicator-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gtk3 + libwnck + keybinder3 + libappindicator-gtk3 + libgudev ]; - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; + propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ]; # workaround https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; @@ -30,11 +50,6 @@ python3.pkgs.buildPythonApplication rec { libcanberra = libcanberra-gtk3; inherit libpulseaudio; }) - # https://github.com/hzbd/kazam/pull/21 - (fetchpatch { - url = "https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch"; - sha256 = "1q5dpmdm6cvgzw8xa7bwclnqa05xc73ja1lszwmwv5glyik0fk4z"; - }) ]; # no tests @@ -42,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A screencasting program created with design in mind"; - homepage = "https://code.launchpad.net/kazam"; + homepage = "https://github.com/niknah/kazam"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; From 8921779f0af1422ea1d7cf23d47f8d688b21d193 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Jul 2021 13:29:39 +0200 Subject: [PATCH 105/108] mtools: 4.0.33 -> 4.0.34 Fix bug for recursive use, see release announcement: https://lists.gnu.org/archive/html/info-gnu/2021-07/msg00010.html --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index f82b008e41d0..d6fa4c41643c 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.33"; + version = "4.0.34"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w"; + sha256 = "1aqc6qncpd8dlndwk05vgrnjh7pa151n6hpfsi059zhg3gml79dd"; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; From 01c5b01858ff6870ec138c5fefdfaa13e9f6725e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 31 Jul 2021 19:21:17 +0300 Subject: [PATCH 106/108] udocker: 1.1.3 -> 1.3.1 and make usable --- pkgs/tools/virtualization/udocker/default.nix | 49 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index fb067de82125..6584c5bee5c6 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -1,35 +1,42 @@ -{ lib, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: +{ lib +, fetchFromGitHub +, singularity +, python3Packages +}: -buildPythonApplication rec { - - version = "1.1.3"; +python3Packages.buildPythonApplication rec { pname = "udocker"; + version = "1.3.1"; src = fetchFromGitHub { owner = "indigo-dc"; - repo = "udocker" ; + repo = "udocker"; rev = "v${version}"; - sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z"; + sha256 = "0dfsjgidsnah8nrclrq10yz3ja859123z81kq4zdifbrhnrn5a2x"; }; - buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ]; + # crun patchelf proot runc fakechroot + # are download statistically linked during runtime + buildInputs = [ + singularity + ] ++ (with python3Packages; [ + pytest-runner + pycurl + ]); - postPatch = '' - substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH - substituteInPlace udocker.py --replace /bin/chmod ${coreutils}/bin/chmod - substituteInPlace udocker.py --replace /bin/rm ${coreutils}/bin/rm - substituteInPlace tests/unit_tests.py --replace /bin/rm ${coreutils}/bin/rm - substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False" - ''; - - checkInputs = [ - nose - mock + checkInputs = with python3Packages; [ + pytestCheckHook ]; - checkPhase = '' - NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py - ''; + disabledTests = [ + "test_05__get_volume_bindings" + ]; + + disabledTestPaths = [ + # Network + "tests/unit/test_curl.py" + "tests/unit/test_dockerioapi.py" + ]; meta = with lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3e5fafb151..b986fa71e37e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27668,7 +27668,7 @@ in umurmur = callPackage ../applications/networking/umurmur { }; - udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; + udocker = callPackage ../tools/virtualization/udocker { }; uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; From a7dbb32253ed33b1c8fba5eb0ad10025cbe3f7f8 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Jul 2021 18:19:14 -0400 Subject: [PATCH 107/108] findutils: remove upstreamed patch The patch for 32-bit ARM was included in 4.8.0, and therefore needs to be removed. --- pkgs/tools/misc/findutils/default.nix | 5 +-- .../misc/findutils/fix-gnulib-tests-arm.patch | 45 ------------------- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 57839f730562..8c8b8c7b2b43 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -20,10 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${coreutils}/bin/echo";' ''; - patches = [ ./no-install-statedir.patch ] - # fix gnulib tests on 32-bit ARM. Included on findutils master. - # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + patches = [ ./no-install-statedir.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort diff --git a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch b/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch deleted file mode 100644 index 39bd29f8439e..000000000000 --- a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch +++ /dev/null @@ -1,45 +0,0 @@ ->From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 27 Aug 2020 17:52:58 -0700 -Subject: [PATCH] perror, strerror_r: remove unportable tests - -Problem reported by Florian Weimer in: -https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html -* tests/test-perror2.c (main): -* tests/test-strerror_r.c (main): Omit unportable tests. ---- - tests/test-perror2.c | 3 --- - tests/test-strerror_r.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c -index 1d14eda7b..c6214dd25 100644 ---- a/gnulib-tests/test-perror2.c -+++ b/gnulib-tests/test-perror2.c -@@ -79,9 +79,6 @@ main (void) - errno = -5; - perror (""); - ASSERT (!ferror (stderr)); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); -diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c -index b11d6fd9f..c1dbcf837 100644 ---- a/gnulib-tests/test-strerror_r.c -+++ b/gnulib-tests/test-strerror_r.c -@@ -165,9 +165,6 @@ main (void) - - strerror_r (EACCES, buf, sizeof buf); - strerror_r (-5, buf, sizeof buf); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); --- -2.17.1 - From 71394c34478e5e53a8839980481e3eaea39254cd Mon Sep 17 00:00:00 2001 From: David Date: Sat, 31 Jul 2021 17:36:06 +0200 Subject: [PATCH 108/108] erlang-ls: skip tests on darwin --- pkgs/development/beam-modules/erlang-ls/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 7635e46237b4..f2ba9a1815d8 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: +{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }: let version = "0.17.0"; owner = "erlang-ls"; @@ -32,7 +32,8 @@ rebar3Relx { HOME=. rebar3 ct HOME=. rebar3 proper --constraint_tries 100 ''; - doCheck = true; + # tests seem to be a bit flaky on darwin, skip them for now + doCheck = !stdenv.isDarwin; installPhase = '' mkdir -p $out/bin cp _build/default/bin/erlang_ls $out/bin/