From dd36e04b3972584423f44f194448341c6565279d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 26 Apr 2022 21:38:10 +0200 Subject: [PATCH] update nixos --- 170238.patch | 87 ---------------------------------------------------- 170241.patch | 23 -------------- 170244.patch | 59 ----------------------------------- flake.lock | 6 ++-- flake.nix | 2 +- 5 files changed, 4 insertions(+), 173 deletions(-) delete mode 100644 170238.patch delete mode 100644 170241.patch delete mode 100644 170244.patch diff --git a/170238.patch b/170238.patch deleted file mode 100644 index 020dbfd..0000000 --- a/170238.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 94f1225197c156725f8d218416e4471462b71010 Mon Sep 17 00:00:00 2001 -From: Gabriel Ebner -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 -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 ]; diff --git a/170241.patch b/170241.patch deleted file mode 100644 index 2a89336..0000000 --- a/170241.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 795cd44716f1885febec24a4ecc392baca531184 Mon Sep 17 00:00:00 2001 -From: Gabriel Ebner -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"; diff --git a/170244.patch b/170244.patch deleted file mode 100644 index e8bfaac..0000000 --- a/170244.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 1a9e59acb740170445dc5d7f5c11d72c32d85e3f Mon Sep 17 00:00:00 2001 -From: Gabriel Ebner -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; diff --git a/flake.lock b/flake.lock index cb94dd3..46b0089 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650831523, - "narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=", + "lastModified": 1650920067, + "narHash": "sha256-iV+7zkBZsHiy4epfcyoiW8lRXdjZXq6h8RfNcaua4Fc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0", + "rev": "6a323903ad07de6680169bb0423c5cea9db41d82", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2d372ff..47a420b 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ channels.nixpkgs.input = nixpkgs; - channels.nixpkgs.patches = [ ./170238.patch ./170241.patch ./170244.patch ]; + channels.nixpkgs.patches = [ ]; nix.generateRegistryFromInputs = true;