gebner/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update nixos

Browse Source
This commit is contained in:
Gabriel Ebner 2022-04-25 14:23:54 +02:00
parent 446f271532
commit ab2f9f8f4e
7 changed files with 246 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
168810.patch
View File

@ -1,32 +0,0 @@
From 8def4d308e66b3d145f26500d74c92e9d09a9320 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 15 Apr 2022 13:01:06 -0500
Subject: [PATCH] Revert "cln: fix darwin build"
This reverts commit a3e1e9271e0ff87309d44f9817baadb09b305757.
---
pkgs/development/libraries/cln/default.nix | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 5c5edea0faeca..23bbd84a20963 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,13 +1,12 @@
-{ lib, stdenv, fetchgit, gmp }:
+{ lib, stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
pname = "cln";
version = "1.3.6";
- src = fetchgit {
- url = "git://www.ginac.de/cln.git";
- rev = "cln_${builtins.replaceStrings [ "." ] [ "-" ] version}";
- sha256 = "sha256-P32F4TIDhE2Dwzydq8iFK6ch3kICJcXeeXHs5PBQG88=";
+ src = fetchurl {
+ url = "${meta.homepage}${pname}-${version}.tar.bz2";
+ sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl";
};
buildInputs = [ gmp ];

73
169414.patch Normal file
View File

@ -0,0 +1,73 @@
From aa305e509322a6cefa4660402689b45bbc292f30 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 20 Apr 2022 10:04:50 +0200
Subject: [PATCH 1/2] python3Packages.sentry-sdk: disable tests
disable tests in the wake of Flask and Werkzeug update
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
.../python-modules/sentry-sdk/default.nix | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 3272c4b612f63..8a450023d1f3f 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -112,6 +112,8 @@ buildPythonPackage rec {
"test_auto_session_tracking_with_aggregates"
# Network requests to public web
"test_crumb_capture"
+ # TypeError: cannot unpack non-iterable TestResponse object
+ "test_rpc_error_page"
];
disabledTestPaths = [
@@ -128,7 +130,17 @@ buildPythonPackage rec {
"tests/integrations/rq/"
# broken since pytest 7.0.1; AssertionError: previous item was not torn down properly
"tests/utils/test_contextvars.py"
- ];
+ # broken since Flask and Werkzeug update to 2.1.0 (different error messages)
+ "tests/integrations/flask/test_flask.py"
+ "tests/integrations/bottle/test_bottle.py"
+ "tests/integrations/django/test_basic.py"
+ "tests/integrations/pyramid/test_pyramid.py"
+ ]
+ # test crashes on aarch64
+ ++ (if stdenv.buildPlatform != "x86_64-linux" then [
+ "tests/test_transport.py"
+ "tests/integrations/threading/test_threading.py"
+ ] else [ ]);
pythonImportsCheck = [
"sentry_sdk"
From 9277e0002ae9e99d2cd4ae1452ce4ed3f4e97e92 Mon Sep 17 00:00:00 2001
From: Florian <florian.brandes@posteo.de>
Date: Fri, 22 Apr 2022 09:03:26 +0200
Subject: [PATCH 2/2] Update
pkgs/development/python-modules/sentry-sdk/default.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 8a450023d1f3f..513e0a0acc4f1 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -137,10 +137,10 @@ buildPythonPackage rec {
"tests/integrations/pyramid/test_pyramid.py"
]
# test crashes on aarch64
- ++ (if stdenv.buildPlatform != "x86_64-linux" then [
+ ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
"tests/test_transport.py"
"tests/integrations/threading/test_threading.py"
- ] else [ ]);
+ ];
pythonImportsCheck = [
"sentry_sdk"

87
170238.patch Normal file
View File

@ -0,0 +1,87 @@
From 94f1225197c156725f8d218416e4471462b71010 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 25 Apr 2022 12:51:12 +0200
Subject: [PATCH 1/2] calculix: fix build with gfortran 10
---
pkgs/applications/science/math/calculix/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix
index e9766b32c2a48..44721c560b896 100644
--- a/pkgs/applications/science/math/calculix/default.nix
+++ b/pkgs/applications/science/math/calculix/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ arpack spooles blas lapack ];
- NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles";
+ NIX_CFLAGS_COMPILE = [
+ "-I${spooles}/include/spooles"
+ "-std=legacy"
+ ];
patches = [
./calculix.patch
From 5838726cb99855821d1f465d90a2f9aa9d716750 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 25 Apr 2022 12:56:36 +0200
Subject: [PATCH 2/2] calculix: 2.17 -> 2.19
---
.../science/math/calculix/calculix.patch | 19 ++++++++++---------
.../science/math/calculix/default.nix | 4 ++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch
index 2334d54711e5a..36048546948c5 100644
--- a/pkgs/applications/science/math/calculix/calculix.patch
+++ b/pkgs/applications/science/math/calculix/calculix.patch
@@ -1,7 +1,8 @@
-diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile
---- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200
-+++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200
-@@ -18,15 +18,10 @@
+diff --git a/ccx_2.19/src/Makefile b/ccx_2.19/src/Makefile
+index c503513..8a69a0c 100755
+--- a/ccx_2.19/src/Makefile
++++ b/ccx_2.19/src/Makefile
+@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
OCCXC = $(SCCXC:.c=.o)
OCCXMAIN = $(SCCXMAIN:.c=.o)
@@ -13,10 +14,10 @@ diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
-
--ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS)
-- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
-+ccx_2.17: $(OCCXMAIN) ccx_2.17.a
-+ $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
+-ccx_2.19: $(OCCXMAIN) ccx_2.19.a $(LIBS)
+- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
++ccx_2.19: $(OCCXMAIN) ccx_2.19.a
++ $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
- ccx_2.17.a: $(OCCXF) $(OCCXC)
+ ccx_2.19.a: $(OCCXF) $(OCCXC)
ar vr $@ $?
diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix
index 44721c560b896..df943277a627e 100644
--- a/pkgs/applications/science/math/calculix/default.nix
+++ b/pkgs/applications/science/math/calculix/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "calculix";
- version = "2.17";
+ version = "2.19";
src = fetchurl {
url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2";
- sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a";
+ sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7";
};
nativeBuildInputs = [ gfortran ];

23
170241.patch Normal file
View File

@ -0,0 +1,23 @@
From 795cd44716f1885febec24a4ecc392baca531184 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 25 Apr 2022 13:41:27 +0200
Subject: [PATCH] libechonest: fix build with gcc 11
---
pkgs/development/libraries/libechonest/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix
index 29a0a63a03e7f..6f160bdb6dcc3 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/pkgs/development/libraries/libechonest/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq";
};
+ # Fix build with GCC 11.
+ NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
+
patches = [
(fetchpatch {
url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch";

59
170244.patch Normal file
View File

@ -0,0 +1,59 @@
From 1a9e59acb740170445dc5d7f5c11d72c32d85e3f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 25 Apr 2022 14:13:17 +0200
Subject: [PATCH] clementine: 1.4.0rc1 -> unstable-2022-04-11
---
pkgs/applications/audio/clementine/default.nix | 13 +++----------
pkgs/top-level/all-packages.nix | 4 ++--
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 550100574db40..3c9e35c8726bb 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -51,24 +51,17 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
- # On the update after all 1.4rc, qt5.15 and protobuf 3.15 will be supported.
- version = "1.4.0rc1";
+ version = "unstable-2022-04-11";
src = fetchFromGitHub {
owner = "clementine-player";
repo = "Clementine";
- rev = version;
- sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2";
+ rev = "250024e117fbe5fae7c62b9c8e655d66412a6ed7";
+ sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf";
};
patches = [
./clementine-spotify-blob.patch
- (fetchpatch {
- # "short-term" fix for execution on wayland (1.4.0rc1-131-g2179027a6)
- # for https://github.com/clementine-player/Clementine/issues/6587
- url = "https://github.com/clementine-player/Clementine/commit/2179027a6d97530c857e43be873baacd696ff332.patch";
- sha256 = "0344bfcyvjim5ph8w4km6zkg96rj5g9ybp9x14qgyw2gkdksimn6";
- })
];
nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23880ad0816b5..94207b8b6627b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4536,10 +4536,10 @@ with pkgs;
cksfv = callPackage ../tools/networking/cksfv { };
- clementine = libsForQt514.callPackage ../applications/audio/clementine {
+ clementine = libsForQt5.callPackage ../applications/audio/clementine {
gst_plugins =
with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
- protobuf = protobuf3_14;
+ protobuf = protobuf3_19;
};
clementineUnfree = clementine.unfree;

6
flake.lock
View File

@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1650161686,
"narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
"lastModified": 1650701402,
"narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
"rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -15,7 +15,7 @@
channels.nixpkgs.input = nixpkgs;
channels.nixpkgs.patches = [ ./168810.patch ];
channels.nixpkgs.patches = [ ./170238.patch ./170241.patch ./170244.patch ./169414.patch ];
nix.generateRegistryFromInputs = true;