From a6f2bb06867d413eb21d0422f54fd621f4a6d7d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 10 Dec 2020 13:55:04 +0000
Subject: [PATCH 01/29] compactor: 1.0.0 -> 1.1.0
---
pkgs/applications/networking/compactor/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index 97a2f6992f9a..ed04e90bcdec 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "compactor";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "dns-stats";
repo = pname;
rev = version;
- sha256 = "0x5rwbv0ndf9zcvnsbd78ic6shh9hd0bh3gh0lzz9wlb99lslbkk";
+ sha256 = "0qykdnwi2q9sajkkc2sl5f00lvxjfymqjzqm0limsziykanh87c0";
};
# cbor-diag, cddl and wireshark-cli are only used for tests.
From 17bb16f5c5237ebacb0f22f903b1f3287a27d513 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 10 Dec 2020 22:14:09 +0000
Subject: [PATCH 02/29] odpic: 4.0.2 -> 4.1.0
---
pkgs/development/libraries/odpic/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 7f27f7d1c179..22d48c8c6092 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
let
- version = "4.0.2";
+ version = "4.1.0";
libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ];
in stdenv.mkDerivation {
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
owner = "oracle";
repo = "odpi";
rev = "v${version}";
- sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl";
+ sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
From d039fa656132e2f5796d326b3b876a28e86f7cb5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 10 Dec 2020 22:27:50 +0000
Subject: [PATCH 03/29] oneDNN: 1.7 -> 2.0
---
pkgs/development/libraries/oneDNN/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index 6dc4bd704dd0..2b399e9ebc29 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
- version = "1.7";
+ version = "2.0";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
- sha256 = "15kanz3zflmxr355dhny4rdycq0ni9iz42vvlblzc5lmj39n84fj";
+ sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq";
};
outputs = [ "out" "dev" "doc" ];
From 2b90af2d5397f9e8fc3192bb706d1b77c6d26bf8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 Dec 2020 02:20:27 +0000
Subject: [PATCH 04/29] skaffold: 1.17.1 -> 1.17.2
---
pkgs/development/tools/skaffold/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 0f29fc741c63..fc1f5c3f3173 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "skaffold";
- version = "1.17.1";
+ version = "1.17.2";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "1q1rzqsga728cjv89lpgnwjb22azlmkffki9m0q21r1njzc3w74h";
+ sha256 = "1sn4pmikap93kpdgcalgb3nam7zp60ck6wmynsv8dnzihrr7ycm3";
};
nativeBuildInputs = [ installShellFiles ];
From 9908e2f2cc16c020479fb457e5a3a21e7295f5a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 Dec 2020 03:41:08 +0000
Subject: [PATCH 05/29] thanos: 0.17.1 -> 0.17.2
---
pkgs/servers/monitoring/thanos/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 8d1441489757..f6415ca89852 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,13 +1,13 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
- version = "0.17.1";
+ version = "0.17.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
- sha256 = "07814hk6nmvvkf7xklrin24vp17wm6nby358gk20ri4man822q8c";
+ sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6";
};
vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8";
From 82bf100ef4c9599c6db5dc10d44e4e1e76427189 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 Dec 2020 06:50:10 +0000
Subject: [PATCH 06/29] aspellDicts.en: 2019.10.06-0 -> 2020.12.07-0
---
pkgs/development/libraries/aspell/dictionaries.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index bc2a189a887a..d40f4b5aae42 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -298,10 +298,10 @@ in rec {
en = buildOfficialDict {
language = "en";
- version = "2019.10.06-0";
+ version = "2020.12.07-0";
fullName = "English";
filename = "aspell6";
- sha256 = "1zai9wrqwgb9z9vfgb22qhrvxvg73jg0ix44j1khm2f6m96lncr4";
+ sha256 = "1cwzqkm8gr1w51rpckwlvb43sb0b5nbwy7s8ns5vi250515773sc";
};
eo = buildOfficialDict {
From 37374b40444d4ee2ec7459e68f1b42d98dcb50a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 Dec 2020 10:54:18 +0000
Subject: [PATCH 07/29] cgal_5: 5.1 -> 5.1.1
---
pkgs/development/libraries/CGAL/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 6824cb7f1835..1979bdf5df17 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cgal";
- version = "5.1";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "0rcv86hn5aqna7vr9nfk4np778qjr7l3742v58w6qw0z4y6l1km0";
+ sha256 = "1h4kj37zh60zap1gvpkvcl1b1lbdvav959gd59pq2c33i0ziagf6";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
From 8c7ada275ad753885d13368e349a85ed3a7fd4fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 Dec 2020 12:40:41 +0000
Subject: [PATCH 08/29] dehydrated: 0.6.5 -> 0.7.0
---
pkgs/tools/admin/dehydrated/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index 6cc69c2290d4..e6b909a0a5bd 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,13 +1,13 @@
{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }:
stdenv.mkDerivation rec {
pname = "dehydrated";
- version = "0.6.5";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "lukas2511";
repo = "dehydrated";
rev = "v${version}";
- sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv";
+ sha256 = "09jhmkjvnj98zbf92qwdr5rr7pc6v63xzyk2fbi177r7szb2yg09";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
From 237fbca5d024c2ca231c75f232ec7ae4a1da057e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 Dec 2020 14:42:05 +0000
Subject: [PATCH 09/29] eksctl: 0.33.0 -> 0.34.0
---
pkgs/tools/admin/eksctl/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index c375b0987dc4..6f38b14f44be 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.33.0";
+ version = "0.34.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "1rhiak1264czcww5ayz35am9nsn5xa3kjd90szssg46ngxisd61x";
+ sha256 = "1n2mvnis6r5vpb60jlb3c84sllsbvy93gzsds54igsp6l3zngq19";
};
- vendorSha256 = "1s9xhq1k67gf9saada1dr95n1sd265hndkxz0alqw6dm2vdp3n2q";
+ vendorSha256 = "0ggxilp44mm81b8hrxyb7642vy2q1109yz619z97mgvk0drhkhc0";
doCheck = false;
From de3d3dfe738ee68263905192baeffee4eecb239a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <programming@manuelbaerenz.de>
Date: Fri, 11 Dec 2020 17:24:06 +0100
Subject: [PATCH 10/29] krusader: Unpin qt514 -> qt515
As requested in https://github.com/NixOS/nixpkgs/pull/104474
---
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 e92f226effab..d28dd05f038c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22308,7 +22308,7 @@ in
openjpeg = openjpeg_1;
};
- krusader = libsForQt514.callPackage ../applications/misc/krusader { };
+ krusader = libsForQt5.callPackage ../applications/misc/krusader { };
ksuperkey = callPackage ../tools/X11/ksuperkey { };
From 14511fe562919d29feb86590a94579fa3a5f4c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 11 Dec 2020 17:13:54 +0100
Subject: [PATCH 11/29] lizardfs: 3.12.0 -> 3.13.0-rc3
---
.../cmake-def-spdlog-fmt-external.patch | 11 ------
pkgs/tools/filesystems/lizardfs/default.nix | 39 ++++---------------
2 files changed, 8 insertions(+), 42 deletions(-)
delete mode 100644 pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch
diff --git a/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch b/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch
deleted file mode 100644
index 51ffa92652e3..000000000000
--- a/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2020-12-10 10:39:37.775694976 +0100
-+++ b/CMakeLists.txt 2020-12-10 10:40:41.984575938 +0100
-@@ -127,6 +127,7 @@
- add_definitions(-D__STDC_LIMIT_MACROS)
- add_definitions(-D__STDC_CONSTANT_MACROS)
- add_definitions(-D__STDC_FORMAT_MACROS)
-+add_definitions(-DSPDLOG_FMT_EXTERNAL)
- if(MINGW)
- add_definitions(-DWINVER=0x0602)
- add_definitions(-D_WIN32_WINNT=0x0602)
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index 13086c067b0a..e0bb39a6f0bc 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -3,7 +3,7 @@
, fetchpatch
, cmake
, makeWrapper
-, python2
+, python3
, db
, fuse
, asciidoc
@@ -17,50 +17,27 @@
, pam
, spdlog
, fmt
+, systemdMinimal
, zlib # optional
}:
stdenv.mkDerivation rec {
pname = "lizardfs";
- version = "3.12.0";
+ version = "3.13.0-rc3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "v${version}";
- sha256 = "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax";
+ rev = version;
+ sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
};
- patches = [
- # Use system-provided spdlog instead of downloading an old one (next two patches)
- (fetchpatch {
- url = "https://salsa.debian.org/debian/lizardfs/raw/d003c371/debian/patches/system-spdlog.patch";
- sha256 = "1znpqqzb0k5bb7s4d7abfxzn5ry1khz8r76sb808c95cpkw91a9i";
- })
- (fetchpatch {
- url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch";
- sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md";
- })
- # Fix https://github.com/lizardfs/lizardfs/issues/655
- # (Remove upon update to 3.13)
- (fetchpatch {
- url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch";
- sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv";
- })
- # Add SPDLOG_FMT_EXTERNAL flag to disable spdlog from using bundled fmt
- # Would use https://github.com/lizardfs/lizardfs/commit/31b0cd40f84ee75f99643ad19122061e3d6fb6cc.patch
- # if it didn't failed to patch
- ./cmake-def-spdlog-fmt-external.patch
- ];
-
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
- buildInputs =
- [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
- zlib boost judy pam spdlog fmt python2
+ buildInputs = [
+ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
+ zlib boost judy pam spdlog fmt python3 systemdMinimal
];
-
- cmakeFlags = [ "-DSPDLOG_FMT_EXTERNAL=ON" ];
meta = with stdenv.lib; {
homepage = "https://lizardfs.com";
From 42c1f577bb020db763964e7d903ca83b3d67e550 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 Dec 2020 18:30:06 +0000
Subject: [PATCH 12/29] flyctl: 0.0.153 -> 0.0.154
---
pkgs/development/web/flyctl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 72525a9808f7..63d60547bec0 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.153";
+ version = "0.0.154";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "1an6j4bv9ib5rn78dbn8h1pdkw3fcd3fdrymhvr6909pvcz7bbgy";
+ sha256 = "0hf33jm0ph4a79jg9irz0ynvdyah942cm5hb6j04hmg24x1037jm";
};
preBuild = ''
From e65e9146aab9a8d0c02dba9179567637824069c1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 12 Dec 2020 00:00:00 +0000
Subject: [PATCH 13/29] lxd: 4.8 -> 4.9
---
pkgs/tools/admin/lxd/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 9bff8332c34b..0a079c5107f9 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
- version = "4.8";
+ version = "4.9";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy";
+ sha256 = "0sq3avgsrdzkbsil0xsri60xxi0bzf4l6w43w23lbhacrby1spj4";
};
postPatch = ''
From 77a849690798ae0c1acd6f5a8e8b6106ae9d11c9 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 25 Nov 2020 08:14:48 -0500
Subject: [PATCH 14/29] nixos/mpd: conditionally provision required directories
with StateDirectory
---
nixos/modules/services/audio/mpd.nix | 72 +++++++++++++++++-----------
nixos/tests/mpd.nix | 6 ++-
2 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index ba20b1b98d97..e09e4861646c 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -66,7 +66,10 @@ in {
default = "${cfg.dataDir}/music";
defaultText = ''''${dataDir}/music'';
description = ''
- The directory or NFS/SMB network share where mpd reads music from.
+ The directory or NFS/SMB network share where MPD reads music from. If left
+ as the default value this directory will automatically be created before
+ the MPD server starts, otherwise the sysadmin is responsible for ensuring
+ the directory exists with appropriate ownership and permissions.
'';
};
@@ -75,7 +78,10 @@ in {
default = "${cfg.dataDir}/playlists";
defaultText = ''''${dataDir}/playlists'';
description = ''
- The directory where mpd stores playlists.
+ The directory where MPD stores playlists. If left as the default value
+ this directory will automatically be created before the MPD server starts,
+ otherwise the sysadmin is responsible for ensuring the directory exists
+ with appropriate ownership and permissions.
'';
};
@@ -94,8 +100,10 @@ in {
type = types.path;
default = "/var/lib/${name}";
description = ''
- The directory where MPD stores its state, tag cache,
- playlists etc.
+ The directory where MPD stores its state, tag cache, playlists etc. If
+ left as the default value this directory will automatically be created
+ before the MPD server starts, otherwise the sysadmin is responsible for
+ ensuring the directory exists with appropriate ownership and permissions.
'';
};
@@ -185,36 +193,42 @@ in {
};
};
- systemd.tmpfiles.rules = [
- "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
- "d '${cfg.playlistDirectory}' - ${cfg.user} ${cfg.group} - -"
- ];
-
systemd.services.mpd = {
after = [ "network.target" "sound.target" ];
description = "Music Player Daemon";
wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
- serviceConfig = {
- User = "${cfg.user}";
- ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf";
- ExecStartPre = pkgs.writeScript "mpd-start-pre" ''
- #!${pkgs.runtimeShell}
- set -euo pipefail
- cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf
- '';
- Type = "notify";
- LimitRTPRIO = 50;
- LimitRTTIME = "infinity";
- ProtectSystem = true;
- NoNewPrivileges = true;
- ProtectKernelTunables = true;
- ProtectControlGroups = true;
- ProtectKernelModules = true;
- RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
- RestrictNamespaces = true;
- Restart = "always";
- };
+ serviceConfig = mkMerge [
+ {
+ User = "${cfg.user}";
+ ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf";
+ ExecStartPre = pkgs.writeScript "mpd-start-pre" ''
+ #!${pkgs.runtimeShell}
+ set -euo pipefail
+ cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf
+ '';
+ Type = "notify";
+ LimitRTPRIO = 50;
+ LimitRTTIME = "infinity";
+ ProtectSystem = true;
+ NoNewPrivileges = true;
+ ProtectKernelTunables = true;
+ ProtectControlGroups = true;
+ ProtectKernelModules = true;
+ RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
+ RestrictNamespaces = true;
+ Restart = "always";
+ }
+ (mkIf (cfg.dataDir == "/var/lib/${name}") {
+ StateDirectory = [ name ];
+ })
+ (mkIf (cfg.playlistDirectory == "/var/lib/${name}/playlists") {
+ StateDirectory = [ name "${name}/playlists" ];
+ })
+ (mkIf (cfg.musicDirectory == "/var/lib/${name}/music") {
+ StateDirectory = [ name "${name}/music" ];
+ })
+ ];
};
environment.etc."mpd.conf" = {
mode = "0640";
diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
index 60aef586ad5c..7af8640de71c 100644
--- a/nixos/tests/mpd.nix
+++ b/nixos/tests/mpd.nix
@@ -27,10 +27,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
after = [ "mpd.service" ];
wantedBy = [ "default.target" ];
script = ''
- mkdir -p ${musicDirectory} && chown -R ${user}:${group} ${musicDirectory}
cp ${track} ${musicDirectory}
- chown ${user}:${group} ${musicDirectory}/$(basename ${track})
'';
+ serviceConfig = {
+ User = user;
+ Group = group;
+ };
};
mkServer = { mpd, musicService, }:
From b491aac6178dc632df21955d89deb8d159bc2c4c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 Dec 2020 02:32:27 +0000
Subject: [PATCH 15/29] jruby: 9.2.13.0 -> 9.2.14.0
---
pkgs/development/interpreters/jruby/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 8d27bfb64f8b..9159f026e1f3 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
- version = "9.2.13.0";
+ version = "9.2.14.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
- sha256 = "0n5glz6xm3skrfihzn3g5awdxpjsqn2k8k46gv449rk2l50w5a3k";
+ sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj";
};
buildInputs = [ makeWrapper ];
From 028f711404e0aa4dd5b4bedcb806db9c6e7dceaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 9 Dec 2020 20:05:15 +0100
Subject: [PATCH 16/29] drone: 1.9.0 -> 1.10.0
---
.../tools/continuous-integration/drone/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 307dda4f993b..7a7f0d023d80 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,9 +2,9 @@
buildGoModule rec {
name = "drone.io-${version}";
- version = "1.9.0";
+ version = "1.10.0";
- vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx";
+ vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0=";
doCheck = false;
@@ -12,7 +12,7 @@ buildGoModule rec {
owner = "drone";
repo = "drone";
rev = "v${version}";
- sha256 = "1lsyd245fr1f74rpccvvw41h5g75b79afrb8g589bj13ggjav0xy";
+ sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34=";
};
meta = with stdenv.lib; {
From 5f85210b929bb95b0926204bafa37ba90a30b4bd Mon Sep 17 00:00:00 2001
From: James Simpson <edenofest@gmail.com>
Date: Wed, 9 Dec 2020 17:36:09 -0500
Subject: [PATCH 17/29] just: 0.7.1 -> 0.8.3
---
pkgs/development/tools/just/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index ebf44d9d699b..05b2b50f26f6 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "0.7.1";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
- sha256 = "07fjixz8y5rxfwpyr1kiimnn27jhc20gacd17i0yvfcpy5qf8z5p";
+ sha256 = "4B72VYQ+HBvhGQNl577DuZpvWNIvv/6fejRQtVKtFKY=";
};
- cargoSha256 = "1zn0kiqi8p25lscjd661gczay631nwzadl36cfzqnbww6blayy1j";
+ cargoSha256 = "uOOpDRWPSoH49NTu82rDxxDR/2icoe4ECxVQb/J/45w=";
nativeBuildInputs = [ installShellFiles ];
@@ -38,9 +38,9 @@ rustPlatform.buildRustPackage rec {
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
'';
- # Skip "edit" when running "cargo test",
- # since this test case needs "cat".
- checkFlagsArray = [ "--skip=edit" ];
+ # Skip "edit" when running "cargo test", since this test case needs "cat".
+ # Skip "choose" when running "cargo test", since this test case needs "fzf".
+ checkFlags = [ "--skip=choose" "--skip=edit" ];
meta = with stdenv.lib; {
description = "A handy way to save and run project-specific commands";
From 74c525ddc6bce51dd0d91d848f7f5447b18b2734 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sat, 12 Dec 2020 16:46:32 +0100
Subject: [PATCH 18/29] linux_zen: 5.9.13 -> 5.9.14
---
pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 04c6486c374f..5ac81d6ebb94 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildLinux, ... } @ args:
let
- version = "5.9.13";
+ version = "5.9.14";
in
buildLinux (args // {
@@ -13,7 +13,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-zen1";
- sha256 = "13sv794srmf1p13pb07pl6c4fxw2f1vjkxj8dkdgfhy03b0iasa2";
+ sha256 = "1b8pm80z49d7qk9mvdf9w3hih34pilqr1zjk110q5im1kdz81zrg";
};
extraMeta = {
From 227853f4735b39a0aa4645d6b4d02d064ff7b5fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 Dec 2020 16:58:14 +0000
Subject: [PATCH 19/29] python37Packages.deform: 2.0.14 -> 2.0.15
---
pkgs/development/python-modules/deform/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index 5b3a6e7281ec..bc84df26a278 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "deform";
- version = "2.0.14";
+ version = "2.0.15";
src = fetchPypi {
inherit pname version;
- sha256 = "35d9acf144245772a70d05bd24b8263e8cd284f0d564011e8bf331d6150acfc7";
+ sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367";
};
postPatch = ''
From e7525e2c7ab61770893c76a21511a70a008b6fe5 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sat, 12 Dec 2020 18:53:54 +0100
Subject: [PATCH 20/29] mapmap: build with libsForQt5
---
pkgs/applications/video/mapmap/default.nix | 5 +++++
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 7320deaf4ce4..003da6e6a941 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -46,6 +46,11 @@ mkDerivation rec {
url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch";
sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l";
})
+ # fix build with libsForQt515
+ (fetchpatch {
+ url = "https://github.com/mapmapteam/mapmap/pull/518/commits/ac49acc1e2ec839832b86838e93a8c13030affeb.patch";
+ sha256 = "sha256-tSLbyIDv5mSejnw9oru5KLAyQqjgJLLREKQomEUcGt8=";
+ })
];
installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e9cfe3dfaa4..dcabc90d7d40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22589,7 +22589,7 @@ in
mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { };
- mapmap = libsForQt514.callPackage ../applications/video/mapmap { };
+ mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
marathonctl = callPackage ../tools/virtualization/marathonctl { } ;
From 860adac4abf1288c44069180d494898c87fd84e2 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 12 Dec 2020 19:37:09 +0100
Subject: [PATCH 21/29] goldendict: 2020-05-27 -> 2020-12-09
---
pkgs/applications/misc/goldendict/default.nix | 6 +++---
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 57a40f8d1877..65848fac95ec 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "goldendict";
- version = "2020-05-27";
+ version = "2020-12-09";
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
- rev = "ec40c1dcfde6df1dc7950443b46ae22c283b1e52";
- sha256 = "1zmnwwnpnrqfyf7vmmh38r95q2fl4cqzbkp69bcwkr0xc80wgyz7";
+ rev = "261e45a5d79f9df2fbc050292410bed0f4ef3132";
+ sha256 = "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n";
};
patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e9cfe3dfaa4..4526e5df5b53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21310,7 +21310,7 @@ in
gnuradio = gnuradio3_7-unwrapped;
};
- goldendict = libsForQt514.callPackage ../applications/misc/goldendict {
+ goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
};
From 43ec3b93d350fc0fb4592da662a4421ee29d805e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 Dec 2020 18:49:43 +0000
Subject: [PATCH 22/29] python37Packages.chalice: 1.21.5 -> 1.21.6
---
pkgs/development/python-modules/chalice/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index f447fa7e0728..42018661f741 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "chalice";
- version = "1.21.5";
+ version = "1.21.6";
src = fetchPypi {
inherit pname version;
- sha256 = "73149f6a71aa1310f3d000110a915164a72f1d2dc7cd4d37d18a952b0e0c78ac";
+ sha256 = "b7a17583e0553caa0e44d23186b4aad069f7665c24a473104d1f04e62cc4cb07";
};
checkInputs = [ watchdog pytest hypothesis mock ];
From b51fbe0ee782acc8ae6393102e8a60de1289c32c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 Dec 2020 19:58:14 +0000
Subject: [PATCH 23/29] python37Packages.genanki: 0.10.0 -> 0.10.1
---
pkgs/development/python-modules/genanki/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
index 17944b452828..bda80fe9e752 100644
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "genanki";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b4049621469be115bb13b6ff90994c4c68ef9e7e72e6a98d4a3ada629f163a11";
+ sha256 = "ced1ddcaecc37289c65c26affb20027705e3821e692327e354e0d5b9b0fd8446";
};
propagatedBuildInputs = [
From 3043fe5b849c48cf242ec59d1ee1cf0778a107e8 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sylvain.fankhauser@liip.ch>
Date: Sat, 12 Dec 2020 21:02:59 +0100
Subject: [PATCH 24/29] element-desktop: associate with element:// links
(#106750)
---
.../networking/instant-messengers/element/element-desktop.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index d5dac9655ef4..6f6b335430b8 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -60,7 +60,7 @@ in mkYarnPackage rec {
# https://github.com/vector-im/riot-desktop/blob/develop/package.json
desktopItem = makeDesktopItem {
name = "element-desktop";
- exec = executableName;
+ exec = "${executableName} %u";
icon = "element";
desktopName = "Element (Riot)";
genericName = "Matrix Client";
@@ -68,6 +68,7 @@ in mkYarnPackage rec {
categories = "Network;InstantMessaging;Chat;";
extraEntries = ''
StartupWMClass=element
+ MimeType=x-scheme-handler/element;
'';
};
From 4970fbedbcab6f7a9d4030952c0a01c33b0f4e97 Mon Sep 17 00:00:00 2001
From: Matej Urbas <matej.urbas@gmail.com>
Date: Mon, 7 Dec 2020 12:15:38 +0000
Subject: [PATCH 25/29] nixos/prometheus-exporters/py-air-control: invoke
exporter command
Package `py-air-control exporter` v0.1.5 comes with a new CLI. This change uses the new CLI (which simplifies the exporter's systemd service setup).
---
.../prometheus/exporters/py-air-control.nix | 21 ++++++-------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix b/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix
index d9a627ca2eaf..d9ab99221d9d 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix
@@ -5,10 +5,6 @@ with lib;
let
cfg = config.services.prometheus.exporters.py-air-control;
- py-air-control-exporter-env = pkgs.python3.withPackages (pyPkgs: [
- pyPkgs.py-air-control-exporter
- ]);
-
workingDir = "/var/lib/${cfg.stateDir}";
in
@@ -45,18 +41,13 @@ in
StateDirectory = cfg.stateDir;
WorkingDirectory = workingDir;
ExecStart = ''
- ${py-air-control-exporter-env}/bin/python -c \
- "from py_air_control_exporter import app; app.create_app().run( \
- debug=False, \
- port=${toString cfg.port}, \
- host='${cfg.listenAddress}', \
- )"
+ ${pkgs.python3Packages.py-air-control-exporter}/bin/py-air-control-exporter \
+ --host ${cfg.deviceHostname} \
+ --protocol ${cfg.protocol} \
+ --listen-port ${toString cfg.port} \
+ --listen-address ${cfg.listenAddress}
'';
- Environment = [
- "PY_AIR_CONTROL_HOST=${cfg.deviceHostname}"
- "PY_AIR_CONTROL_PROTOCOL=${cfg.protocol}"
- "HOME=${workingDir}"
- ];
+ Environment = [ "HOME=${workingDir}" ];
};
};
}
From 5a923e552cba2bb56fca22ee6c01482635c5b908 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 12 Dec 2020 15:18:30 -0500
Subject: [PATCH 26/29] rustc: add host platform to --target when building
cross-compiler
As of 1.48, std is only built for platforms in --target. If the host platform is
not included, the resulting rustc can't compile build.rs scripts.
---
pkgs/development/compilers/rust/rustc.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index dab1f2a6bd81..a290eb11755f 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -11,7 +11,7 @@
}:
let
- inherit (stdenv.lib) optionals optional optionalString;
+ inherit (stdenv.lib) optionals optional optionalString concatStringsSep;
inherit (darwin.apple_sdk.frameworks) Security;
llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
@@ -72,7 +72,14 @@ in stdenv.mkDerivation rec {
"--enable-vendor"
"--build=${rust.toRustTargetSpec stdenv.buildPlatform}"
"--host=${rust.toRustTargetSpec stdenv.hostPlatform}"
- "--target=${rust.toRustTargetSpec stdenv.targetPlatform}"
+ # std is built for all platforms in --target. When building a cross-compiler
+ # we need to add the host platform as well so rustc can compile build.rs
+ # scripts.
+ "--target=${concatStringsSep "," ([
+ (rust.toRustTargetSpec stdenv.targetPlatform)
+ ] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform) [
+ (rust.toRustTargetSpec stdenv.hostPlatform)
+ ])}"
"${setBuild}.cc=${ccForBuild}"
"${setHost}.cc=${ccForHost}"
From 85a3c839df73b08e07daa9b698828bfe10435cbc Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 12 Dec 2020 16:12:52 +1000
Subject: [PATCH 27/29] youtube-dl: 2020.12.09 -> 2020.12.12
https://github.com/ytdl-org/youtube-dl/releases/tag/2020.12.12
---
pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index fb57dcad9b54..c1bc0bd84177 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2020.12.09";
+ version = "2020.12.12";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0qdris00jf6lb9q5qi3f5cyxya5a0sa8yqr6l204wns5px3n7iqa";
+ sha256 = "0iv4l78ylzx8q6myv4v7xq6r5y0hacz6l30bqk1szncfikvfc3cf";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
From 073352bd493c71162a995e3ae2a60ebeef110c54 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 12 Dec 2020 10:20:57 +0100
Subject: [PATCH 28/29] gpsbabel: use `libsForQt5`
---
pkgs/top-level/all-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce0db353bc8d..dcadb0ab14b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21740,11 +21740,11 @@ in
gosmore = callPackage ../applications/misc/gosmore { };
- gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel {
+ gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
};
- gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { };
+ gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { };
gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
From e6781c2a6ed2b8562a09eafd5ed98b43f500a0f3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 12 Dec 2020 10:21:31 +0100
Subject: [PATCH 29/29] gpsbabel: remove myself as maintainer
I no longer use this package and do not have the time to maintain it.
---
pkgs/applications/misc/gpsbabel/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 1915b2dae17d..70862bb61e79 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.gpsbabel.org/";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.rycee ];
platforms = platforms.all;
};
}