From 6fedeec0bb415e42078184ab288bf8ad93ea8f23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Feb 2021 07:15:58 +0000
Subject: [PATCH 01/33] python37Packages.django-cache-url: 3.1.2 -> 3.2.2
---
pkgs/development/python-modules/django-cache-url/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix
index 6487e276232..87cdc9f1d60 100644
--- a/pkgs/development/python-modules/django-cache-url/default.nix
+++ b/pkgs/development/python-modules/django-cache-url/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "3.1.2";
+ version = "3.2.2";
pname = "django-cache-url";
src = fetchPypi {
inherit pname version;
- sha256 = "d0ee0d6c5daab92787bff47a4a6f5a6cf97c3c80d81a990820b2af16e12ad65a";
+ sha256 = "419b1667fe654a1b032073371b67d3fcfbe2a6392337c0e5e6c4ec741a6342a5";
};
checkInputs = [ pytest ];
From 0adfe0f1084cc4900831277c527ee8260baa21e8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 5 Feb 2021 12:35:00 +0000
Subject: [PATCH 02/33] picard-tools: 2.24.1 -> 2.24.2
---
pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 4a3816c4d4a..8914e1f8c1b 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
- version = "2.24.1";
+ version = "2.24.2";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8=";
+ sha256 = "sha256-O+bA7vP7Y9AbFA+nEjE6O1i0DcAWVLO2Guw0ntq55s4=";
};
nativeBuildInputs = [ makeWrapper ];
From 081fab1db5b3e8f825ce744ae549d4db976e6b04 Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Sat, 6 Feb 2021 18:26:38 +0530
Subject: [PATCH 03/33] maintainers: add payas
---
maintainers/maintainer-list.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7c4a0692962..8e1182b78c4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7101,6 +7101,12 @@
githubId = 15645854;
name = "Brad Christensen";
};
+ payas = {
+ email = "relekarpayas@gmail.com";
+ github = "payasrelekar";
+ githubId = 24254289;
+ name = "Payas Relekar";
+ };
pawelpacana = {
email = "pawel.pacana@gmail.com";
github = "pawelpacana";
From 96c451192da88d1d819a74c7b5fa3c16f89f8bcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 6 Feb 2021 13:04:05 +0000
Subject: [PATCH 04/33] helmfile: 0.138.2 -> 0.138.4
---
pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index c45ff90c02d..72fcc2f9c35 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.138.2";
+ version = "0.138.4";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "sha256-hy673acO9/fJL/80VTnQS8t9jXb7y9KVSVa0Zmja4uk=";
+ sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk=";
};
- vendorSha256 = "sha256-BWWmdKrxay0Qy5z+UFFZ3we5C7wI1KUHv6qHF4TPzJE=";
+ vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to=";
doCheck = false;
From 1db5087189f892d2171b3e3c411bf0a5096c8182 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 6 Feb 2021 13:24:28 +0000
Subject: [PATCH 05/33] jdupes: 1.19.0 -> 1.19.1
---
pkgs/tools/misc/jdupes/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 4f13d0a17af..c42abee5e23 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jdupes";
- version = "1.19.0";
+ version = "1.19.1";
src = fetchFromGitHub {
owner = "jbruchon";
repo = "jdupes";
rev = "v${version}";
- sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz";
+ sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs=";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.
From 78da91d97c60d27c528693c5d95761b6a617cd02 Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Sun, 7 Feb 2021 13:21:34 +0800
Subject: [PATCH 06/33] ox: init at 0.2.7
---
pkgs/applications/editors/ox/default.nix | 23 +++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 25 insertions(+)
create mode 100644 pkgs/applications/editors/ox/default.nix
diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix
new file mode 100644
index 00000000000..aa3f22a2626
--- /dev/null
+++ b/pkgs/applications/editors/ox/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "ox";
+ version = "0.2.7";
+
+ src = fetchFromGitHub {
+ owner = "curlpipe";
+ repo = pname;
+ rev = version;
+ sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0";
+ };
+
+ cargoSha256 = "0v0a1dl9rq5qyy9xwnb59w62qr9db3y3zlmnp60wafvj70zi9zxs";
+
+ meta = with lib; {
+ description = "An independent Rust text editor that runs in your terminal";
+ homepage = "https://github.com/curlpipe/ox";
+ changelog = "https://github.com/curlpipe/ox/releases/tag/${version}";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ fortuneteller2k ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bf3fd5e4b9..d900c5ab36d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5826,6 +5826,8 @@ in
np2kai = callPackage ../misc/emulators/np2kai { };
+ ox = callPackage ../applications/editors/ox { };
+
file-rename = callPackage ../tools/filesystems/file-rename { };
kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {};
From c695ad809a52b031d5b03ed87b476d17d8604c60 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Feb 2021 10:13:38 +0100
Subject: [PATCH 07/33] python3Packages.teslajsonpy: 0.11.0 -> 0.11.5
---
.../python-modules/teslajsonpy/default.nix | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 08ef9975b22..46c8a2853b5 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -1,26 +1,37 @@
{ lib
, aiohttp
, backoff
+, beautifulsoup4
, buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, pytestCheckHook
, wrapt
}:
buildPythonPackage rec {
pname = "teslajsonpy";
- version = "0.11.0";
+ version = "0.11.5";
src = fetchFromGitHub {
owner = "zabuldon";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4=";
+ sha256 = "sha256-s0IZ1UNldYddaR3zJoYS6ey8Kjxd1fr4fOwf0gNNbow=";
};
+ patches = [
+ (fetchpatch {
+ name = "dont-use-dummpy-module-bs4.patch";
+ url = "https://github.com/zabuldon/teslajsonpy/pull/138/commits/f5a788e47d8338c8ebb06d954f802ba1ec614db3.patch";
+ sha256 = "0rws7fhxmca8d5w0bkygx8scvzah3yvb3yfhn05qmp73mn3pmcb3";
+ })
+ ];
+
propagatedBuildInputs = [
aiohttp
backoff
+ beautifulsoup4
wrapt
];
From 3343a9a1d7bed5ea14d39ba6c668c5fe1ee4f7ff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Feb 2021 10:28:08 +0100
Subject: [PATCH 08/33] python3Packages.xknx: 0.16.2 -> 0.16.3
---
pkgs/development/python-modules/xknx/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index ae9156099c8..221076fae84 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
- version = "0.16.2";
+ version = "0.16.3";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
- sha256 = "14cx54ia38ifz7c750i8jxcmnybzwh03ds6hinlwhx8hd2cx9knj";
+ sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8=";
};
propagatedBuildInputs = [
From 5e862d592a8c7ab33ba00afd86fbdaf34bac7dae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Feb 2021 11:08:20 +0100
Subject: [PATCH 09/33] python3Packages.vsure: 1.6.1 -> 1.7.2
---
pkgs/development/python-modules/vsure/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix
index 578578a21b1..40b1b328f16 100644
--- a/pkgs/development/python-modules/vsure/default.nix
+++ b/pkgs/development/python-modules/vsure/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "vsure";
- version = "1.6.1";
+ version = "1.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1lsr0wl1dwbzpn68ww348yk6v42bw89nrghz5gjsimrr428zw6qn";
+ sha256 = "sha256-EFat1sewh0Y9PHs08Grlk2RparA47GqkUv/WJ3J2494=";
};
propagatedBuildInputs = [ requests ];
From ab17d2143fc8e895f007ea0f9d3519fbd2611e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Sun, 7 Feb 2021 12:17:34 +0100
Subject: [PATCH 10/33] jitsi-meet-electron: 2.3.1 -> 2.4.2
---
.../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 7cb614f1d41..feffbe312d5 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
@@ -2,19 +2,19 @@
, fetchurl
, appimageTools
, makeWrapper
-, electron_9
+, electron_10
}:
let
- electron = electron_9;
+ electron = electron_10;
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
- version = "2.3.1";
+ version = "2.4.2";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
- sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x";
+ sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p";
name = "${pname}-${version}.AppImage";
};
From c53ae071ba242a7b16ab6560c5cf2f504b0de3b6 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sun, 7 Feb 2021 12:39:45 +0100
Subject: [PATCH 11/33] reckon: 0.6.0 -> 0.7.1
Particularly nice improvements:
* [fail on unknown account](https://github.com/cantino/reckon/pull/102)
in interactive mode
* [use - to read from stdin](https://github.com/cantino/reckon/pull/98)
---
pkgs/tools/text/reckon/Gemfile.lock | 4 ++--
pkgs/tools/text/reckon/default.nix | 2 ++
pkgs/tools/text/reckon/gemset.nix | 10 ++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock
index 6c3ce51c6ac..b1bfe4aaa8b 100644
--- a/pkgs/tools/text/reckon/Gemfile.lock
+++ b/pkgs/tools/text/reckon/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
chronic (0.10.2)
highline (2.0.3)
rchardet (1.8.0)
- reckon (0.6.0)
+ reckon (0.7.1)
chronic (>= 0.3.0)
highline (>= 1.5.2)
rchardet (>= 1.8.0)
@@ -16,4 +16,4 @@ DEPENDENCIES
reckon
BUNDLED WITH
- 2.1.4
+ 1.17.2
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index 261149229b6..bbefa94637d 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -15,8 +15,10 @@ stdenv.mkDerivation rec {
gemdir = ./.;
};
in ''
+ runHook preInstall
mkdir -p $out/bin
makeWrapper ${env}/bin/reckon $out/bin/reckon
+ runHook postInstall
'';
passthru.updateScript = bundlerUpdateScript "reckon";
diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/tools/text/reckon/gemset.nix
index 50802ccd805..09a4e704d08 100644
--- a/pkgs/tools/text/reckon/gemset.nix
+++ b/pkgs/tools/text/reckon/gemset.nix
@@ -1,5 +1,7 @@
{
chronic = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
@@ -11,7 +13,7 @@
groups = ["default"];
platforms = [];
source = {
- remotes = ["http://rubygems.org"];
+ remotes = ["https://rubygems.org"];
sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
type = "gem";
};
@@ -21,7 +23,7 @@
groups = ["default"];
platforms = [];
source = {
- remotes = ["http://rubygems.org"];
+ remotes = ["https://rubygems.org"];
sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";
type = "gem";
};
@@ -33,9 +35,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zkbmwx5bp2dr54bwhkn831918ijwh022rq45qg38wz2skih7izp";
+ sha256 = "0hsmzjxj1f5ma816gag1b3bdjbynhj2szgar955fcs3gbbzv4sk7";
type = "gem";
};
- version = "0.6.0";
+ version = "0.7.1";
};
}
From 99a0b479d5394578deb2e44bd0d3ee662406e3b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 7 Feb 2021 14:25:07 +0000
Subject: [PATCH 12/33] libfm: 1.3.1 -> 1.3.2
---
pkgs/development/libraries/libfm/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index dc835924125..c004ee6618b 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
name = if extraOnly
then "libfm-extra-${version}"
else "libfm-${version}";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchurl {
url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
- sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn";
+ sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";
};
nativeBuildInputs = [ vala pkg-config intltool ];
From a5cbb726c2162b387d9bb025865e471ed78941fb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 7 Feb 2021 15:46:42 +0000
Subject: [PATCH 13/33] jsoncpp: fix version in jsoncpp.pc
Without this patch, the version is blank, and so pkg-config version
constraints don't work.
See <https://github.com/open-source-parsers/jsoncpp/issues/1235>.
---
pkgs/development/libraries/jsoncpp/default.nix | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 71b0d7b9a92..b7754a186d1 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
};
+ patches = [
+ # Fix for https://github.com/open-source-parsers/jsoncpp/issues/1235.
+ (fetchpatch {
+ url = "https://github.com/open-source-parsers/jsoncpp/commit/ac2870298ed5b5a96a688d9df07461b31f83e906.patch";
+ sha256 = "02wswhiwypmf1jn3rj9q1fw164kljiv4l8h0q6wyijzr77hq4wsg";
+ })
+ ];
+
/* During darwin bootstrap, we have a cp that doesn't understand the
* --reflink=auto flag, which is used in the default unpackPhase for dirs
*/
From f30c67cc99b56f3380fe417f361fe84492ee77de Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 7 Feb 2021 05:51:31 +0100
Subject: [PATCH 14/33] firefox: patch libpci.so{,.3} path in glxtest
Crash Annotation GraphicsCriticalError: |[0][GFX1-]: glxtest: libpci missing (t=0.460635) [GFX1-]: glxtest: libpci missing
---
pkgs/applications/networking/browsers/firefox/common.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index c54d5338402..fb340ee1ace 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -8,7 +8,7 @@
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification
, libvpx_1_8
-, icu67, libpng, jemalloc, glib
+, icu67, libpng, jemalloc, glib, pciutils
, autoconf213, which, gnused, rustPackages, rustPackages_1_45
, rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4
@@ -182,6 +182,8 @@ buildStdenv.mkDerivation ({
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
+ substituteInPlace toolkit/xre/glxtest.cpp \
+ --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so'
'' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") ''
# substitute the /usr/include/ lines for the libraries that pipewire provides.
# The patch we pick from fedora only contains the generated moz.build files
From 4953d87fcb07b258561320044f96a25e0754427d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 7 Feb 2021 12:56:49 +0200
Subject: [PATCH 15/33] sundials: 5.6.1 -> 5.7.0
---
pkgs/development/libraries/sundials/default.nix | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index f8db8f3c379..3536ebd586e 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -1,7 +1,6 @@
{ lib, stdenv
, cmake
, fetchurl
-, fetchpatch
, python
, blas
, lapack
@@ -13,24 +12,15 @@
stdenv.mkDerivation rec {
pname = "sundials";
- version = "5.6.1";
+ version = "5.7.0";
outputs = [ "out" "examples" ];
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
- sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM=";
+ sha256 = "jW3QlP7Mu41uzEE0DsFqZfq6yC7UQVAj9tfBwjkOovM=";
};
- patches = [
- # Fixing an upstream regression in treating cmake prefix directories:
- # https://github.com/LLNL/sundials/pull/58
- (fetchpatch {
- url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch";
- sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc=";
- })
- ];
-
nativeBuildInputs = [ cmake ];
buildInputs = [
From 6e4a887d09c765da35b6548fb084dabc6cad5a26 Mon Sep 17 00:00:00 2001
From: Joris <joris@guyonvarch.me>
Date: Sun, 7 Feb 2021 12:00:06 +0100
Subject: [PATCH 16/33] edir: init at 2.7.3
---
pkgs/tools/misc/edir/default.nix | 19 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 21 insertions(+)
create mode 100644 pkgs/tools/misc/edir/default.nix
diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix
new file mode 100644
index 00000000000..7cd621be76a
--- /dev/null
+++ b/pkgs/tools/misc/edir/default.nix
@@ -0,0 +1,19 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "edir";
+ version = "2.7.3";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp";
+ };
+
+ meta = with lib; {
+ description = "Program to rename and remove files and directories using your editor";
+ homepage = "https://github.com/bulletmark/edir";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ guyonvarch ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bf3fd5e4b9..9b3d7271170 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3738,6 +3738,8 @@ in
edid-generator = callPackage ../tools/misc/edid-generator { };
+ edir = callPackage ../tools/misc/edir { };
+
editres = callPackage ../tools/graphics/editres { };
edit = callPackage ../applications/editors/edit { };
From b0a48ee031ec766367fe8d168bd4a80bd29d71b3 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 7 Feb 2021 18:52:28 +0100
Subject: [PATCH 17/33] electrs: 0.8.6 -> 0.8.7
---
pkgs/applications/blockchains/electrs.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix
index 0b0da5913ab..b43a6edc5e5 100644
--- a/pkgs/applications/blockchains/electrs.nix
+++ b/pkgs/applications/blockchains/electrs.nix
@@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "electrs";
- version = "0.8.6";
+ version = "0.8.7";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
- sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb";
+ sha256 = "101prhxg7dr701gwm4s15maxb7cf65hf85hc7ai53b404v39vm71";
};
# needed for librocksdb-sys
nativeBuildInputs = [ llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
- cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr";
+ cargoSha256 = "12ypx0rkpbjl4awzx8ga30qhiqqd56a24q4jwlxxnfpw9ks1z252";
meta = with lib; {
description = "An efficient re-implementation of Electrum Server in Rust";
From 2f840975669faf39134e8b59e4771ae9d338fff7 Mon Sep 17 00:00:00 2001
From: Payas Relekar <relekarpayas@gmail.com>
Date: Sat, 6 Feb 2021 18:31:58 +0530
Subject: [PATCH 18/33] ht-rs: init at 0.5.0
---
pkgs/tools/networking/ht-rust/default.nix | 34 +++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 4 +++
2 files changed, 38 insertions(+)
create mode 100644 pkgs/tools/networking/ht-rust/default.nix
diff --git a/pkgs/tools/networking/ht-rust/default.nix b/pkgs/tools/networking/ht-rust/default.nix
new file mode 100644
index 00000000000..629cf4ed11e
--- /dev/null
+++ b/pkgs/tools/networking/ht-rust/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "ht-rust";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "ducaale";
+ repo = "ht";
+ rev = "v${version}";
+ sha256 = "cr/iavCRdFYwVR6Iemm1hLKqd0OFG1iDmxpQ9fiwOmU=";
+ };
+
+ cargoSha256 = "uB23/9AjPwCwf9ljE8ai7zJQZqE0SoBPzRqqBOXa9QA=";
+
+ buildInputs = [ ] ++ lib.optional stdenv.isDarwin Security;
+
+ # Symlink to avoid conflict with pre-existing ht package
+ postInstall = ''
+ ln -s $out/bin/ht $out/bin/ht-rust
+ '';
+
+ doInstallCheck = true;
+ postInstallCheck = ''
+ $out/bin/ht-rust --help > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "Yet another HTTPie clone in Rust";
+ homepage = "https://github.com/ducaale/ht";
+ license = licenses.mit;
+ maintainers = [ maintainers.payas ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65364271da..0af00c0b060 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22662,6 +22662,10 @@ in
ht = callPackage ../applications/editors/ht { };
+ ht-rust = callPackage ../tools/networking/ht-rust {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
hubstaff = callPackage ../applications/misc/hubstaff { };
hue-cli = callPackage ../tools/networking/hue-cli { };
From 89db67e734af7dcf359e10daa677c92f330ba106 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 7 Feb 2021 13:39:58 +0100
Subject: [PATCH 19/33] chromium: Update the documentation
And close #78450 because I'm maintaining Chromium for approximately one
year now and it looks like I can keep maintaining it (at least as long
as I have enough time for it). I'm also working on the documentation,
automation, and cleanups so finding a new maintainer in the future
should hopefully be easier.
---
.../networking/browsers/chromium/README.md | 36 ++++++++++++++-----
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md
index 9d23e3143c6..9576cb48628 100644
--- a/pkgs/applications/networking/browsers/chromium/README.md
+++ b/pkgs/applications/networking/browsers/chromium/README.md
@@ -1,11 +1,11 @@
# Maintainers
-- TODO: We need more maintainers:
- - https://github.com/NixOS/nixpkgs/issues/78450
- - If you just want to help out without becoming a maintainer:
- - Look for open Nixpkgs issues or PRs related to Chromium
- - Make your own PRs (but please try to make reviews as easy as possible)
-- Primary maintainer (responsible for updating Chromium): @primeos
+- Note: We could always use more contributors, testers, etc. E.g.:
+ - A dedicated maintainer for the NixOS stable channel
+ - PRs with cleanups, improvements, fixes, etc. (but please try to make reviews
+ as easy as possible)
+ - People who handle stale issues/PRs
+- Primary maintainer (responsible for all updates): @primeos
- Testers (test all stable channel updates)
- `nixos-unstable`:
- `x86_64`: @danielfullmer
@@ -13,11 +13,14 @@
- Stable channel:
- `x86_64`: @Frostman
- Other relevant packages:
- - `chromiumBeta` and `chromiumDev`: For testing purposes (not build on Hydra)
+ - `chromiumBeta` and `chromiumDev`: For testing purposes only (not build on
+ Hydra). We use these channels for testing and to fix build errors in advance
+ so that `chromium` updates are trivial and can be merged fast.
- `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via
Chromium's `upstream-info.json`
- - `ungoogled-chromium`: Based on `chromium` (the expressions are regularly
- copied over and patched accordingly)
+ - `ungoogled-chromium`: @squalus
+ - `chromedriver`: Updated via Chromium's `upstream-info.json` and not built
+ from source.
# Upstream links
@@ -36,6 +39,11 @@ update `upstream-info.json`. After updates it is important to test at least
`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
reuses `upstream-info.json`).
+Note: The source tarball is often only available a few hours after the release
+was announced. The CI/CD status can be tracked here:
+- https://ci.chromium.org/p/infra/builders/cron/publish_tarball
+- https://ci.chromium.org/p/infra/builders/cron/publish_tarball_dispatcher
+
To run all automated NixOS VM tests for Chromium, ungoogled-chromium,
and Google Chrome (not recommended, currently 6x tests!):
```
@@ -79,3 +87,13 @@ that a new major release of LLVM is required.
Those channels are only used to test and fix builds in advance. They may be
broken at times and must not delay stable channel updates.
+
+# Testing
+
+Useful tests:
+- Version: chrome://version/
+- GPU acceleration: chrome://gpu/
+- Essential functionality: Browsing, extensions, video+audio, JS, ...
+- WebGL: https://get.webgl.org/
+- VA-API: https://wiki.archlinux.org/index.php/chromium#Hardware_video_acceleration
+- Optional: Widevine CDM (proprietary), Benchmarks, Ozone, etc.
From cd4c376baf7526b764c35ab1605057e4b34aea72 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 7 Feb 2021 19:13:50 +0100
Subject: [PATCH 20/33] glances: 3.1.6.1 -> 3.1.6.2
---
pkgs/applications/system/glances/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 10a6eb9c6bb..26ca10e3f3f 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
- version = "3.1.6.1";
+ version = "3.1.6.2";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
- sha256 = "sha256-lYvFNeCuvLIV//fEQDZIj+nLGZmrKHfAQyNpe4vMmfU=";
+ sha256 = "sha256-6vxJKIwMKz8KQn10aOzqXhVBDfBLylw925hR1hWP7/A=";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
From 84cc35e4d8b25bc43f3b43a1cc0a56d791f971e1 Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 7 Feb 2021 12:29:06 -0600
Subject: [PATCH 21/33] plex: 1.21.2.3943-a91458577 -> 1.21.3.4014-58bd20c02
---
pkgs/servers/plex/raw.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c49f930f542..ca0e41f76d2 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.21.2.3943-a91458577";
+ version = "1.21.3.4014-58bd20c02";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
- sha256 = "1wgv37z1j8yh0jck8nawq8qk6vjvc2cap2dj2vdid9dafy9fl7yw";
+ sha256 = "15zfhjvp5yzai5ylhljw221v6qm16fma0x0lay9zpgkxrwqw9iaw";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
- sha256 = "0bjxb2kmq43fi8026jvdbqn14lg33k2520n59l497la56l5d0h37";
+ sha256 = "1gig4n6iijipf2njixgpw00pm3g5rgbq1vvd9ljy8cjpv1kb5z0z";
};
outputs = [ "out" "basedb" ];
From d2819b04f6186274aac5b5345e8f22f0bf19d8f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 7 Feb 2021 19:56:34 +0100
Subject: [PATCH 22/33] python3Packages.django-cache-url: enable tests, update
homepage
---
.../django-cache-url/default.nix | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix
index 87cdc9f1d60..dee64ebd6ee 100644
--- a/pkgs/development/python-modules/django-cache-url/default.nix
+++ b/pkgs/development/python-modules/django-cache-url/default.nix
@@ -1,29 +1,29 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, pytest
+, fetchFromGitHub
+, pytestCheckHook
}:
buildPythonPackage rec {
version = "3.2.2";
pname = "django-cache-url";
- src = fetchPypi {
- inherit pname version;
- sha256 = "419b1667fe654a1b032073371b67d3fcfbe2a6392337c0e5e6c4ec741a6342a5";
+ src = fetchFromGitHub {
+ owner = "epicserve";
+ repo = "django-cache-url";
+ rev = "v${version}";
+ sha256 = "0fxma2w6zl3cfl6wnynmlmp8snks67ffz4jcq4qmdc65xv1l204l";
};
- checkInputs = [ pytest ];
-
- checkPhase = ''
- pytest tests
+ postPatch = ''
+ # disable coverage tests
+ sed -i '/--cov/d' setup.cfg
'';
- # tests not included with pypi release
- doCheck = false;
+ checkInputs = [ pytestCheckHook ];
meta = with lib; {
- homepage = "https://github.com/ghickman/django-cache-url";
+ homepage = "https://github.com/epicserve/django-cache-url";
description = "Use Cache URLs in your Django application";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
From 2ae445997293016aed11f8e09eb6c256ccc273dd Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 7 Feb 2021 19:58:32 +0100
Subject: [PATCH 23/33] ipe: 7.2.13 -> 7.2.23
---
pkgs/applications/graphics/ipe/default.nix | 60 +++++++++++++++-------
1 file changed, 42 insertions(+), 18 deletions(-)
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index d9c51d38802..72c79d7dc50 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,43 +1,67 @@
-{ lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript
-, libjpeg, libpng, qtbase, mkDerivation
+{ lib
+, mkDerivation
+, fetchurl
+, pkg-config
+, cairo
+, freetype
+, ghostscript
+, gsl
+, libjpeg
+, libpng
+, libspiro
+, lua5
+, qtbase
+, texlive
+, zlib
}:
mkDerivation rec {
- name = "ipe-7.2.13";
+ pname = "ipe";
+ version = "7.2.23";
src = fetchurl {
- url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
- sha256 = "1a6a88r7j5z01z6k1z72a8g3n6lxdjjxxkdrzrfdd6df2gbs6g5g";
+ url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${pname}-${version}-src.tar.gz";
+ sha256 = "0yvm3zfba1ljyy518vjnvwpyg7lgnmdwm19v5k0wfgz64aca56x1";
};
- sourceRoot = "${name}/src";
+ sourceRoot = "${pname}-${version}/src";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [
+ cairo
+ freetype
+ ghostscript
+ gsl
+ libjpeg
+ libpng
+ libspiro
+ lua5
+ qtbase
+ texlive
+ zlib
+ ];
IPEPREFIX=placeholder "out";
URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
LUA_PACKAGE = "lua";
- buildInputs = [
- libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
- ];
-
- nativeBuildInputs = [ pkg-config ];
-
qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ];
enableParallelBuilding = true;
- #TODO: make .desktop entry
+ # TODO: make .desktop entry
- meta = {
+ meta = with lib; {
description = "An editor for drawing figures";
- homepage = "http://ipe.otfried.org";
- license = lib.licenses.gpl3Plus;
+ homepage = "http://ipe.otfried.org"; # https not available
+ license = licenses.gpl3Plus;
longDescription = ''
Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
It supports making small figures for inclusion into LaTeX-documents
as well as presentations in PDF.
'';
- maintainers = [ lib.maintainers.ttuegel ];
- platforms = lib.platforms.linux;
+ maintainers = with maintainers; [ ttuegel ];
+ platforms = platforms.linux;
};
}
From 44b2f7d17d1f9144a5d6e2858b5c9e01a71240d3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 7 Feb 2021 19:25:58 +0000
Subject: [PATCH 24/33] squashfs-tools-ng: 1.0.1 -> 1.0.4
---
pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
index 593004d552c..322f57fdca9 100644
--- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
+++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "squashfs-tools-ng";
- version = "1.0.1";
+ version = "1.0.4";
src = fetchurl {
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
- sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4";
+ sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072";
};
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];
From 0388fd959ea440f644291a752b70823938bccad4 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Sun, 7 Feb 2021 20:52:57 +0100
Subject: [PATCH 25/33] wofi: 1.2.3 -> 1.2.4 (#112274)
---
pkgs/applications/misc/wofi/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 7b9e38c87d1..d8af28093b9 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "wofi";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchhg {
url = "https://hg.sr.ht/~scoopta/wofi";
rev = "v${version}";
- sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i";
+ sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c";
};
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A launcher/menu program for wlroots based wayland compositors such as sway";
homepage = "https://hg.sr.ht/~scoopta/wofi";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ elyhaka ];
platforms = with platforms; linux;
};
From 1999efaef39e5f10b5e08e58d4c741cbaf132d82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 7 Feb 2021 12:22:58 +0000
Subject: [PATCH 26/33] jc: 1.14.1 -> 1.14.2
---
pkgs/development/python-modules/jc/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index b4590ed28d3..ac0d51489a2 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.14.1";
+ version = "1.14.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = "jc";
rev = "v${version}";
- sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw";
+ sha256 = "sha256-rYH4m7h2SPB1Io83ZUsqZ+Ll4XEi4Feuj4QYvaOJ2lY=";
};
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
From 27f273d3917f56e6af68871d74f54a68b09989e8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 7 Feb 2021 20:38:36 +0000
Subject: [PATCH 27/33] apk-tools: 2.10.5 -> 2.12.2; fix cross
Also clarify license.
---
.../package-management/apk-tools/default.nix | 25 +++++++++++++------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix
index c1141362f82..fed7de01b98 100644
--- a/pkgs/tools/package-management/apk-tools/default.nix
+++ b/pkgs/tools/package-management/apk-tools/default.nix
@@ -1,20 +1,29 @@
-{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }:
+{ lib, stdenv, fetchFromGitLab, pkg-config, scdoc, openssl, zlib
+, luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform, lua
+}:
stdenv.mkDerivation rec {
pname = "apk-tools";
- version = "2.10.5";
+ version = "2.12.2";
- src = fetchurl {
- url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz";
- sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp";
+ src = fetchFromGitLab {
+ domain = "gitlab.alpinelinux.org";
+ owner = "alpine";
+ repo = "apk-tools";
+ rev = "v${version}";
+ sha256 = "1crx2xlswi7i0mwgzrfphpf49ghfnh79fi5dn1sl611j9sy9wa29";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ lua openssl zlib ];
+ nativeBuildInputs = [ pkg-config scdoc ]
+ ++ lib.optionals luaSupport [ lua lua.pkgs.lua-zlib ];
+ buildInputs = [ openssl zlib ] ++ lib.optional luaSupport lua;
+ strictDeps = true;
makeFlags = [
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
"SBINDIR=$(out)/bin"
"LIBDIR=$(out)/lib"
+ "LUA=${if luaSupport then "lua" else "no"}"
"LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}"
"MANDIR=$(out)/share/man"
"DOCDIR=$(out)/share/doc/apk"
@@ -30,7 +39,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools";
description = "Alpine Package Keeper";
maintainers = with maintainers; [ qyliss ];
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
From 0b94f35b97c7eefde74d8ae6373e14b0aef97f97 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 7 Feb 2021 22:56:47 +0100
Subject: [PATCH 28/33] home-assistant: disable test_error_posted_as_event
The test is still flaky after the latest testing changes.
---
pkgs/servers/home-assistant/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 977c58906ac..86d19a1694e 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -199,6 +199,8 @@ in with py.pkgs; buildPythonApplication rec {
# keyring.errors.NoKeyringError: No recommended backend was available.
"test_secrets_from_unrelated_fails"
"test_secrets_credstash"
+ # system_log/test_init.py: assert 0 == 1 where 0 = len([])
+ "test_error_posted_as_event"
];
preCheck = ''
From f53e0e28c3bc74ca0e45196125a7b2484ab04ce6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 7 Feb 2021 21:45:58 +0100
Subject: [PATCH 29/33] doc: Add anchors to meta attributes
---
doc/stdenv/meta.xml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml
index 10802d1af59..91ace0b9cc9 100644
--- a/doc/stdenv/meta.xml
+++ b/doc/stdenv/meta.xml
@@ -75,7 +75,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
<variablelist>
- <varlistentry>
+ <varlistentry xml:id="var-meta-description">
<term>
<varname>description</varname>
</term>
@@ -94,7 +94,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-longDescription">
<term>
<varname>longDescription</varname>
</term>
@@ -104,7 +104,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-branch">
<term>
<varname>branch</varname>
</term>
@@ -114,7 +114,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-homepage">
<term>
<varname>homepage</varname>
</term>
@@ -124,7 +124,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-downloadPage">
<term>
<varname>downloadPage</varname>
</term>
@@ -134,7 +134,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-changelog">
<term>
<varname>changelog</varname>
</term>
@@ -144,7 +144,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-license">
<term>
<varname>license</varname>
</term>
@@ -183,7 +183,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-maintainers">
<term>
<varname>maintainers</varname>
</term>
@@ -193,7 +193,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-priority">
<term>
<varname>priority</varname>
</term>
@@ -203,7 +203,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-platforms">
<term>
<varname>platforms</varname>
</term>
@@ -217,7 +217,7 @@ meta.platforms = lib.platforms.linux;
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-tests">
<term>
<varname>tests</varname>
</term>
@@ -244,7 +244,7 @@ meta.platforms = lib.platforms.linux;
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-timeout">
<term>
<varname>timeout</varname>
</term>
@@ -254,7 +254,7 @@ meta.platforms = lib.platforms.linux;
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-hydraPlatforms">
<term>
<varname>hydraPlatforms</varname>
</term>
@@ -268,7 +268,7 @@ meta.hydraPlatforms = [];
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-broken">
<term>
<varname>broken</varname>
</term>
@@ -278,7 +278,7 @@ meta.hydraPlatforms = [];
</para>
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry xml:id="var-meta-updateWalker">
<term>
<varname>updateWalker</varname>
</term>
From b1a667ccd4aa1d13a09d2fd39f40c11461bddc70 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Feb 2021 23:16:44 +0100
Subject: [PATCH 30/33] python3Packages.pynuki: init at 1.4.1
---
.../python-modules/pynuki/default.nix | 34 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 36 insertions(+)
create mode 100644 pkgs/development/python-modules/pynuki/default.nix
diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix
new file mode 100644
index 00000000000..9c3dc394cc0
--- /dev/null
+++ b/pkgs/development/python-modules/pynuki/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pynuki";
+ version = "1.4.1";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "pschmitt";
+ repo = pname;
+ rev = version;
+ sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [ requests ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pynuki" ];
+
+ meta = with lib; {
+ description = "Python bindings for nuki.io bridges";
+ homepage = "https://github.com/pschmitt/pynuki";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9dd34edd4ae..50a801083da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4900,6 +4900,8 @@ in {
pynndescent = callPackage ../development/python-modules/pynndescent { };
+ pynuki = callPackage ../development/python-modules/pynuki { };
+
pysbd = callPackage ../development/python-modules/pysbd { };
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
From 7a03c3e0a90888164c10c02cd448338789405023 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 Feb 2021 23:17:03 +0100
Subject: [PATCH 31/33] home-assistant: update component-packages
---
pkgs/servers/home-assistant/component-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d6aebd0cd45..b39deeab362 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -561,7 +561,7 @@
"nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
"nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
"nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo
- "nuki" = ps: with ps; [ ]; # missing inputs: pynuki
+ "nuki" = ps: with ps; [ pynuki ];
"numato" = ps: with ps; [ ]; # missing inputs: numato-gpio
"number" = ps: with ps; [ ];
"nut" = ps: with ps; [ ]; # missing inputs: pynut2
From c4b5a703ab6e280332e86f1fa09774af3d1a1592 Mon Sep 17 00:00:00 2001
From: Jan Beinke <git@janbeinke.com>
Date: Sun, 7 Feb 2021 23:22:06 +0100
Subject: [PATCH 32/33] tests/snapserver: Add test of connection and buffer
size setting
This addition will cover part of the issue, that was fixed in #112295
and @mweinelt asked to improve the tests.
---
nixos/tests/snapcast.nix | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix
index 05d08d76cc0..2fef6362514 100644
--- a/nixos/tests/snapcast.nix
+++ b/nixos/tests/snapcast.nix
@@ -5,6 +5,7 @@ let
tcpPort = 10005;
httpPort = 10080;
tcpStreamPort = 10006;
+ bufferSize = 742;
in {
name = "snapcast";
meta = with pkgs.lib.maintainers; {
@@ -18,6 +19,7 @@ in {
port = port;
tcp.port = tcpPort;
http.port = httpPort;
+ buffer = bufferSize;
streams = {
mpd = {
type = "pipe";
@@ -35,6 +37,9 @@ in {
};
};
};
+ client = {
+ environment.systemPackages = [ pkgs.snapcast ];
+ };
};
testScript = ''
@@ -61,5 +66,12 @@ in {
server.succeed(
"curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'"
)
+
+ with subtest("test a connection"):
+ client.execute("systemd-run snapclient -h server -p ${toString port}")
+ server.wait_until_succeeds(
+ "journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
+ )
+ client.wait_until_succeeds("journalctl -o cat -u run-\* | grep -q ${toString bufferSize}")
'';
})
From c2206a145f081880c445e6655b4dfabe26940f07 Mon Sep 17 00:00:00 2001
From: Georg Haas <hax404foogit@hax404.de>
Date: Sun, 7 Feb 2021 21:21:13 +0100
Subject: [PATCH 33/33] upterm: init at 0.5.2
---
pkgs/tools/misc/upterm/default.nix | 39 ++++++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 41 insertions(+)
create mode 100644 pkgs/tools/misc/upterm/default.nix
diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix
new file mode 100644
index 00000000000..533ef192e8d
--- /dev/null
+++ b/pkgs/tools/misc/upterm/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles }:
+
+buildGoModule rec {
+ pname = "upterm";
+ version = "0.5.2";
+
+ src = fetchFromGitHub {
+ owner = "owenthereal";
+ repo = "upterm";
+ rev = "v${version}";
+ sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq";
+ };
+
+ vendorSha256 = null;
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ $out/bin/gendoc
+ rm $out/bin/gendoc
+ installManPage etc/man/man*/*
+ installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh
+ installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion
+ '';
+
+ doCheck = true;
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = with lib; {
+ description = "Secure terminal-session sharing";
+ homepage = "https://upterm.dev";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ hax404 ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82b107355e1..0af252e1163 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8559,6 +8559,8 @@ in
up = callPackage ../tools/misc/up { };
+ upterm = callPackage ../tools/misc/upterm { };
+
upx = callPackage ../tools/compression/upx { };
uq = callPackage ../misc/uq { };