From fc80beece7e1112b9e3e4b24996dc74f806a7df3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Sep 2020 07:14:05 +0000 Subject: [PATCH 01/22] matterircd: 0.19.4 -> 0.20.0 --- pkgs/servers/mattermost/matterircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index d644e985db5a..ece2195d117a 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.19.4"; + version = "0.20.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "1kwyk6gy4d4v2rzyr7vwvi8vm69rz1hdn0gkpan2kh1p63z77gbv"; + sha256 = "0rnkzxf953nd67w33ghmrfjfg099cd21nldm31q8pk7fs1mgjnld"; }; goPackagePath = "github.com/42wim/matterircd"; From 85d512e876f292e60b89905ffd7b71122a4a6816 Mon Sep 17 00:00:00 2001 From: stephenwithph Date: Sat, 5 Sep 2020 16:37:32 -0700 Subject: [PATCH 02/22] duplicity: 0.8.13 -> 0.8.15 --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- .../use-installed-scripts-in-test.patch | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 6d6da3c98749..a5094d116a55 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.13"; + version = "0.8.15"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "0lflg1ay4q4w9qzpmh6y2hza4fc3ig12q44qkd80ks17hj21bxa6"; + sha256 = "1kg467mxg5a97v1rlv4shk32krgv8ys4nczq4b11av4bp1lgysdc"; }; patches = [ diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch index a3ba14229159..c02527cf3948 100644 --- a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch +++ b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -38,12 +38,12 @@ # """ERROR 2 --- a/testing/functional/test_rdiffdir.py +++ b/testing/functional/test_rdiffdir.py -@@ -38,7 +38,7 @@ class RdiffdirTest(FunctionalTestCase): - - def run_rdiffdir(self, argstring): - u"""Run rdiffdir with given arguments""" -- self.run_cmd(u"../bin/rdiffdir " + argstring) -+ self.run_cmd(u"rdiffdir " + argstring) - - def run_cycle(self, dirname_list): - u"""Run diff/patch cycle on directories in dirname_list""" +@@ -42,7 +42,7 @@ class RdiffdirTest(FunctionalTestCase): + basepython = os.environ.get(u'TOXPYTHON', None) + if basepython is not None: + cmd_list.extend([basepython]) +- cmd_list.extend([u"../bin/rdiffdir"]) ++ cmd_list.extend([u"rdiffdir"]) + cmd_list.extend(argstring.split()) + cmdline = u" ".join([u'"%s"' % x for x in cmd_list]) + self.run_cmd(cmdline) From ad6c2dea6a38e31e62ff41ecb1bcbc8d2bb58db4 Mon Sep 17 00:00:00 2001 From: Jens Nolte Date: Tue, 15 Dec 2020 02:40:12 +0100 Subject: [PATCH 03/22] nixos/nixos-container: Always apply extraVeth ip configuration Fixes that `containers..extraVeths.` configuration was not always applied. When configuring `containers..extraVeths.` and not configuring one of `containers..localAddress`, `.localAddress6`, `.hostAddress`, `.hostAddress6` or `.hostBridge` the veth was created, but otherwise no configuration (i.e. no ip) was applied. nixos-container always configures the primary veth (when `.localAddress` or `.hostAddress` is set) to be the containers default gateway, so this fix is required to create a veth in containers that use a different default gateway. To test this patch configure the following container and check if the addresses are applied: ``` containers.testveth = { extraVeths.testveth = { hostAddress = "192.168.13.2"; localAddress = "192.168.13.1"; }; config = {...}:{}; }; ``` --- nixos/modules/virtualisation/nixos-containers.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 26398afb3cf5..757d73421b8f 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -56,10 +56,10 @@ let ip -6 route add $HOST_ADDRESS6 dev eth0 ip -6 route add default via $HOST_ADDRESS6 fi - - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} fi + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} + # Start the regular stage 1 script. exec "$1" '' @@ -223,8 +223,8 @@ let ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"} ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"} fi - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} fi + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} '' ); From c5a59b1cdd62a9df5747eefe33bcb6404aa7b09c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 28 Dec 2020 04:20:00 +0000 Subject: [PATCH 04/22] python3Packages.shapely: fix build on darwin --- pkgs/development/python-modules/shapely/default.nix | 3 +-- .../python-modules/shapely/library-paths.patch | 11 +++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index eb3b5b9e44d1..e2b738c479e6 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -29,8 +29,7 @@ buildPythonPackage rec { (substituteAll { src = ./library-paths.patch; libgeos_c = GEOS_LIBRARY_PATH; - libc = "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}" - + stdenv.lib.optionalString (!stdenv.isDarwin) ".6"; + libc = stdenv.lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) ]; diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index 319eb8a72db5..7681fb1d9bb2 100644 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -2,7 +2,7 @@ diff --git a/shapely/geos.py b/shapely/geos.py index d5a67d2..19b7ffc 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -61,127 +61,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): +@@ -61,127 +61,17 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) @@ -128,7 +128,14 @@ index d5a67d2..19b7ffc 100644 - free.argtypes = [c_void_p] - free.restype = None +_lgeos = CDLL('@libgeos_c@') -+free = CDLL('@libc@').free ++if sys.platform == 'darwin': ++ # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen ++ # manpage says, "If filename is NULL, then the returned handle is for the ++ # main program". This way we can let the linker do the work to figure out ++ # which libc Python is actually using. ++ free = CDLL(None).free ++else: ++ free = CDLL('@libc@').free +free.argtypes = [c_void_p] +free.restype = None From cc7acd49bae033aac598fcfbfc12725dd23ca5db Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 28 Dec 2020 14:49:22 +0100 Subject: [PATCH 05/22] anki-bin: 2.1.36 -> 2.1.38 --- pkgs/games/anki/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 1a642c90d2ec..5509d8a90caf 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,14 +3,14 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.36"; + version = "2.1.38"; unpacked = stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "01xcjnfs5pfh7v0nkffw2wpl19l6pj9k3kxrcawv3cm42asy0mfz"; + sha256 = "14zbz8k142djka3b5sld3368m98lj80c39m6xg87bz140h25ylz4"; }; installPhase = '' @@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "1i6iidm5h8r9g801mvqxi2av03qdw3lr28056fv5ixnb5dq2wqim"; + sha256 = "1krl014jhhby0zv4if9cgbcarmhcg6zccyhxw1yb6djiqap0zii7"; }; nativeBuildInputs = [ undmg ]; From d72e29fe485f2c948d25947aae8c0f6c12fda352 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 28 Dec 2020 10:20:47 -0500 Subject: [PATCH 06/22] tomcat-native: 1.2.25 -> 1.2.26 --- pkgs/servers/http/tomcat/tomcat-native.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index fa2769f99dd3..55eb277522a1 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.25"; + version = "1.2.26"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d"; + sha512 = "319lrb0b5vvm2m46rdz2zbicisijvim6948ghz0mypck6f419yjr68j8rpmxpckscaj0ghmbq3p28jpxbjpig84ygy0m63cvgpxknfa"; }; sourceRoot = "${pname}-${version}-src/native"; From 05f8794b0ff7c78df76c3a940dc84f2d2ebbc87e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 29 Dec 2020 03:57:25 +0000 Subject: [PATCH 07/22] python37Packages.pyscreenshot: 2.2 -> 2.3 --- pkgs/development/python-modules/pyscreenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index ec67b7649ea9..3ca096332aea 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyscreenshot"; - version = "2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "dec8517cb18faf4f983dd2ee6636924e472a5644da1480ae871786dfcac244e9"; + sha256 = "bfdc311bd6ec1ee9e3c25ece75b24a749673ad5d5f89ee02950080023054ffd5"; }; propagatedBuildInputs = [ From 215378b627d9867f188f8c12c3427374ad8adfef Mon Sep 17 00:00:00 2001 From: Jonathan Jeppener-Haltenhoff Date: Tue, 29 Dec 2020 12:02:34 +0100 Subject: [PATCH 08/22] utf8cpp: 3.1.1 -> 3.1.2 --- pkgs/development/libraries/utf8cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index a2aac1241cd8..ef02ca2c3134 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1s2pda75488z7c3w3a6qv31bj239248696yk5j2a1drbg2x1dpfh"; + sha256 = "sha256-l5sneFsuvPDIRni2x+aR9fmQ9bzXNnIiP9EzZ63sNtg="; }; cmakeFlags = [ From 84726119efd252a07ad7e45dfeea602df80a1c09 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Tue, 29 Dec 2020 14:01:30 +0100 Subject: [PATCH 09/22] agedu: 20200206 -> 20200705 --- pkgs/tools/misc/agedu/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index c9bad789ad26..3cdfa36337f8 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -1,15 +1,17 @@ {stdenv, fetchgit, autoreconfHook, halibut}: let - date = "20200206"; - rev = "963bc9d"; + date = "20200705"; + rev = "2a7d4a2"; in stdenv.mkDerivation { - name = "agedu-${date}.${rev}"; + pname = "agedu"; + version = "${date}.${rev}"; + # upstream provides tarballs but it seems they disappear after the next version is released src = fetchgit { url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; - sha256 = "1jmvgg2v6aqgbgpxbndrdhgfhlglrq4yv4sdbjaj6bsz9fb8lqhc"; + sha256 = "gRNscl/vhBoZaHFCs9JjDBHDRoEpILJLtiI4YV+K/b4="; }; nativeBuildInputs = [autoreconfHook halibut]; From 317215b8860da01fa74f30edad715e3d0a5ed56f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 29 Dec 2020 13:45:00 +0100 Subject: [PATCH 10/22] intel-media-driver: 20.4.3 -> 20.4.5 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index ada25e10d503..153e41a777cc 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.4.3"; + version = "20.4.5"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "04a0hcw9f8fr96xpc1inc19mncssqzxmjba9cdvvh71n8j7n3yyw"; + sha256 = "149xkhhp8q06c1jzxjs24lnbfrlvf19m0hcwld593vv4arfpbpmf"; }; cmakeFlags = [ From ad75bac50a027850c71cb19f70575cce9b7f6f93 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 27 Dec 2020 18:45:16 +0100 Subject: [PATCH 11/22] i3-balance-workspace: init at 1.8.3 --- .../window-managers/i3/balance-workspace.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/window-managers/i3/balance-workspace.nix diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix new file mode 100644 index 000000000000..18e9167227fe --- /dev/null +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, i3ipc }: + +buildPythonPackage rec { + pname = "i3-balance-workspace"; + version = "1.8.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gndzrwff8gfdqjjxv4zf2h2k0x7y97w1c3mrjpihz8xd0hbnk4d"; + }; + + propagatedBuildInputs = [ i3ipc ]; + + doCheck = false; # project has no test + pythonImportsCheck = [ "i3_balance_workspace" ]; + + meta = { + description = "Balance windows and workspaces in i3wm"; + homepage = "https://pypi.org/project/i3-balance-workspace/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pacien ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0817904c93b..2431edd27d99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22059,6 +22059,8 @@ in i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { }; + i3-balance-workspace = python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix { }; + i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; From a63d6405ec4cc2f87f133d667b96c12e3de9d40c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Tue, 29 Dec 2020 14:34:19 +0100 Subject: [PATCH 12/22] amazon-ecs-cli: 1.20.0 -> 1.21.0 --- pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 4c37054f4a05..bd63481054c3 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "amazon-ecs-cli"; - version = "1.20.0"; + version = "1.21.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "11cw2hk48x66wlsg5bzay95l2pgncwnawzj4xmqmbchhhvphrvxr"; + sha256 = "sEHwhirU2EYwtBRegiIvN4yr7VKtmy7e6xx5gZOkuY0="; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-darwin-amd64-v${version}"; - sha256 = "1f4yq04sgwkj2p0j598a8vc54dzihmqvg9daa6mxnqj403ln0rg1"; + sha256 = "1viala49sifpcmgn3jw24h5bkrlm4ffadjiqagbxj3lr0r78i9nm"; } else throw "Architecture not supported"; From a0f4326687f996c545dbe23bce04aa75abd9f1fa Mon Sep 17 00:00:00 2001 From: freezeboy Date: Tue, 29 Dec 2020 13:47:57 +0100 Subject: [PATCH 13/22] aerc: 0.4.0 -> 0.5.2 --- pkgs/applications/networking/mailreaders/aerc/default.nix | 6 +++--- .../networking/mailreaders/aerc/runtime-sharedir.patch | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 45d41839a1ca..781e6c8369d0 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "aerc"; - version = "0.4.0"; + version = "0.5.2"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; - sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk"; + sha256 = "h7kiRA5TuZ8mDSMymWU33stFLIOMd06TQLYzKW+faO4="; }; runVend = true; - vendorSha256 = "13zs5113ip85yl6sw9hzclxwlnrhy18d39vh9cwbq97dgnh9rz89"; + vendorSha256 = "9PXdUH0gu8PGaKlRJCUF15W1/LxA+sv3Pwl2UnjYxWY="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index ed670d61a7b3..91978753ae96 100644 --- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -29,7 +29,7 @@ diff --git a/config/config.go b/config/config.go index 32d07fc..8ffd3e8 100644 --- a/config/config.go +++ b/config/config.go -@@ -355,6 +355,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { +@@ -472,6 +472,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { return nil, err } } @@ -41,10 +41,11 @@ index 32d07fc..8ffd3e8 100644 file.NameMapper = mapName config := &AercConfig{ Bindings: BindingConfig{ -@@ -423,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { +@@ -546,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { if err = config.LoadConfig(file); err != nil { return nil, err } + + for i, filter := range config.Filters { + config.Filters[i].Command = strings.ReplaceAll(filter.Command, "@SHAREDIR@", sharedir) + } From c53a0c16e4a22d8339c0c07250ad8c6184a400fe Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sun, 20 Sep 2020 19:35:48 +0000 Subject: [PATCH 14/22] nixos/prometheus: remote_{read,write} - add [remote_write](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) and [remote_read](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_read) support Co-authored-by: Yorick van Pelt --- .../monitoring/prometheus/default.nix | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 72428957109c..ace62342c9c6 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -32,6 +32,8 @@ let (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) ]); scrape_configs = filterValidPrometheus cfg.scrapeConfigs; + remote_write = filterValidPrometheus cfg.remoteWrite; + remote_read = filterValidPrometheus cfg.remoteRead; alerting = { inherit (cfg) alertmanagers; }; @@ -101,6 +103,126 @@ let }; }; + promTypes.remote_read = types.submodule { + options = { + url = mkOption { + type = types.str; + description = '' + ServerName extension to indicate the name of the server. + http://tools.ietf.org/html/rfc4366#section-3.1 + ''; + }; + remote_timeout = mkDefOpt types.str "30s" '' + Timeout for requests to the remote write endpoint. + ''; + relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' + List of remote write relabel configurations. + List of relabel configurations. + ''; + name = mkOpt types.string '' + Name of the remote write config, which if specified must be unique among remote write configs. + The name will be used in metrics and logging in place of a generated value to help users distinguish between + remote write configs. + ''; + basic_auth = mkOpt (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; + }; + password = mkOpt types.str "HTTP password"; + password_file = mkOpt types.str "HTTP password file"; + }; + }) '' + Sets the `Authorization` header on every remote write request with the + configured username and password. + password and password_file are mutually exclusive. + ''; + bearer_token = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with + the configured bearer token. It is mutually exclusive with `bearer_token_file`. + ''; + bearer_token_file = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with the bearer token + read from the configured file. It is mutually exclusive with `bearer_token`. + ''; + tls_config = mkOpt promTypes.tls_config '' + Configures the remote write request's TLS settings. + ''; + proxy_url = mkOpt types.str "Optional Proxy URL."; + metadata_config = { + send = mkDefOpt types.bool "true" '' + Whether metric metadata is sent to remote storage or not. + ''; + send_interval = mkDefOpt types.str "1m" '' + How frequently metric metadata is sent to remote storage. + ''; + }; + }; + }; + + promTypes.remote_write = types.submodule { + options = { + url = mkOption { + type = types.str; + description = '' + ServerName extension to indicate the name of the server. + http://tools.ietf.org/html/rfc4366#section-3.1 + ''; + }; + remote_timeout = mkDefOpt types.str "30s" '' + Timeout for requests to the remote write endpoint. + ''; + relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' + List of remote write relabel configurations. + List of relabel configurations. + ''; + name = mkOpt types.string '' + Name of the remote write config, which if specified must be unique among remote write configs. + The name will be used in metrics and logging in place of a generated value to help users distinguish between + remote write configs. + ''; + basic_auth = mkOpt (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; + }; + password = mkOpt types.str "HTTP password"; + password_file = mkOpt types.str "HTTP password file"; + }; + }) '' + Sets the `Authorization` header on every remote write request with the + configured username and password. + password and password_file are mutually exclusive. + ''; + bearer_token = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with + the configured bearer token. It is mutually exclusive with `bearer_token_file`. + ''; + bearer_token_file = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with the bearer token + read from the configured file. It is mutually exclusive with `bearer_token`. + ''; + tls_config = mkOpt promTypes.tls_config '' + Configures the remote write request's TLS settings. + ''; + proxy_url = mkOpt types.str "Optional Proxy URL."; + metadata_config = { + send = mkDefOpt types.bool "true" '' + Whether metric metadata is sent to remote storage or not. + ''; + send_interval = mkDefOpt types.str "1m" '' + How frequently metric metadata is sent to remote storage. + ''; + }; + }; + }; + promTypes.scrape_config = types.submodule { options = { job_name = mkOption { @@ -580,6 +702,24 @@ in { ''; }; + remoteRead = mkOption { + type = types.listOf promTypes.remote_read; + default = []; + description = '' + Parameters of the endpoints to query from. + See the official documentation for more information. + ''; + }; + + remoteWrite = mkOption { + type = types.listOf promTypes.remote_write; + default = []; + description = '' + Parameters of the endpoints to send samples to. + See the official documentation for more information. + ''; + }; + rules = mkOption { type = types.listOf types.str; default = []; From 3adb004c1ef5bf6697f61aa199fc8c7beb4f9344 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Dec 2020 09:53:58 -0500 Subject: [PATCH 15/22] python3Packages.botocore: 1.19.43 -> 1.19.44 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e687718aa4c2..69666938301b 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.43"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.44"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-c5jJANvU49YWRyaSFTluo+gIL0lPPntl2basoEnB1GM="; + sha256 = "sha256-dyXgjJWulsTb2VXLSuRKDAbT5B92p/6wqUHCekTGMRM="; }; propagatedBuildInputs = [ From 3a62e050278efea2bf8c99fac445af6e6f512271 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Dec 2020 09:54:09 -0500 Subject: [PATCH 16/22] python3Packages.boto3: 1.16.43 -> 1.16.44 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 29445c6d795b..f259ea6a7891 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.43"; # N.B: if you change this, change botocore too + version = "1.16.44"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-pJs6tL+i9jlLpgFlz8RoQQeX3UEPMu7UfiL2FFHumG4="; + sha256 = "sha256-4/EO1tnKmEFf3sFcheUKiew41iKbzj+v1eeWWxbE68U="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 42900ac65d3268006f07e34257c805bebf53329c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Dec 2020 09:54:52 -0500 Subject: [PATCH 17/22] awscli: 1.18.203 -> 1.18.204 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 4f28a6d744b1..9c7f9936e592 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.203"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.204"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-afcXbYKRc9w0Zbuyg/bDA/J/lHm4N4FttUgGk4h4H4k="; + sha256 = "sha256-YAyqRJbETCagcME63dt5b9WDRj6tq8Gdwk6qyAd86lE="; }; postPatch = '' From e9d8aaa945a390103872a50d24f60d1d343cc6f0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Dec 2020 14:57:37 +0000 Subject: [PATCH 18/22] =?UTF-8?q?oh-my-zsh:=202020-12-27=20=E2=86=92=20202?= =?UTF-8?q?0-12-28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 9dcb1a970532..4e377218b73b 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-12-27"; + version = "2020-12-28"; pname = "oh-my-zsh"; - rev = "90ffda7ed28dd8273b80bd262c6a28be65e4da71"; + rev = "4b2431e8b1c08a2dc14fe31bf07a5e5f08eaa87e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "lYf+NmSgY0WFBMWxVBrh/f2cSJ0WqnaTktQNA0nYZNE="; + sha256 = "09776acglph64lg9x1f1ypglbbhknrqidq47zk95vksd1in8l3is"; }; installPhase = '' From b3d2d9170b89f493cc0283601e6ccaad273c4b45 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Dec 2020 10:07:32 -0500 Subject: [PATCH 19/22] linux: 4.14.212 -> 4.14.213 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f4404cae6f40..aff68e1efa70 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.212"; + version = "4.14.213"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y8ck8pfxm8862wi4cz8qp9x9b18yl448i8m7bpbphs290nc66qf"; + sha256 = "079axkl14jp8lz30h21q4gmhmjw6zf5ycmxji65kgcgyg7dwwyzx"; }; } // (args.argsOverride or {})) From 18eae951611065e6cd9d40e9b27bd64aecaa2164 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Dec 2020 10:07:44 -0500 Subject: [PATCH 20/22] linux: 4.4.248 -> 4.4.249 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 7e3030087cee..744f35e3ea8b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.248"; + version = "4.4.249"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z1xbkm0z0v6k3scszii5hi24pn391332g0li93p3n1rnv74jap5"; + sha256 = "04pb4vgia6zaindf6804gq9jn3mhmy01yijqmpi79sh9rlqzzh1i"; }; } // (args.argsOverride or {})) From 733e537a8ad76fd355b6f501127f7d0eb8861775 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Dec 2020 10:07:52 -0500 Subject: [PATCH 21/22] linux: 4.9.248 -> 4.9.249 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 107fcd9268fe..bf044f73246d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.248"; + version = "4.9.249"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kzczy0lz3lnjkhvx90dgjmzn3d3y55qxlihiclkr4y9c602d1s6"; + sha256 = "0kjcw0vgga9msgqnipgg028v3rcc5am2d094v3hqkkjvzyb8dwxi"; }; } // (args.argsOverride or {})) From 75513fb361477a5289a78e1a5c64a0ea13a7b535 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 29 Dec 2020 12:59:11 +0100 Subject: [PATCH 22/22] pythonPackages.ufonormalizer: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/ufonormalizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index 8118c0f9497f..e2790482a3c4 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "03k9dndnv3p3ysfq5wq8bnaijvqip61fh79d5gz2zk284vc47mgj"; + sha256 = "0ijc697nv9rff9j1nhbf5vnyaryxlndq13msi94px8aq9gzxfrbi"; extension = "zip"; };