From c0df23122ef74d3c8c1d9a24fa56a1f3a1bcc5a4 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 1 Sep 2020 18:08:29 -0400
Subject: [PATCH 01/47] f3d: init at 1.0.1
---
pkgs/applications/graphics/f3d/default.nix | 28 ++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 4 ++++
2 files changed, 32 insertions(+)
create mode 100644 pkgs/applications/graphics/f3d/default.nix
diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
new file mode 100644
index 000000000000..c81ba1240173
--- /dev/null
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }:
+
+stdenv.mkDerivation rec {
+ pname = "f3d";
+ version = "1.0.1";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.kitware.com";
+ owner = "f3d";
+ repo = "f3d";
+ rev = "v${version}";
+ sha256 = "0a6r0jspkhl735f6zmnhby1g4dlmjqd5izgsp5yfdcdhqj4j63mg";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ vtk_9 ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ libGL libX11 ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
+
+ meta = with stdenv.lib; {
+ description = "Fast and minimalist 3D viewer using VTK";
+ homepage = "https://kitware.github.io/F3D";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ bcdarwin ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e27ff02b0465..2ab96a3c4e48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1906,6 +1906,10 @@ in
f3 = callPackage ../tools/filesystems/f3 { };
+ f3d = callPackage ../applications/graphics/f3d {
+ inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
+ };
+
fac = callPackage ../development/tools/fac { };
facedetect = callPackage ../tools/graphics/facedetect { };
From 2a4a6554eb57a3e4d67452fbbffe41a8dccc952e Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 12 Sep 2020 11:38:56 -0400
Subject: [PATCH 02/47] python3Packages.threadpoolctl: 2.0.0 -> 2.1.0
---
.../python-modules/threadpoolctl/default.nix | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix
index e57b5c3b1567..fb2c6094b37c 100644
--- a/pkgs/development/python-modules/threadpoolctl/default.nix
+++ b/pkgs/development/python-modules/threadpoolctl/default.nix
@@ -3,7 +3,7 @@
, isPy27
, fetchFromGitHub
, flit
-, pytest
+, pytestCheckHook
, pytestcov
, numpy
, scipy
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "threadpoolctl";
- version = "2.0.0";
+ version = "2.1.0";
disabled = isPy27;
format = "flit";
@@ -20,13 +20,10 @@ buildPythonPackage rec {
owner = "joblib";
repo = pname;
rev = version;
- sha256 = "16z4n82f004i4l1jw6qrzazda1m6v2yjnpqlp71ipa8mzy9kw7dw";
+ sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df";
};
- checkInputs = [ pytest pytestcov numpy scipy ];
-
- checkPhase = "pytest tests -k 'not test_nested_prange_blas'";
- # cython doesn't get run on the tests when added to nativeBuildInputs, breaking this test
+ checkInputs = [ pytestCheckHook pytestcov numpy scipy ];
meta = with lib; {
homepage = "https://github.com/joblib/threadpoolctl";
From 1f5f6424a7c5f69322df77e1414472e8d2a6ab6a Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 12 Sep 2020 11:46:17 -0400
Subject: [PATCH 03/47] python3Packages.batchgenerators: 0.20.0 -> 0.20.1
---
.../python-modules/batchgenerators/default.nix | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix
index b0f3cdb6e119..16b8f317a223 100644
--- a/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/pkgs/development/python-modules/batchgenerators/default.nix
@@ -3,7 +3,7 @@
, isPy27
, fetchFromGitHub
, fetchpatch
-, pytest
+, pytestCheckHook
, unittest2
, future
, numpy
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "batchgenerators";
- version = "0.20.0";
+ version = "0.20.1";
disabled = isPy27;
@@ -24,11 +24,12 @@ buildPythonPackage rec {
owner = "MIC-DKFZ";
repo = pname;
rev = "v${version}";
- sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf";
+ sha256 = "1f91yflv9rschyl5bnfn735hp1rxrzcxkx18aajmlzb067h0ip8m";
};
patches = [
+ # lift Pillow bound; should be merged in next release
(fetchpatch {
url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch";
sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0";
@@ -39,9 +40,7 @@ buildPythonPackage rec {
future numpy pillow scipy scikitlearn scikitimage threadpoolctl
];
- checkInputs = [ pytest unittest2 ];
-
- checkPhase = "pytest tests";
+ checkInputs = [ pytestCheckHook unittest2 ];
meta = {
description = "2D and 3D image data augmentation for deep learning";
From 5983c412d7c11a0691061ecee79860bd30c11c5c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 29 Sep 2020 00:45:11 +0100
Subject: [PATCH 04/47] partimage: fix build
the move to glibc 2.30 broke the build of this old package, fortunately
debian have a patch to fix it
---
pkgs/tools/backup/partimage/default.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index 51a1a05fe6c5..cec19c399335 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation {
+ "partimage-0.6.9-openssl-1.1-compatibility.patch?id=3fe8e9910002b6523d995512a646b063565d0447";
sha256 = "1hs0krxrncxq1w36bhad02yk8yx71zcfs35cw87c82sl2sfwasjg";
})
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/p/partimage/0.6.9-8/debian/patches/04-fix-FTBFS-glic-2.28.patch";
+ sha256 = "0xid5636g58sxbhxnjmfjdy7y8rf3c77zmmpfbbqv4lv9jd2gmxm";
+ })
];
meta = {
From 892712e26052114ec46b786ce69f405d44d20ce2 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 28 Sep 2020 22:50:30 +0100
Subject: [PATCH 05/47] oq: fix build
this patch is actually included in the already-released oq 1.1.2, but we
can't upgrade to that because it requires crystal 0.35, which we don't
seem to have yet
enable for darwin
---
pkgs/development/tools/oq/default.nix | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix
index ca9c648adfbd..04526eb70b6e 100644
--- a/pkgs/development/tools/oq/default.nix
+++ b/pkgs/development/tools/oq/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper }:
+{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper, fetchpatch }:
crystal.buildCrystalPackage rec {
pname = "oq";
@@ -11,6 +11,15 @@ crystal.buildCrystalPackage rec {
sha256 = "1zg4kxpfi3sap4cwp42zg46j5dv0nf926qdqm7k22ncm6jdrgpgw";
};
+ patches = [
+ (fetchpatch {
+ # remove once we have upgraded to oq 1.1.2+
+ name = "yaml-test-leniency.patch";
+ url = "https://github.com/Blacksmoke16/oq/commit/93ed2fe50c9ce3fd8d35427e007790ddaaafce60.patch";
+ sha256 = "1iyz0c0w0ykz268bkrlqwvh1jnnrja0mqip6y89sbpa14lp0l37n";
+ })
+ ];
+
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jq libxml2 ];
@@ -32,6 +41,6 @@ crystal.buildCrystalPackage rec {
homepage = "https://blacksmoke16.github.io/oq/";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
From f15c4c31d51a04caf9f9982ca0fab9ecc217fe5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 1 Oct 2020 12:51:34 -0300
Subject: [PATCH 06/47] marwaita-pop_os: init at 0.9
---
pkgs/data/themes/marwaita-pop_os/default.nix | 46 ++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 48 insertions(+)
create mode 100644 pkgs/data/themes/marwaita-pop_os/default.nix
diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/data/themes/marwaita-pop_os/default.nix
new file mode 100644
index 000000000000..487b54a53e71
--- /dev/null
+++ b/pkgs/data/themes/marwaita-pop_os/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, fetchFromGitHub
+, gdk-pixbuf
+, gtk-engine-murrine
+, gtk_engines
+, librsvg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "marwaita-pop_os";
+ version = "0.9";
+
+ src = fetchFromGitHub {
+ owner = "darkomarko42";
+ repo = pname;
+ rev = version;
+ sha256 = "1fpzsch9rpq7dmg01ny7jc2vd6dks0fqxxp2rb9jcs0vx5d2fdc6";
+ };
+
+ buildInputs = [
+ gdk-pixbuf
+ gtk_engines
+ librsvg
+ ];
+
+ propagatedUserEnvPkgs = [
+ gtk-engine-murrine
+ ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/themes
+ cp -a Marwaita* $out/share/themes
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Marwaita GTK theme with Pop_os Linux style";
+ homepage = "https://www.pling.com/p/1377894/";
+ license = licenses.gpl3Only;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3b4ebdcb940..7a39b5751ae2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19121,6 +19121,8 @@ in
marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { };
+ marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };
+
matcha-gtk-theme = callPackage ../data/themes/matcha { };
materia-theme = callPackage ../data/themes/materia-theme { };
From b08ef823649b4f1ee5c45b6eccfdf736a9c20a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 1 Oct 2020 13:54:20 -0300
Subject: [PATCH 07/47] skeu: init at 0.5.1
---
pkgs/data/themes/skeu/default.nix | 46 +++++++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 48 insertions(+)
create mode 100644 pkgs/data/themes/skeu/default.nix
diff --git a/pkgs/data/themes/skeu/default.nix b/pkgs/data/themes/skeu/default.nix
new file mode 100644
index 000000000000..1f2f869364ec
--- /dev/null
+++ b/pkgs/data/themes/skeu/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, fetchFromGitHub
+, gdk-pixbuf
+, gtk-engine-murrine
+, gtk_engines
+, librsvg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "skeu";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "darkomarko42";
+ repo = pname;
+ rev = version;
+ sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645";
+ };
+
+ buildInputs = [
+ gdk-pixbuf
+ gtk_engines
+ librsvg
+ ];
+
+ propagatedUserEnvPkgs = [
+ gtk-engine-murrine
+ ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/themes
+ cp -a Skeu* $out/share/themes
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GTK theme with skeuomorphism design";
+ homepage = "https://www.pling.com/p/1363834/";
+ license = licenses.gpl3Only;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3b4ebdcb940..8f41c7f90996 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19303,6 +19303,8 @@ in
shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
+ skeu = callPackage ../data/themes/skeu { };
+
sweet = callPackage ../data/themes/sweet { };
mime-types = callPackage ../data/misc/mime-types { };
From 643bdb404e6fea932e4159ff5141894e7d30da10 Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Fri, 2 Oct 2020 12:20:32 +0000
Subject: [PATCH 08/47] virt-manager-qt: Add patch to rename variables
KDE/krdc@56a0222b518d05c1816aba5a142ea616983ee9ef renamed some
variables resulting in a build failure. The added patch renames the
variables in virt-manager-qt accordingly.
---
pkgs/applications/virtualization/virt-manager/qt.nix | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 7112a8b33e8d..45d1146f4300 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg, qttools, krdc
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
, libselinux, libsepol, utillinux
@@ -20,6 +20,15 @@ mkDerivation rec {
"-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5"
];
+ patches = [
+ (fetchpatch {
+ # Maintainer note: Check whether this patch is still needed when a new version is released
+ name = "krdc-variable-name-changes.patch";
+ url = "https://github.com/fadenb/qt-virt-manager/commit/4640f5f64534ed7c8a1ecc6851f1c7503988de6d.patch";
+ sha256 = "1chl58nra1mj96n8jmnjbsyr6vlwkhn38afhwqsbr0bgyg23781v";
+ })
+ ];
+
buildInputs = [
qtbase qtmultimedia qtsvg krdc
libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol
From ae31bec12b41d3ae717e6b1179f9f0b59c118805 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 5 Oct 2020 19:36:33 +0100
Subject: [PATCH 09/47] sleepyhead: fix build
switch back to qt 5.12
---
pkgs/top-level/all-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567d4d08d21b..46d28c6ba29a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7007,7 +7007,7 @@ in
sleuthkit = callPackage ../tools/system/sleuthkit {};
- sleepyhead = libsForQt514.callPackage ../applications/misc/sleepyhead {};
+ sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {};
slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { };
From e007cf98eedf2e1156c7c46dc94405f2d969b84c Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <daniel.schaefer@hpe.com>
Date: Wed, 7 Oct 2020 14:01:51 +0800
Subject: [PATCH 10/47] hpmyroom: 12.0.0.0220 -> 12.1.1.0257
---
pkgs/applications/networking/hpmyroom/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix
index 59274f4105b2..63d0d0b2978b 100644
--- a/pkgs/applications/networking/hpmyroom/default.nix
+++ b/pkgs/applications/networking/hpmyroom/default.nix
@@ -4,11 +4,11 @@
}:
mkDerivation rec {
pname = "hpmyroom";
- version = "12.0.0.0220";
+ version = "12.1.1.0257";
src = fetchurl {
url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm";
- sha256 = "0gajj2s6l7jj8520agrv2dyisg7hhacbwzqlsp9a0xdxr0v71jhr";
+ sha256 = "1xm41v324zq1x5awgb7fr238f7ml7vq6jrfh84358i5shgha1g2k";
};
nativeBuildInputs = [
From 6e34b3e6fee8e176a340763a0084a1b3354dcee5 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Wed, 7 Oct 2020 09:02:17 -0400
Subject: [PATCH 11/47] libcint: 3.1.1 -> 4.0.2
Add changelog
---
pkgs/development/libraries/libcint/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix
index 55ba8d7b3017..b7dd32a056c4 100644
--- a/pkgs/development/libraries/libcint/default.nix
+++ b/pkgs/development/libraries/libcint/default.nix
@@ -4,18 +4,18 @@
, cmake
, blas
# Check Inputs
-, python2
+, python
}:
stdenv.mkDerivation rec {
pname = "libcint";
- version = "3.1.1";
+ version = "4.0.2";
src = fetchFromGitHub {
owner = "sunqm";
repo = "libcint";
rev = "v${version}";
- sha256 = "0z1gavi7aacx68fmyzy90vzv5kff844lnxc6habs6y377dr3rwwy";
+ sha256 = "0j8fkkp3vb1936qy80sc08c327b47qxh0x2aadd1225jjq6xqxmn";
};
nativeBuildInputs = [ cmake ];
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
];
doCheck = true;
- # Test syntax (like print statements) is written in python2. Fixed when #33 merged: https://github.com/sunqm/libcint/pull/33
- checkInputs = [ python2.pkgs.numpy ];
+ checkInputs = [ python.pkgs.numpy ];
meta = with lib; {
description = "General GTO integrals for quantum chemistry";
@@ -39,6 +38,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://wiki.sunqm.net/libcint";
downloadPage = "https://github.com/sunqm/libcint";
+ changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog";
license = licenses.bsd2;
maintainers = with maintainers; [ drewrisinger ];
};
From 926a58ce6304ce6c89855cc71dc304fd8fb01e64 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 9 Oct 2020 04:20:00 +0000
Subject: [PATCH 12/47] gitAndTools.git-trim: 0.3.2 -> 0.4.0
https://github.com/foriequal0/git-trim/releases/tag/v0.4.0
---
.../version-management/git-and-tools/git-trim/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
index d843cdc307c0..137e6eb71589 100644
--- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-trim";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "foriequal0";
repo = pname;
rev = "v${version}";
- sha256 = "079kavm3n776wvmy25jq1g4qdvmhh3d3x1vdpb1f6pw5rkky8lyw";
+ sha256 = "0w6qrr53wal4p4jvz35f9mpqwz1vfcymj17sz418n9p9lw45f24n";
};
- cargoSha256 = "1ii5l7z9avg0gzlaav2gnfbr8wkbp008i5rz6k6bs2sfqnpnn5k6";
+ cargoSha256 = "1mlvkvgcln59bi249z87v8i0ixq1a7walkzsjml6d219rmy5550h";
nativeBuildInputs = [ pkg-config ];
From 1b1b596303b9368a9ed4f6f84bb0f2096ec19b66 Mon Sep 17 00:00:00 2001
From: meutraa <paul@lost.host>
Date: Fri, 9 Oct 2020 12:31:49 +0100
Subject: [PATCH 13/47] androidStudioPackages.stable: 4.0.1.0 -> 4.0.2.0
---
pkgs/applications/editors/android-studio/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index f07854ca8a59..d9b829132021 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,9 +9,9 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
- version = "4.0.1.0"; # "Android Studio 4.0.1"
- build = "193.6626763";
- sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j";
+ version = "4.0.2.0"; # "Android Studio 4.0.2"
+ build = "193.6821437";
+ sha256Hash = "sha256-v3lug8XCl4tekMBP4N1wS925FnDaSMDf6SIJhwKydzY=";
};
betaVersion = {
version = "4.1.0.18"; # "Android Studio 4.1 RC 3"
From b67afd8a44f202b8475fce6f87611654a6507708 Mon Sep 17 00:00:00 2001
From: Matt Huszagh <huszaghmatt@gmail.com>
Date: Thu, 8 Oct 2020 18:46:57 -0700
Subject: [PATCH 14/47] kicad: modify update script to use gitlab for libraries
Kicad libraries are now hosted on gitlab instead of github.
---
.../applications/science/electronics/kicad/update.sh | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh
index f048ccde4ec8..8c154c302c84 100755
--- a/pkgs/applications/science/electronics/kicad/update.sh
+++ b/pkgs/applications/science/electronics/kicad/update.sh
@@ -58,7 +58,6 @@ file="${here}/versions.nix"
# just in case this runs in parallel
tmp="${here}/,versions.nix.${RANDOM}"
-# libraries currently on github, move to $gitlab/libraries planned
libs=( symbols templates footprints packages3d )
get_rev="git ls-remote --heads --tags"
@@ -67,9 +66,6 @@ gitlab="https://gitlab.com/kicad"
# append commit hash or tag
gitlab_pre="https://gitlab.com/api/v4/projects/kicad%2Fcode%2Fkicad/repository/archive.tar.gz?sha="
-# append "-$lib/archive/[hash or tag].tar.gz
-github="https://github.com/kicad/kicad"
-
# not a lib, but separate and already moved to gitlab
i18n="${gitlab}/code/kicad-i18n.git"
i18n_pre="https://gitlab.com/api/v4/projects/kicad%2Fcode%2Fkicad-i18n/repository/archive.tar.gz?sha="
@@ -147,8 +143,8 @@ for version in "${all_versions[@]}"; do
for lib in "${libs[@]}"; do
echo "Checking ${lib}" >&2
- url="${github}-${lib}.git"
- lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)"
+ url="${gitlab}/libraries/kicad-${lib}.git"
+ lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)"
has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)"
has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")"
if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
@@ -161,7 +157,7 @@ for version in "${all_versions[@]}"; do
esac
printf "\"%s\";\n" "${lib_rev}"
printf "%8s%s.sha256 =\t\"%s\";\n" "" \
- "${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")"
+ "${lib}" "$(${prefetch} "https://gitlab.com/api/v4/projects/kicad%2Flibraries%2Fkicad-${lib}/repository/archive.tar.gz?sha=${lib_rev}")"
count=$((count+1))
fi
done
@@ -172,7 +168,7 @@ for version in "${all_versions[@]}"; do
printf "\nReusing old %s\n" "${pname}" >&2
grep -sm 1 "\"${pname}\"" -A 23 "${file}"
fi
-done
+done
printf "}\n"
} > "${tmp}"
From 104aca941a7cf0f301ebc16c5da66bf039f990b6 Mon Sep 17 00:00:00 2001
From: Matt Huszagh <huszaghmatt@gmail.com>
Date: Thu, 8 Oct 2020 18:47:55 -0700
Subject: [PATCH 15/47] kicad-unstable: 2020-08-22 -> 2020-10-09
base.nix requires gtk3 to compile
---
.../science/electronics/kicad/base.nix | 64 +++++++++++++++----
.../science/electronics/kicad/versions.nix | 56 ++++++++--------
2 files changed, 81 insertions(+), 39 deletions(-)
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 2fd4c122041c..6581fb8f4452 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -1,23 +1,51 @@
-{ lib, stdenv, fetchFromGitLab, cmake, libGLU, libGL, zlib, wxGTK
-, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
-, doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages
+{ lib
+, stdenv
+, fetchFromGitLab
+, cmake
+, libGLU
+, libGL
+, zlib
+, wxGTK
+, libX11
+, gettext
+, glew
+, glm
+, cairo
+, curl
+, openssl
+, boost
+, pkgconfig
+, doxygen
+, pcre
+, libpthreadstubs
+, libXdmcp
+, fetchpatch
+, lndir
+, callPackages
, stable ? true
, baseName ? "kicad"
, versions ? { }
-, oceSupport ? false, opencascade
-, withOCCT ? true, opencascade-occt
-, ngspiceSupport ? true, libngspice
-, scriptingSupport ? true, swig, python, wxPython
-, debug ? false, valgrind
+, oceSupport ? false
+, opencascade
+, withOCCT ? true
+, opencascade-occt
+, ngspiceSupport ? true
+, libngspice
+, scriptingSupport ? true
+, swig
+, python
+, wxPython
+, debug ? false
+, valgrind
, withI18n ? true
+, gtk3
}:
assert ngspiceSupport -> libngspice != null;
with lib;
let
-
versionConfig = versions.${baseName};
# oce on aarch64 fails a test
@@ -95,8 +123,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig lndir ];
buildInputs = [
- libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext
- glew glm libpthreadstubs cairo curl openssl boost
+ libGLU
+ libGL
+ zlib
+ libX11
+ wxGTK
+ pcre
+ libXdmcp
+ gettext
+ glew
+ glm
+ libpthreadstubs
+ cairo
+ curl
+ openssl
+ boost
+ gtk3
]
++ optionals (scriptingSupport) [ swig python wxPython ]
++ optional (ngspiceSupport) libngspice
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index d001cc433672..1afb33b6fbd8 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,49 +3,49 @@
{
"kicad" = {
kicadVersion = {
- version = "5.1.6";
+ version = "5.1.6";
src = {
- rev = "c6e7f7de7df655fd59b57823499efc443009de6b";
- sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622";
+ rev = "c6e7f7de7df655fd59b57823499efc443009de6b";
+ sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622";
};
};
libVersion = {
- version = "5.1.6";
+ version = "5.1.6";
libSources = {
- i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd";
- i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha";
- symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708";
- symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6";
- templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9";
- templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
- footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332";
- footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx";
- packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c";
- packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
+ i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd";
+ i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha";
+ symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708";
+ symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6";
+ templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9";
+ templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
+ footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332";
+ footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx";
+ packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c";
+ packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
};
};
};
"kicad-unstable" = {
kicadVersion = {
- version = "2020-08-22";
+ version = "2020-10-09";
src = {
- rev = "a2341f0f335b0abb9fc8cb86d19cbe6f9b38fade";
- sha256 = "0167yb39f800xarq3khn7sbdkgcx9j2ayhy8c7lhhks6kh7459g0";
+ rev = "560428a70f0196fb4ade620042c5ddefc1685ebe";
+ sha256 = "0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka";
};
};
libVersion = {
- version = "2020-08-22";
+ version = "2020-10-09";
libSources = {
- i18n.rev = "cbbb1efd940094bf0c3168280698b2b059a8c509";
- i18n.sha256 = "1q4jakn6m8smnr2mg7jgb520nrb6fag9mdvlcpx3smp3qbxka818";
- symbols.rev = "9ca6a5348cdeb88e699582d4ed051ff7303b44d3";
- symbols.sha256 = "13w6pb34rhz96rnar25z7kiscy6q1fm8l39hq1bpb8g9yn86ssz4";
- templates.rev = "ae16953b81055855bcede4a33305413599d86a15";
- templates.sha256 = "1pkv90p3liy3bj4nklxsvpzh9m56p0k5ldr22armvgqfaqaadx9v";
- footprints.rev = "f94c2d5d619d16033f69a555b449f59604d97865";
- footprints.sha256 = "1g71sk77jvqaf9xvgq6dkyvd9pij2lb4n0bn0dqnwddhwam935db";
- packages3d.rev = "f699b0e3c13fe75618086913e39279c85da14cc7";
- packages3d.sha256 = "0m5rb5axa946v729z35ga84in76y4zpk32qzi0hwqx957zy72hs9";
+ i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549";
+ i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf";
+ symbols.rev = "9c50f4333bafc5a1abf7786436db5ffb6a66758d";
+ symbols.sha256 = "06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k";
+ templates.rev = "41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af";
+ templates.sha256 = "0xxfkpsgbnafmpaxpz1747zn7fhqp0kfl32rzjrx4vzxyp25q805";
+ footprints.rev = "50015af7e603cc499199c7e1c6daa7c85dd732ae";
+ footprints.sha256 = "16bic67klbj7sgj7cab8ha2fg3ypp9ap82gxkn6ijvpl7dka8bhb";
+ packages3d.rev = "df0dc0074491bb665b2c3ce569cbd4aa16118ad6";
+ packages3d.sha256 = "027jlcp9fpryldjkcxhb1b5bpwqna9kl6r0lnkd86x238kj3rd8v";
};
};
};
From c2ee2418854cc15f78cd2de83307f8e534de0b3f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 9 Oct 2020 12:31:36 -0300
Subject: [PATCH 16/47] ppsspp: 1.9.4 -> 1.10.3
---
pkgs/misc/emulators/ppsspp/default.nix | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index a15347715501..effc34accf2c 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -16,21 +16,19 @@
mkDerivation rec {
pname = "ppsspp";
- version = "1.9.4";
+ version = "1.10.3";
src = fetchFromGitHub {
owner = "hrydgard";
- repo = "ppsspp";
+ repo = pname;
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "0ivi0dcfxwa4nz19amki80qacnjhqr42f0ihyby1scxafl3nq55c";
+ sha256 = "sha256-W41Poq5S+opkasIGYo13SQZWQF1HjfFnH7u9DW5HNA0=";
};
postPatch = ''
- substituteInPlace git-version.cmake \
- --replace unknown ${src.rev}
- substituteInPlace UI/NativeApp.cpp \
- --replace /usr/share $out/share
+ substituteInPlace git-version.cmake --replace unknown ${src.rev}
+ substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
'';
nativeBuildInputs = [ cmake pkgconfig python3 ];
@@ -52,6 +50,7 @@ mkDerivation rec {
"-DUSE_SYSTEM_LIBZIP=ON"
"-DUSE_SYSTEM_SNAPPY=ON"
"-DUSING_QT_UI=ON"
+ "-DHEADLESS=OFF"
];
installPhase = ''
@@ -61,9 +60,11 @@ mkDerivation rec {
'';
meta = with lib; {
- description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++";
+ description = "A HLE Playstation Portable emulator, written in C++";
homepage = "https://www.ppsspp.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.linux;
};
}
+# TODO: add SDL headless port
From cfe38ac84de8638bf34f21092e0387b8d5791a42 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evan.stoll@rjginc.com>
Date: Fri, 9 Oct 2020 13:44:15 -0400
Subject: [PATCH 17/47] heaptrack: build with zstd support
---
pkgs/development/tools/profiling/heaptrack/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index ed31f438a0aa..fc2937a8b0fd 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -1,6 +1,6 @@
{
lib, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules,
- zlib, boost, libunwind, elfutils, sparsehash,
+ zlib, boost, libunwind, elfutils, sparsehash, zstd,
qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
}:
@@ -17,7 +17,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [
- zlib boost libunwind elfutils sparsehash
+ zlib boost libunwind elfutils sparsehash zstd
qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram
];
From 63c77357334b1c8c097889efe17d46feb383e653 Mon Sep 17 00:00:00 2001
From: Jiehong Ma <email@majiehong.com>
Date: Fri, 9 Oct 2020 20:02:21 +0200
Subject: [PATCH 18/47] doc: add the removal of Python 3.5 to the 20.09 release
notes (#95765)
---
nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 8135bb562c84..00248250752d 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -64,6 +64,12 @@
Python 3 now defaults to Python 3.8 instead of 3.7.
</para>
</listitem>
+ <listitem>
+ <para>
+ Python 3.5 has reached its upstream EOL at the end of September 2020: it
+ has been removed from the list of available packages.
+ </para>
+ </listitem>
<listitem>
<para>
Two new options, <link linkend="opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link>
From 73b67da1699c7b4581226f877297f235cdbd051e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 9 Oct 2020 13:46:15 +0200
Subject: [PATCH 19/47] chromium: Disable VA-API by default
This is done to avoid driver specific issues and restores the previous
behaviour. Like before video acceleration can be enabled without having
to rebuild Chromium.
---
.../networking/browsers/chromium/common.nix | 9 ++-
.../networking/browsers/chromium/default.nix | 6 +-
.../enable-vdpau-support-for-nvidia.patch | 65 -------------------
.../enable-video-acceleration-on-linux.patch | 48 --------------
4 files changed, 7 insertions(+), 121 deletions(-)
delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch
delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index b9f6ef4a4b9e..663d66870b50 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -161,11 +161,10 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
- ]; # TODO: VA-API patches (we should be able to drop enable-video-acceleration-on-linux.patch now):
- # ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
- # ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
- # ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
- # ];
+ ] ++ optionals (useVaapi) [
+ # Check for enable-accelerated-video-decode on Linux:
+ (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d")
+ ];
postPatch = ''
# Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d16decfeeda5..e4bde5122270 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -15,7 +15,7 @@
, enablePepperFlash ? false
, enableWideVine ? false
, useVaapi ? false # Deprecated, use enableVaapi instead!
-, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon
+, enableVaapi ? false # Disabled by default due to unofficial support
, useOzone ? false
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
@@ -152,8 +152,8 @@ let
Chromium's useVaapi was replaced by enableVaapi and you don't need to pass
"--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).
'' else lib.optionalString
- (!enableVaapi)
- "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";
+ (enableVaapi)
+ "--add-flags --enable-accelerated-video-decode";
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;
diff --git a/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch b/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch
deleted file mode 100644
index 8d879de7bfd8..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
- // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
- // internal decoded frame.
- if (buffer_allocation_mode_ != BufferAllocationMode::kNone &&
-+ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau &&
- !vpp_vaapi_wrapper_) {
- vpp_vaapi_wrapper_ = VaapiWrapper::Create(
- VaapiWrapper::kVideoProcess, VAProfileNone,
-@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
- PictureBuffer buffer = buffers[i];
- buffer.set_size(requested_pic_size_);
- std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
-- (buffer_allocation_mode_ == BufferAllocationMode::kNone)
-+ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) ||
-+ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau))
- ? vaapi_wrapper_
- : vpp_vaapi_wrapper_,
- make_context_current_cb_, bind_image_cb_, buffer);
-@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
-
- VaapiVideoDecodeAccelerator::BufferAllocationMode
- VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
-+ // NVIDIA blobs use VDPAU
-+ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) {
-+ LOG(INFO) << "VA-API driver on VDPAU backend";
-+ return BufferAllocationMode::kWrapVdpau;
-+ }
-+
- // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
- // |output_mode_| as well.
- if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
-@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
- // Using |client_|s provided PictureBuffers and as many internally
- // allocated.
- kNormal,
-+ kWrapVdpau,
- };
-
- // Decides the concrete buffer allocation mode, depending on the hardware
---- a/media/gpu/vaapi/vaapi_wrapper.cc
-+++ b/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType(
- } else if (base::StartsWith(va_vendor_string, "Intel iHD driver",
- base::CompareCase::SENSITIVE)) {
- return media::VAImplementation::kIntelIHD;
-+ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU",
-+ base::CompareCase::SENSITIVE)) {
-+ return media::VAImplementation::kNVIDIAVDPAU;
- }
- return media::VAImplementation::kOther;
- }
---- a/media/gpu/vaapi/vaapi_wrapper.h
-+++ b/media/gpu/vaapi/vaapi_wrapper.h
-@@ -79,6 +79,7 @@ enum class VAImplementation {
- kIntelIHD,
- kOther,
- kInvalid,
-+ kNVIDIAVDPAU,
- };
-
- // This class handles VA-API calls and ensures proper locking of VA-API calls
diff --git a/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch b/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch
deleted file mode 100644
index bd278633f67e..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001
-From: Michael Weiss <dev.primeos@gmail.com>
-Date: Tue, 14 Apr 2020 14:16:10 +0200
-Subject: [PATCH] Enable accelerated video decode on Linux
-
-This will enable accelerated video decode on Linux by default (i.e.
-without "--ignore-gpu-blacklist"), but on NixOS we'll provide
-"--disable-accelerated-video-decode" and
-"--disable-accelerated-video-encode" by default to avoid regressions
-(e.g. VA-API doesn't work properly for some radeon drivers).
-
-Video acceleration can then be enabled via:
-chromium.override { enableVaapi = true; }
-without rebuilding Chromium.
----
- gpu/config/software_rendering_list.json | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index 22712bdbf38f..a06dd19a50e4 100644
---- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -336,22 +336,6 @@
- ]
- },
- {
-- "id": 48,
-- "description": "Accelerated video decode is unavailable on Linux",
-- "cr_bugs": [137247, 1032907],
-- "os": {
-- "type": "linux"
-- },
-- "exceptions": [
-- {
-- "machine_model_name": ["Chromecast"]
-- }
-- ],
-- "features": [
-- "accelerated_video_decode"
-- ]
-- },
-- {
- "id": 50,
- "description": "Disable VMware software renderer on older Mesa",
- "cr_bugs": [145531, 332596, 571899, 629434],
---
-2.11.0
-
From be2f1cb15c1437bd8360d6727c82a086a447d09d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 9 Oct 2020 22:09:37 +0200
Subject: [PATCH 20/47] nixos/doc: Mention fontconfig changes in 20.09 RN
This is a major change but it should not cause any issues.
---
nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 8135bb562c84..f1649284845b 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -1132,8 +1132,10 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
</listitem>
<listitem>
<para>
- The <literal>fontconfig</literal> module stopped generating fontconfig 2.10.x config and cache.
- Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore.
+ The <literal>fontconfig</literal> module stopped generating config and cache files for fontconfig 2.10.x, the <filename>/etc/fonts/fonts.conf</filename> now belongs to the latest fontconfig, just like on other Linux distributions, and we will <link xlink:href="https://github.com/NixOS/nixpkgs/pull/95358">no longer</link> be versioning the config directories.
+ </para>
+ <para>
+ Fontconfig 2.10.x was removed from Nixpkgs since it hasn’t been used in any Nixpkgs package for years now.
</para>
</listitem>
<listitem>
From ea38747ef39add9b2a477523c409ea3f20be045f Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 10 Oct 2020 12:09:52 +0900
Subject: [PATCH 21/47] xdot: add to top-level
---
pkgs/top-level/all-packages.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57ee577e83f6..34a183457626 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8123,6 +8123,8 @@ in
xdelta = callPackage ../tools/compression/xdelta { };
xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { };
+ xdot = with python3Packages; toPythonApplication xdot;
+
xdummy = callPackage ../tools/misc/xdummy { };
xdxf2slob = callPackage ../tools/misc/xdxf2slob { };
From 3145c0e20dd7094fb6e3a86e86459a1ccbb861f9 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 10 Oct 2020 07:19:17 +0300
Subject: [PATCH 22/47] lazpaint: 7.1.3 -> 7.1.4
---
pkgs/applications/graphics/lazpaint/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix
index d8ea4924318e..3f8d507e9927 100644
--- a/pkgs/applications/graphics/lazpaint/default.nix
+++ b/pkgs/applications/graphics/lazpaint/default.nix
@@ -7,24 +7,24 @@ let
bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgrabitmap";
- rev = "v11.1";
- sha256 = "0bcmiiwly4a7w8p3m5iskzvk8rz87qhc0gcijrdvwg87cafd88gz";
+ rev = "v11.2.4";
+ sha256 = "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md";
};
bgracontrols = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgracontrols";
- rev = "v6.7.2";
- sha256 = "0cwxzv0rl6crkf6f67mvga5cn5pyhr6ksm8cqhpxjiqi937dnyxx";
+ rev = "v6.9";
+ sha256 = "0hwjlqlwqs4fqxlgay84hccs1lm3c6i9nmq9sxzrip410mggnjyw";
};
in stdenv.mkDerivation rec {
pname = "lazpaint";
- version = "7.1.3";
+ version = "7.1.4";
src = fetchFromGitHub {
owner = "bgrabitmap";
repo = "lazpaint";
rev = "v${version}";
- sha256 = "1sfb5hmhzscz3nv4cmc192jimkg70l4z3q3yxkivhw1hwwsv9cbg";
+ sha256 = "19b0wrjjyvz3g2d2gdsz8ihc1clda5v22yb597an8j9sblp9m0nf";
};
nativeBuildInputs = [ lazarus fpc makeWrapper ];
From 86630c774d4daa1ed3a7c9620516520ba39d76e0 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 10 Oct 2020 07:29:43 +0300
Subject: [PATCH 23/47] rambox: 0.7.6 -> 0.7.7
---
.../networking/instant-messengers/rambox/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index a067259d1127..cc9fab4d3752 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -3,18 +3,18 @@
}:
let
- version = "0.7.6";
+ version = "0.7.7";
in stdenv.mkDerivation rec {
pname = "rambox";
inherit version;
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
- sha256 = "1v9l5nfd25mq448457hg0mj5bzylh0krk411kbr73s7lbaaww1jl";
+ sha256 = "0bij4f1bkg94gc8pq7r6yfym5zcvwc2ymdnmnmh5m4h1pa1gk6x9";
};
i686-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
- sha256 = "0zhn5hnpl6fpgshp1vwghq6f1hz3f7gds7rjnhky1352cb6cr89i";
+ sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd51rfs";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
From 02cb00240fc16952074b1caf17614ff0f30c17e2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 8 Oct 2020 23:51:55 +0200
Subject: [PATCH 24/47] hwloc: 2.2.0 -> 2.3.0
---
pkgs/development/libraries/hwloc/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 35f8a8484e72..fb315150e083 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
with stdenv.lib;
let
- version = "2.2.0";
+ version = "2.3.0";
versmm = versions.major version + "." + versions.minor version;
name = "hwloc-${version}";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
- sha256 = "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f";
+ sha256 = "0r4a07ag1fv48ql2g64px0wrjpxlvkh6c7mhnkv9xxkkg04zc1xn";
};
configureFlags = [
From 497248a558b66f85e629ea2e35736e948f9e1379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 10 Oct 2020 11:04:33 +0200
Subject: [PATCH 25/47] knot-dns: 3.0.0 -> 3.0.1
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.1
---
pkgs/servers/dns/knot-dns/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 3ebb31e20f24..ae7ac06e2c7f 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "f1c96aff6e873a2f9b1b8c2441d5a7801dd48d3abdb738a4d24b26c2a8fbe6c4";
+ sha256 = "97af6724b04308f691392c80d75564ff8b246871f2f59c4f03cede3c4dd401bb";
};
outputs = [ "bin" "out" "dev" ];
From 83ef8e4393bdddff43948f62b6c8c04a591c3f31 Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Sat, 10 Oct 2020 11:06:51 +0200
Subject: [PATCH 26/47] pythonPackages.shortuuid: disable on Python 2
Compatibility was dropped upstream for release 1.0.0.
---
pkgs/development/python-modules/shortuuid/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix
index 4798bc4ff7e6..4fec2a3f04c0 100644
--- a/pkgs/development/python-modules/shortuuid/default.nix
+++ b/pkgs/development/python-modules/shortuuid/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
+, isPy3k
, fetchPypi
, pep8
}:
@@ -8,6 +9,8 @@ buildPythonPackage rec {
pname = "shortuuid";
version = "1.0.1";
+ disabled = !isPy3k;
+
src = fetchPypi {
inherit pname version;
sha256 = "3c11d2007b915c43bee3e10625f068d8a349e04f0d81f08f5fa08507427ebf1f";
From 7d04bd6da12f2818a180345a070fe9ab310ee537 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sat, 10 Oct 2020 16:57:21 +0700
Subject: [PATCH 27/47] cyclone-scheme: enable parallel build
---
pkgs/development/interpreters/cyclone/default.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix
index 5111cbeb2e3b..60a5fd9e65f6 100644
--- a/pkgs/development/interpreters/cyclone/default.nix
+++ b/pkgs/development/interpreters/cyclone/default.nix
@@ -13,6 +13,8 @@ let
sha256 = "0bb3a7x7vzmdyhm4nilm8bcn4q50pwqryggnxz21n16v6xakwjmr";
};
+ enableParallelBuilding = true;
+
nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
buildInputs = [ libck ];
@@ -31,6 +33,8 @@ stdenv.mkDerivation {
sha256 = "1vb4yaprs2bwbxmxx2zkqvysxx8r9qww2q1nqkz8yps3ji715jw7";
};
+ enableParallelBuilding = true;
+
nativeBuildInputs = [ bootstrap ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
From 33473c422cf26ebc1833aa0628a24245a968230c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Oct 2020 12:51:49 +0200
Subject: [PATCH 28/47] fuse3: 3.9.4 -> 3.10.0 (#100075)
---
pkgs/os-specific/linux/fuse/common.nix | 4 ----
pkgs/os-specific/linux/fuse/default.nix | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 2010be53c2d8..19c64106701e 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -60,10 +60,6 @@ in stdenv.mkDerivation rec {
# ./fuse3-install_man.patch)
install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8
-
- # TODO: Temporary version fix:
- substituteInPlace meson.build \
- --replace "version: '3.9.3'" "version: '${version}'"
'' else ''
sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
./makeconf.sh
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 8c342743dfce..7549f379f8a7 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -11,7 +11,7 @@ in {
};
fuse_3 = mkFuse {
- version = "3.9.4";
- sha256Hash = "1j11niqw3p94yd6mfdrkdra0nic8a38fc179y5h9yz81q39m2f3b";
+ version = "3.10.0";
+ sha256Hash = "05ipzmlk6xci9v4sf0pap542b37aszghlchswl6s76fg6h3w4yms";
};
}
From afbf62d179bff8b3191316eab9890255b512bf78 Mon Sep 17 00:00:00 2001
From: flyfloh <florian.pester@cyberus-technology.de>
Date: Sat, 10 Oct 2020 14:48:37 +0200
Subject: [PATCH 29/47] python3Packages.pymetno: 0.5.1 -> 0.8.1 (#100131)
---
pkgs/development/python-modules/pymetno/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix
index 1e4b0d2adaef..92e26c4f6e53 100644
--- a/pkgs/development/python-modules/pymetno/default.nix
+++ b/pkgs/development/python-modules/pymetno/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "PyMetno";
- version = "0.5.1";
+ version = "0.8.1";
src = fetchFromGitHub {
repo = pname;
owner = "Danielhiversen";
rev = version;
- sha256 = "1ihq1lzgzcxbg916izakx9jp0kp1vdrcdwcwwwsws838wc08ax6m";
+ sha256 = "1jngf0mbn5hn166pqh1ga5snwwvv7n5kv1k9kaksrfibixkvpw6h";
};
propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ];
From e86f68f161e36a4c75a21d9bdffbaeaf562a37dd Mon Sep 17 00:00:00 2001
From: Thiago Franco de Moraes <totonixsame@gmail.com>
Date: Sat, 10 Oct 2020 10:09:08 -0300
Subject: [PATCH 30/47] python3Packages.gdcm: 3.0.7 -> 3.0.8 (#100106)
---
pkgs/development/libraries/gdcm/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index a4b5752e887d..d05e44eae3e5 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -2,12 +2,12 @@
, enablePython ? false, python ? null, swig ? null}:
stdenv.mkDerivation rec {
- version = "3.0.7";
+ version = "3.0.8";
pname = "gdcm";
src = fetchurl {
url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
- sha256 = "1mm1190fv059k2vrilh3znm8z1ilygwld1iazdgh5s04mi1qljni";
+ sha256 = "1q9p0r7wszn51yak9wdp61fd9i0wj3f8ja2frmhk7d1gxic7j1rk";
};
dontUseCmakeBuildDir = true;
From f7aafe6345f6d2fa5db8d6b23f7cf9315d73f67d Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <thibault@gagnaux.ch>
Date: Wed, 7 Oct 2020 19:46:01 +0200
Subject: [PATCH 31/47] bazel_1: fix build on darwin
Use clang_8 instead of clang_7 on darwin to fix thread_local storage error.
---
.../build-managers/bazel/bazel_1/default.nix | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
index 8dcdc71415fa..5eb0926503c8 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
@@ -7,7 +7,7 @@
# updater
, python27, python3, writeScript
# Apple dependencies
-, cctools, libcxx, CoreFoundation, CoreServices, Foundation
+, cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, buildJdkName
@@ -139,8 +139,10 @@ let
'';
};
+ stdenv' = if stdenv.isDarwin then llvmPackages_8.libcxxStdenv else stdenv;
+
in
-stdenv.mkDerivation rec {
+stdenv'.mkDerivation rec {
pname = "bazel";
inherit version;
@@ -348,10 +350,10 @@ stdenv.mkDerivation rec {
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${llvmPackages_8.libcxx}/include/c++/v1"
# don't use system installed Xcode to run clang, use Nix clang instead
- sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
+ sed -i -E "s;/usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9;${stdenv'.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \
src/tools/xcode/realpath/BUILD \
src/tools/xcode/stdredirect/BUILD \
@@ -380,7 +382,7 @@ stdenv.mkDerivation rec {
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils
- sed -i 's|/sbin/md5|md5sum|' \
+ sed -i 's|/sbin/md5|md5sum|g' \
src/BUILD
# substituteInPlace is rather slow, so prefilter the files with grep
@@ -417,8 +419,8 @@ stdenv.mkDerivation rec {
fetch --distdir=${distDir}
build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
- build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
- build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
+ build --linkopt="$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
+ build --host_linkopt="$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
build --host_javabase='@local_jdk//:jdk'
@@ -428,8 +430,8 @@ stdenv.mkDerivation rec {
# add the same environment vars to compile.sh
sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
- -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
- -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
+ -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
+ -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
@@ -469,7 +471,7 @@ stdenv.mkDerivation rec {
makeWrapper
which
customBash
- ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
+ ] ++ lib.optionals (stdenv.isDarwin) [ cctools CoreFoundation CoreServices Foundation ];
# Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the
From 0f5cfbcaf834b2bc1e908caeb4c55ffbfb37836d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 10 Oct 2020 14:05:27 +0000
Subject: [PATCH 32/47] direnv: 2.22.0 -> 2.23.0 (#100146)
---
pkgs/tools/misc/direnv/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 3fb2a5d76a06..e24d8611a433 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "direnv";
- version = "2.22.0";
+ version = "2.23.0";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
- sha256 = "06z85r99w0nr093fawva6sysdlrdsfjjf7asx96k1sjv56sb306m";
+ sha256 = "0m42mg4z04880dwl3iyppq2nda9v883jaxl8221d0xcpkjfm8hjm";
};
# we have no bash at the moment for windows
From 53c0d59ba527d823461343056d9603d4d6605548 Mon Sep 17 00:00:00 2001
From: 1000101 <b1000101@pm.me>
Date: Sat, 10 Oct 2020 16:06:08 +0200
Subject: [PATCH 33/47] stella: 6.2.1 -> 6.3 (#100144)
---
pkgs/misc/emulators/stella/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 4976076e35c5..9a480d8fab41 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "stella";
- version = "6.2.1";
+ version = "6.3";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = version;
- sha256 = "1yhszswwg217x8d2qlcasi9l97y1z6w1pgliys4p27zv5b1ygy7p";
+ sha256 = "0a687qdd1qxdz2wzx557vgylv4c37cpypz2gr7p432rgymmzdcg6";
};
nativeBuildInputs = [ pkgconfig ];
From a4a1b25469d080d77dc1b4d933d1132aaf188d6c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 10 Oct 2020 09:08:58 -0500
Subject: [PATCH 34/47] pythonPackages.internetarchive: 1.9.4 -> 1.9.5
(#100142)
---
.../python-modules/internetarchive/default.nix | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index ecf39000661e..2683f0f1afcf 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -1,5 +1,5 @@
{ buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
, pytest
, six
, tqdm
@@ -19,14 +19,11 @@
buildPythonPackage rec {
pname = "internetarchive";
- version = "1.9.4";
+ version = "1.9.5";
- # Can't use pypi, data files for tests missing
- src = fetchFromGitHub {
- owner = "jjjake";
- repo = "internetarchive";
- rev = "v${version}";
- sha256 = "10xlblj21hanahsmw6lfggbrbpw08pdmvdgds1p58l8xd4fazli8";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "759053685c75e6e969d690043b82643c4016500abcbbc44e4daf52ec097a9a15";
};
propagatedBuildInputs = [
@@ -50,6 +47,8 @@ buildPythonPackage rec {
LC_ALL=en_US.utf-8 pytest tests
'';
+ pythonImportsCheck = [ "internetarchive" ];
+
meta = with lib; {
description = "A Python and Command-Line Interface to Archive.org";
homepage = "https://github.com/jjjake/internetarchive";
From 746a42a15c59e7d4abf4d53f65fd94e049cc6d58 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Sat, 10 Oct 2020 16:09:55 +0200
Subject: [PATCH 35/47] icecast: update homepage link to use HTTPS (#100145)
---
pkgs/servers/icecast/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix
index c7046ea8247e..52f30c7c658c 100644
--- a/pkgs/servers/icecast/default.nix
+++ b/pkgs/servers/icecast/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
open standards for commuincation and interaction.
'';
- homepage = "http://www.icecast.org";
+ homepage = "https://www.icecast.org";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
platforms = with stdenv.lib.platforms; unix;
From b13bb2402be929ad85bb96e5f7ef64f66892e903 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 10 Oct 2020 16:24:27 +0200
Subject: [PATCH 36/47] nix-output-monitor: Add maintainer
---
pkgs/tools/nix/nix-output-monitor/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix
index 3b4e9d34d2f2..b01f1a41429f 100644
--- a/pkgs/tools/nix/nix-output-monitor/default.nix
+++ b/pkgs/tools/nix/nix-output-monitor/default.nix
@@ -28,4 +28,5 @@ mkDerivation {
homepage = "https://github.com/maralorn/nix-output-monitor";
description = "Parses output of nix-build to show additional information";
license = stdenv.lib.licenses.agpl3Plus;
+ maintainers = [ stdenv.lib.maintainers.maralorn ];
}
From bd8dea89cb28e2c4335b53c72042706195a93e13 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 10 Oct 2020 16:18:53 +0200
Subject: [PATCH 37/47] elinks: 0.13.2 -> 0.13.5
---
.../browsers/elinks/debian-patches.nix | 34 --------------
.../browsers/elinks/debian-patches.txt | 8 ----
.../networking/browsers/elinks/default.nix | 47 ++++++++-----------
3 files changed, 20 insertions(+), 69 deletions(-)
delete mode 100644 pkgs/applications/networking/browsers/elinks/debian-patches.nix
delete mode 100644 pkgs/applications/networking/browsers/elinks/debian-patches.txt
diff --git a/pkgs/applications/networking/browsers/elinks/debian-patches.nix b/pkgs/applications/networking/browsers/elinks/debian-patches.nix
deleted file mode 100644
index 07df14767aa6..000000000000
--- a/pkgs/applications/networking/browsers/elinks/debian-patches.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by debian-patches.sh from debian-patches.txt
-let
- prefix = "https://sources.debian.org/data/main/e/elinks/0.13.2-1/debian/patches";
-in
-[
- {
- url = "${prefix}/03_459467_ui.leds.enable_0.diff";
- sha256 = "0l35lglmnvyzz3xyy18nksra14gsp7yc67rskbzmr61szg8b9jqr";
- }
- {
- url = "${prefix}/04_436817_nostrip.diff";
- sha256 = "0ixvxaba1ww375gpdh7r67srp3xsfb5vyz2sfv1pgj6mczwg8v24";
- }
- {
- url = "${prefix}/07_617713_cache_control.diff";
- sha256 = "0drn4r33ywvmihr0drsp2jwz7mlf5z5fv8ra7fpkdavx45xqaf15";
- }
- {
- url = "${prefix}/10-reproducible-build.diff";
- sha256 = "024yp3xsh0hw29l1wikfmk9j3mqval6pdr4xi7rzffrlaknh58h5";
- }
- {
- url = "${prefix}/14_debug_disable_Werror.diff";
- sha256 = "0s620r88ikfljflb5nd133cww2wc0i85ag8lzpvrsmg0q00hfmax";
- }
- {
- url = "${prefix}/16_POST_BUFFER_SIZE.diff";
- sha256 = "17vkvy0d0rabmgk8iqwgdsrgjn6dbb9cf6760qbz82zlb37s09nh";
- }
- {
- url = "${prefix}/11-reproducible-build.diff";
- sha256 = "1z17g9z68lh12fs6fkralfghh8bs1bs5mlq83d15l4bn3za3s0sl";
- }
-]
diff --git a/pkgs/applications/networking/browsers/elinks/debian-patches.txt b/pkgs/applications/networking/browsers/elinks/debian-patches.txt
deleted file mode 100644
index 29efcf2d7a80..000000000000
--- a/pkgs/applications/networking/browsers/elinks/debian-patches.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-elinks/0.13.2-1
-03_459467_ui.leds.enable_0.diff
-04_436817_nostrip.diff
-07_617713_cache_control.diff
-10-reproducible-build.diff
-14_debug_disable_Werror.diff
-16_POST_BUFFER_SIZE.diff
-11-reproducible-build.diff
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 7d67ecdb3767..79f3cb76a01a 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,42 +1,38 @@
-{ stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib, brotli, openssl, autoconf, automake, gettext, pkgconfig, libev
-, gpm
+{ stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib
+, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev
+, gpm, libidn, tre, expat
, # Incompatible licenses, LGPLv3 - GPLv2
enableGuile ? false, guile ? null
, enablePython ? false, python ? null
, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
-, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_38 ? null
+# re-add javascript support when upstream supports modern spidermonkey
}:
assert enableGuile -> guile != null;
assert enablePython -> python != null;
stdenv.mkDerivation rec {
- pname = "elinks-0.13.2";
- version = "0.13.2";
+ pname = "elinks";
+ version = "0.13.5";
- src = fetchurl {
- url = "https://deb.debian.org/debian/pool/main/e/elinks/elinks_${version}.orig.tar.gz";
- sha256 = "0xkpqnqy0x8sizx4snca0pw3q98gkhnw5a05yf144j1x1y2nb14c";
+ src = fetchFromGitHub {
+ owner = "rkd77";
+ repo = "felinks";
+ rev = "v${version}";
+ sha256 = "067l9m47j40039q8mvvnxd1amwrac3x6vv0c0svimfpvj4ammgkg";
};
- patches = map fetchurl (import ./debian-patches.nix);
-
- postPatch = (stdenv.lib.optional stdenv.isDarwin) ''
- patch -p0 < ${fetchpatch {
- url = "https://raw.githubusercontent.com/macports/macports-ports/72bed7749e76b9092ddd8d9fe2d8449c5afb1d71/www/elinks/files/patch-perl.diff";
- sha256 = "14q9hk3kg2n2r5b062hvrladp7b4yzysvhq07903w9kpg4zdbyqh";
- }}
- '';
-
- buildInputs = [ ncurses xlibsWrapper bzip2 zlib brotli openssl libev ]
+ buildInputs = [
+ ncurses xlibsWrapper bzip2 zlib brotli zstd lzma
+ openssl libidn tre expat libev
+ ]
++ stdenv.lib.optional stdenv.isLinux gpm
++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python
++ stdenv.lib.optional enablePerl perl
- ++ stdenv.lib.optional enableSpidermonkey spidermonkey_38
;
- nativeBuildInputs = [ autoconf automake gettext pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook gettext pkgconfig ];
configureFlags = [
"--enable-finger"
@@ -46,23 +42,20 @@ stdenv.mkDerivation rec {
"--enable-bittorrent"
"--enable-nntp"
"--enable-256-colors"
+ "--enable-true-color"
+ "--with-lzma"
"--with-libev"
+ "--with-terminfo"
] ++ stdenv.lib.optional enableGuile "--with-guile"
++ stdenv.lib.optional enablePython "--with-python"
++ stdenv.lib.optional enablePerl "--with-perl"
- ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_38}"
;
- preConfigure = ''
- patchShebangs ./autogen.sh
- ./autogen.sh
- '';
-
meta = with stdenv.lib; {
description = "Full-featured text-mode web browser (package based on the fork felinks)";
homepage = "https://github.com/rkd77/felinks";
license = licenses.gpl2;
platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ iblech ];
+ maintainers = with maintainers; [ iblech gebner ];
};
}
From adf6c2c2d5ac8812b1497d68262030e792b3e650 Mon Sep 17 00:00:00 2001
From: sohalt <sohalt@sohalt.net>
Date: Fri, 25 Sep 2020 01:04:24 +0200
Subject: [PATCH 38/47] ldutils: init at 1.01
---
.../development/libraries/ldutils/default.nix | 41 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 43 insertions(+)
create mode 100644 pkgs/development/libraries/ldutils/default.nix
diff --git a/pkgs/development/libraries/ldutils/default.nix b/pkgs/development/libraries/ldutils/default.nix
new file mode 100644
index 000000000000..6d7745b0e32c
--- /dev/null
+++ b/pkgs/development/libraries/ldutils/default.nix
@@ -0,0 +1,41 @@
+{ mkDerivation
+, lib
+, fetchFromGitLab
+, qtbase
+, qtcharts
+, qtsvg
+, qmake
+}:
+
+mkDerivation rec {
+ pname = "ldutils";
+ version = "1.01";
+
+ src = fetchFromGitLab {
+ owner = "ldutils-projects";
+ repo = pname;
+ rev = "v_${version}";
+ sha256 = "09k2d5wj70xfr3sb4s9ajczq0lh65705pggs54zqqqjxazivbmgk";
+ };
+
+ buildInputs = [
+ qtbase
+ qtcharts
+ qtsvg
+ ];
+
+ nativeBuildInputs = [
+ qmake
+ ];
+
+ LDUTILS_LIB=placeholder "out";
+ LDUTILS_INCLUDE=placeholder "out";
+
+ meta = with lib; {
+ description = "Headers and link library for other ldutils projects";
+ homepage = "https://gitlab.com/ldutils-projects/ldutils";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ sohalt ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a601ff55d54..dbe77fb2be8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15098,6 +15098,8 @@ in
kreport = callPackage ../development/libraries/kreport { };
+ ldutils = callPackage ../development/libraries/ldutils { };
+
libcommuni = callPackage ../development/libraries/libcommuni { };
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
From e96fd6e6b76967f37fe90242bfaa377cda311f71 Mon Sep 17 00:00:00 2001
From: sohalt <sohalt@sohalt.net>
Date: Fri, 25 Sep 2020 01:05:03 +0200
Subject: [PATCH 39/47] zombietrackergps: init at 1.01
---
.../gis/zombietrackergps/default.nix | 57 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 59 insertions(+)
create mode 100644 pkgs/applications/gis/zombietrackergps/default.nix
diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix
new file mode 100644
index 000000000000..4db60e53ad2a
--- /dev/null
+++ b/pkgs/applications/gis/zombietrackergps/default.nix
@@ -0,0 +1,57 @@
+{ mkDerivation
+, lib
+, fetchFromGitLab
+, qmake
+, qtbase
+, qtcharts
+, qtsvg
+, marble
+, qtwebengine
+, ldutils
+}:
+
+mkDerivation rec {
+ pname = "zombietrackergps";
+ version = "1.01";
+
+ src = fetchFromGitLab {
+ owner = "ldutils-projects";
+ repo = pname;
+ rev = "v_${version}";
+ sha256 = "0h354ydbahy8rpkmzh5ym5bddbl6irjzklpcg6nbkv6apry84d48";
+ };
+
+ buildInputs = [
+ ldutils
+ qtbase
+ qtcharts
+ qtsvg
+ marble.dev
+ qtwebengine
+ ];
+
+ nativeBuildInputs = [
+ qmake
+ ];
+
+ prePatch = ''
+ sed -ie "s,INCLUDEPATH += /usr/include/libldutils,INCLUDEPATH += ${ldutils}," ZombieTrackerGPS.pro
+ '';
+
+ preConfigure = ''
+ export LANG=en_US.UTF-8
+ export INSTALL_ROOT=$out
+ '';
+
+ postConfigure = ''
+ substituteInPlace Makefile --replace '$(INSTALL_ROOT)' ""
+ '';
+
+ meta = with lib; {
+ description = "GPS track manager for Qt using KDE Marble maps";
+ homepage = "https://gitlab.com/ldutils-projects/zombietrackergps";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ sohalt ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbe77fb2be8c..9a514492d063 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24647,6 +24647,8 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
+ zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { };
+
zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { };
zotero = callPackage ../applications/office/zotero { };
From 826ed96c109d30ecfe1fc7dab927ded2ec08d0c5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <michael@primeos.dev>
Date: Sat, 10 Oct 2020 12:10:52 +0000
Subject: [PATCH 40/47] nixos/networking: Switch to home.arpa as an example for
the domain
The special-use domain "home.arpa." is designated for non-unique use in
residential home networks [0] and registered as such [1]. Therefore it
is more appropriate than "home." which could cause conflicts or result
in queries that leak out and reach the root name servers.
[0]: https://tools.ietf.org/html/rfc8375
[1]: https://www.iana.org/assignments/special-use-domain-names/special-use-domain-names.xhtml
---
nixos/modules/tasks/network-interfaces.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index d369aab54571..5ddb12d15c31 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -470,7 +470,7 @@ in
networking.search = mkOption {
default = [];
- example = [ "example.com" "local.domain" ];
+ example = [ "example.com" "home.arpa" ];
type = types.listOf types.str;
description = ''
The list of search paths used when resolving domain names.
@@ -479,7 +479,7 @@ in
networking.domain = mkOption {
default = null;
- example = "home";
+ example = "home.arpa";
type = types.nullOr types.str;
description = ''
The domain. It can be left empty if it is auto-detected through DHCP.
From e0fbd72f39c3f825b9147f0b1afd862d532996d2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Oct 2020 18:19:27 +0200
Subject: [PATCH 41/47] pythonPackages.mocket: 3.9.0 -> 3.9.1
---
pkgs/development/python-modules/mocket/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 234fdbebc00b..1a705ab21bc1 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "mocket";
- version = "3.9.0";
+ version = "3.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1n1h9xbi1my0vgjsh7mfkd51qfa6imjzxnwqccsvshqa8grcv1wm";
+ sha256 = "1bp6642qh8fkjqgvp1vif2zbzpappbbq3sgs7vfr87inn4frc2cz";
};
patchPhase = ''
From 61a1ffbcb2c3c5387eb37589ee0a769d31675ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sun, 20 Sep 2020 01:55:56 +0200
Subject: [PATCH 42/47] libavif: init at 0.8.1
---
.../development/libraries/libavif/default.nix | 60 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 62 insertions(+)
create mode 100644 pkgs/development/libraries/libavif/default.nix
diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
new file mode 100644
index 000000000000..7b6d1ecfbb27
--- /dev/null
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -0,0 +1,60 @@
+{ stdenv
+, fetchFromGitHub
+, libaom
+, cmake
+, pkg-config
+, zlib
+, libpng
+, libjpeg
+, dav1d
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libavif";
+ version = "0.8.1";
+
+ src = fetchFromGitHub {
+ owner = "AOMediaCodec";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1fs222cn1d60pv5fjsr92axk5dival70b6yqw0wng5ikk9zsdkhy";
+ };
+
+ # reco: encode libaom slowest but best, decode dav1d fastest
+
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DAVIF_CODEC_AOM=ON"
+ "-DAVIF_CODEC_DAV1D=ON"
+ "-DAVIF_BUILD_APPS=ON"
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ libaom
+ zlib
+ libpng
+ libjpeg
+ dav1d
+ ];
+
+ meta = with stdenv.lib; {
+ description = "C implementation of the AV1 Image File Format";
+ longDescription = ''
+ Libavif aims to be a friendly, portable C implementation of the
+ AV1 Image File Format. It is a work-in-progress, but can already
+ encode and decode all AOM supported YUV formats and bit depths
+ (with alpha). It also features an encoder and a decoder
+ (avifenc/avifdec).
+ '';
+ homepage = "https://github.com/AOMediaCodec/libavif";
+ changelog = "https://github.com/AOMediaCodec/libavif/blob/v${version}/CHANGELOG.md";
+ maintainers = with maintainers; [ mkg20001 ];
+ platforms = platforms.all;
+ license = licenses.bsd2;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04e0f41e13ee..df09e1c939f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13207,6 +13207,8 @@ in
libavc1394 = callPackage ../development/libraries/libavc1394 { };
+ libavif = callPackage ../development/libraries/libavif { };
+
libb2 = callPackage ../development/libraries/libb2 { };
libbap = callPackage ../development/libraries/libbap {
From f93dcb9b6e4a14bb5f4689972bd8e91b9f5bb9ae Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Oct 2020 19:44:00 +0200
Subject: [PATCH 43/47] lf: 16 -> 17
---
pkgs/tools/misc/lf/default.nix | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index a00fd7494d8b..da6fa0a338ef 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,18 +2,16 @@
buildGoModule rec {
pname = "lf";
- version = "16";
+ version = "17";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
- sha256 = "174h6xnm3amayf0wfiai16m8qnkx54h5zy4rs7j3yzycd7sirs5b";
+ sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8";
};
- vendorSha256 = "10na3jzvln353ygcvbhj4243yr83skw5zf3r2n8p6d7i83i86c8w";
-
- doCheck = false;
+ vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs";
nativeBuildInputs = [ installShellFiles ];
From 4a600af1b139c2b6df1ea22809a3fad584684207 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Oct 2020 15:27:47 +0200
Subject: [PATCH 44/47] doc: Document a workaround for using an FQDN as
hostname
Since #76542 this workaround is required to use a FQDN as hostname. See
#94011 and #94022 for the related discussion. Due to some
potential/unresolved issues (legacy software, backward compatibility,
etc.) we're documenting this workaround [0].
[0]: https://github.com/NixOS/nixpkgs/issues/94011#issuecomment-705952300
---
nixos/doc/manual/release-notes/rl-2009.xml | 8 ++++++--
nixos/modules/tasks/network-interfaces.nix | 4 ++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 21686841c284..91a01f0835a2 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -605,8 +605,8 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
<listitem>
<para>
In addition to the hostname, the fully qualified domain name (FQDN),
- which consists of <literal>${cfg.hostName}</literal> and
- <literal>${cfg.domain}</literal> is now added to
+ which consists of <literal>${networking.hostName}</literal> and
+ <literal>${networking.domain}</literal> is now added to
<literal>/etc/hosts</literal>, to allow local FQDN resolution, as used by the
<literal>hostname --fqdn</literal> command and other applications that
try to determine the FQDN. These new entries take precedence over entries
@@ -626,6 +626,10 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
or digit, and have as interior characters only letters, digits, and
hyphen. The maximum length is 63 characters. Additionally it is
recommended to only use lower-case characters.
+ If (e.g. for legacy reasons) a FQDN is required as the Linux kernel network node hostname
+ (<literal>uname --nodename</literal>) the option
+ <literal>boot.kernel.sysctl."kernel.hostname"</literal>
+ can be used as a workaround (but be aware of the 64 character limit).
</para>
</listitem>
<listitem>
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5ddb12d15c31..e5bd57753683 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -391,6 +391,10 @@ in
end with a letter or digit, and have as interior characters only
letters, digits, and hyphen. The maximum length is 63 characters.
Additionally it is recommended to only use lower-case characters.
+ If (e.g. for legacy reasons) a FQDN is required as the Linux kernel
+ network node hostname (uname --nodename) the option
+ boot.kernel.sysctl."kernel.hostname" can be used as a workaround (but
+ the 64 character limit still applies).
'';
};
From d892551a834f826875d892519375c480b7fa7de3 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 14 Sep 2020 11:37:21 +0900
Subject: [PATCH 45/47] vector: 0.8.1 -> 0.10.0; fix Darwin build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/tools/misc/vector/default.nix | 25 ++++++++++++++++++-------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index ddbd78c699c9..37595702b686 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -5,32 +5,43 @@
, features ?
(if stdenv.isAarch64
- then [ "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
- else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
+ then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
+ else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
+, coreutils
+, CoreServices
}:
rustPlatform.buildRustPackage rec {
pname = "vector";
- version = "0.8.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
- sha256 = "0k15scvjcg2v4z80vq27yrn2wm50fp8xj8lga2czzs0zxhlv21nl";
+ sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0";
};
- cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w";
+ cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ]
- ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
+ ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
# needed for internal protobuf c wrapper library
PROTOC="${protobuf}/bin/protoc";
PROTOC_INCLUDE="${protobuf}/include";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
- checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features},disable-resolv-conf -- --test-threads 1";
+ checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
+
+ # recent overhauls of DNS support in 0.9 mean that we try to resolve
+ # vector.dev during the checkPhase, which obviously isn't going to work.
+ # these tests in the DNS module are trivial though, so stubbing them out is
+ # fine IMO.
+ patchPhase = ''
+ substituteInPlace ./src/dns.rs \
+ --replace "#[test]" ""
+ '';
meta = with stdenv.lib; {
description = "A high-performance logs, metrics, and events router";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a514492d063..abef13311ee9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27090,7 +27090,7 @@ in
};
vector = callPackage ../tools/misc/vector {
- inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
epkowa = callPackage ../misc/drivers/epkowa { };
From 959894cb7d0038abe0095a7366a3821cc6cfd1e9 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Sat, 10 Oct 2020 22:00:02 +0300
Subject: [PATCH 46/47] =?UTF-8?q?sile:=200.10.11=20=E2=86=92=200.10.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/tools/typesetting/sile/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 1084ee37ea72..239bafa05c97 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -38,11 +38,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
- version = "0.10.11";
+ version = "0.10.12";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
- sha256 = "0c4azy2iqcj5qg09caqzzjzvig5h0sjilkprphdxvg2bi7dr9g5c";
+ sha256 = "0bxm3vhba289vcgpzbs1hz5fjamf0zgxkr7h8vcsiijjjavmv64a";
};
configureFlags = [
From 4115906195e87b0655402c05c1879b2f4f6549c7 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Sat, 10 Oct 2020 19:37:12 +0000
Subject: [PATCH 47/47] graylog: 3.3.6 -> 3.3.7
Bumps Graylog and integration plugins to version 3.3.7.
---
pkgs/tools/misc/graylog/default.nix | 4 ++--
pkgs/tools/misc/graylog/plugins.nix | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index b610b517f8e3..98fb382e9c20 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
- version = "3.3.6";
+ version = "3.3.7";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
- sha256 = "0yqs5zllaj7v4j9kzfkqxd4n9jdy2656pgai7v05a8wpri4b6sf5";
+ sha256 = "198j1gfw4cw8pi7bzpijd61165a2n4nawp071yhfcyslviv1wmqr";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 60fea1eb541d..34bdb57bb6ed 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -64,10 +64,10 @@ in {
enterprise-integrations = glPlugin rec {
name = "graylog-enterprise-integrations-${version}";
pluginName = "graylog-plugin-enterprise-integrations";
- version = "3.3.6";
+ version = "3.3.7";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
- sha256 = "15sx53ikc49d7a7qlcac9jyx9amrcqqqpk8hwj5lc8iv7d1wnxf9";
+ sha256 = "0m560wrkxdrfa9hrx3lii1vc4z9zp4gy6lgzi2i4igcfhs4drnlk";
};
installPhase = ''
mkdir -p $out/bin
@@ -96,10 +96,10 @@ in {
integrations = glPlugin rec {
name = "graylog-integrations-${version}";
pluginName = "graylog-plugin-integrations";
- version = "3.3.6";
+ version = "3.3.7";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
- sha256 = "11cg0rn10sc1gzip88pm2yzyxighiaafw1vznr3ips307ia0c7hm";
+ sha256 = "1w21ka34y2kdjjf4fd725han8b87vp6mpjnb7pyl2m4wy6srdlvr";
};
installPhase = ''
mkdir -p $out/bin