From 6fc18eb4199e4acb6a3b53b9ec49ae56d0782895 Mon Sep 17 00:00:00 2001 From: V Date: Fri, 21 May 2021 10:07:24 +0200 Subject: [PATCH 01/27] nixos/acme: Allow using lego's built-in web server Currently, we hardcode the use of --http.webroot, even if no webroot is configured. This has the effect of disabling the built-in server. Co-authored-by: Chris Forno --- nixos/modules/security/acme.nix | 40 ++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index c0250171109f..2b466d6a85ce 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -127,9 +127,8 @@ let [ "--dns" data.dnsProvider ] ++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] - ) else ( - [ "--http" "--http.webroot" data.webroot ] - ); + ) else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] + else [ "--http" "--http.webroot" data.webroot ]; commonOpts = [ "--accept-tos" # Checking the option is covered by the assertions @@ -268,6 +267,8 @@ let ${data.postRun} fi ''); + } // optionalAttrs (data.listenHTTP != null && toInt (elemAt (splitString ":" data.listenHTTP) 1) < 1024) { + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; }; # Working directory will be /tmp @@ -396,6 +397,17 @@ let ''; }; + listenHTTP = mkOption { + type = types.nullOr types.str; + default = null; + example = ":1360"; + description = '' + Interface and port to listen on to solve HTTP challenges + in the form [INTERFACE]:PORT. + If you use a port other than 80, you must proxy port 80 to this port. + ''; + }; + server = mkOption { type = types.nullOr types.str; default = null; @@ -714,6 +726,28 @@ in { `security.acme.certs.${cert}.webroot` are mutually exclusive. ''; } + { + assertion = data.webroot == null || data.listenHTTP == null; + message = '' + Options `security.acme.certs.${cert}.webroot` and + `security.acme.certs.${cert}.listenHTTP` are mutually exclusive. + ''; + } + { + assertion = data.listenHTTP == null || data.dnsProvider == null; + message = '' + Options `security.acme.certs.${cert}.listenHTTP` and + `security.acme.certs.${cert}.dnsProvider` are mutually exclusive. + ''; + } + { + assertion = data.dnsProvider != null || data.webroot != null || data.listenHTTP != null; + message = '' + One of `security.acme.certs.${cert}.dnsProvider`, + `security.acme.certs.${cert}.webroot`, or + `security.acme.certs.${cert}.listenHTTP` must be provided. + ''; + } ]) cfg.certs)); users.users.acme = { From b280ddb741c70c6adf09d808936c4b80e483c67b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 01:19:47 +0000 Subject: [PATCH 02/27] vips: 8.11.3 -> 8.11.4 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index bfe9a1875e5a..7081f07fd30a 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.11.3"; + version = "8.11.4"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-CWuULuUMBV2VUCZEBg0MzS7rXI8UUkNh5XPV2eA8xt8="; + sha256 = "sha256-cPg5pH7/N40D9lvya/t+6wwelrvmbf28OwSZnnGSfo8="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From b051111b03bc73d0be34bfce880dc730619f45c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 22:33:39 +0100 Subject: [PATCH 03/27] python3Packages.pytest-aio: init at 1.4.1 --- .../python-modules/pytest-aio/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-aio/default.nix diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix new file mode 100644 index 000000000000..b6ecc9eb8829 --- /dev/null +++ b/pkgs/development/python-modules/pytest-aio/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytest-mypy +, pytestCheckHook +, pythonOlder +, types-setuptools +}: + +buildPythonPackage rec { + pname = "pytest-aio"; + version = "1.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "ZPG6k+ZNi6FQftIVwr/Lux5rJlo284V/mjtYepNScdQ="; + }; + + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytest-mypy + pytestCheckHook + types-setuptools + ]; + + pythonImportsCheck = [ + "pytest_aio" + ]; + + meta = with lib; { + homepage = "https://github.com/klen/pytest-aio"; + description = "Pytest plugin for aiohttp support"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f415e50f96f..26c70d15e0fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7336,6 +7336,8 @@ in { ''; }); + pytest-aio = callPackage ../development/python-modules/pytest-aio { }; + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; From 8ec1af4182c839abe7e267a80f38e413577339b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Dec 2021 22:45:43 +0100 Subject: [PATCH 04/27] python3Packages.python-izone: 1.1.6 -> 1.1.8 --- .../python-modules/python-izone/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index 67aa8eb43512..22f541d6712d 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -2,26 +2,25 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , aiohttp , netifaces -, asynctest -, pytest-aiohttp +, pytest-aio +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "python-izone"; - version = "1.1.6"; + version = "1.1.8"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Swamp-Ig"; repo = "pizone"; rev = "v${version}"; - sha256 = "sha256-zgE1ccEPSa9nX0SEMN02VEGfnHexk/+jCJe7ugUL5UA="; + sha256 = "sha256-/qPWSTO0PV4lEgwWpgcoBnbUtDUrEVItb4NF9TV2QJU="; }; propagatedBuildInputs = [ @@ -30,18 +29,14 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest - pytest-aiohttp + pytest-aio + pytest-asyncio pytestCheckHook ]; - patches = [ - # async_timeout 4.0.0 removes current_task, https://github.com/Swamp-Ig/pizone/pull/15 - (fetchpatch { - name = "remove-current-task.patch"; - url = "https://github.com/Swamp-Ig/pizone/commit/988998cf009a39938e4ee37079337b0c187977f2.patch"; - sha256 = "nVCQBMc4ZE7CQsYC986wqvPPyA7zJ/g278jJrpaiAIw="; - }) + disabledTestPaths = [ + # Test are blocking + "tests/test_fullstack.py" ]; pythonImportsCheck = [ From 476e20149315a7f94acea67d09c2aee5520edbbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 07:22:12 +0000 Subject: [PATCH 05/27] postgresql11Packages.plr: 8.4.4 -> 8.4.5 --- pkgs/servers/sql/postgresql/ext/plr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index 4c05288204dd..68faa58b2e83 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plr"; - version = "8.4.4"; + version = "8.4.5"; src = fetchFromGitHub { owner = "postgres-plr"; repo = "plr"; rev = "REL${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "15dygf8klx2a4kzpmc1qnch629gcaa43ba1p3cqk9r1db4ima24k"; + sha256 = "sha256-G/V3I1JI6dWto/hK6lfOTBYEvbmkovvnvk2TwSQq4no="; }; nativeBuildInputs = [ pkg-config ]; From f226901f7fbc54db9d25755c49a214e7d6b0efb4 Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Wed, 8 Dec 2021 22:48:20 +0100 Subject: [PATCH 06/27] eternal-terminal: remove syslog.target from service --- nixos/modules/services/networking/eternal-terminal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix index a2e5b30dc0f0..88b4cd90540f 100644 --- a/nixos/modules/services/networking/eternal-terminal.nix +++ b/nixos/modules/services/networking/eternal-terminal.nix @@ -67,7 +67,7 @@ in eternal-terminal = { description = "Eternal Terminal server."; wantedBy = [ "multi-user.target" ]; - after = [ "syslog.target" "network.target" ]; + after = [ "network.target" ]; serviceConfig = { Type = "forking"; ExecStart = "${pkgs.eternal-terminal}/bin/etserver --daemon --cfgfile=${pkgs.writeText "et.cfg" '' From 1f0bbdb6fcf45b2a88e498f27ffc1128d3be221f Mon Sep 17 00:00:00 2001 From: lunik1 Date: Wed, 8 Dec 2021 22:17:24 +0000 Subject: [PATCH 07/27] nixos/adguardhome: remove syslog.target from service --- nixos/modules/services/networking/adguardhome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix index 4388ef2b7e57..03f9b9f9bad4 100644 --- a/nixos/modules/services/networking/adguardhome.nix +++ b/nixos/modules/services/networking/adguardhome.nix @@ -56,7 +56,7 @@ in config = mkIf cfg.enable { systemd.services.adguardhome = { description = "AdGuard Home: Network-level blocker"; - after = [ "syslog.target" "network.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; unitConfig = { StartLimitIntervalSec = 5; From 3154ab46f4533d03eda62c8a174b07f29c95eef6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 08:50:18 +0100 Subject: [PATCH 08/27] python3Packages.finitude: init at 0.1.1 --- .../python-modules/finitude/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/finitude/default.nix diff --git a/pkgs/development/python-modules/finitude/default.nix b/pkgs/development/python-modules/finitude/default.nix new file mode 100644 index 000000000000..eb4115914e10 --- /dev/null +++ b/pkgs/development/python-modules/finitude/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, prometheus-client +, pyserial +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "finitude"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dulitz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs="; + }; + + propagatedBuildInputs = [ + pyserial + prometheus-client + pyyaml + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "finitude" + ]; + + meta = with lib; { + description = "Python module to get data from ABCD bus (RS-485) used by Carrier Infinity and Bryant Evolution HVAC systems"; + homepage = "https://github.com/dulitz/finitude"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee2cc85022da..d2ad56b3fbc5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2733,6 +2733,8 @@ in { fingerprints = callPackage ../development/python-modules/fingerprints { }; + finitude = callPackage ../development/python-modules/finitude { }; + fints = callPackage ../development/python-modules/fints { }; fiona = callPackage ../development/python-modules/fiona { From ecd41d1bda2aba4915738494db0a7b0f65cb5e94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 09:00:11 +0100 Subject: [PATCH 09/27] python3Packages.cometblue-lite: init at 0.4.1 --- .../python-modules/cometblue-lite/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/cometblue-lite/default.nix diff --git a/pkgs/development/python-modules/cometblue-lite/default.nix b/pkgs/development/python-modules/cometblue-lite/default.nix new file mode 100644 index 000000000000..01d24bc7cb7b --- /dev/null +++ b/pkgs/development/python-modules/cometblue-lite/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bluepy +, pythonOlder +}: + +buildPythonPackage rec { + pname = "cometblue-lite"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "neffs"; + repo = "python-cometblue_lite"; + rev = version; + sha256 = "sha256-kK6P8almFQac/bt7we02Q96RIB/s9wAqb+dn09tFx7k="; + }; + + propagatedBuildInputs = [ + bluepy + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "cometblue_lite" + ]; + + meta = with lib; { + description = "Python module for Eurotronic Comet Blue thermostats"; + homepage = "https://github.com/neffs/python-cometblue_lite"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee2cc85022da..5d3a04e182eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1703,6 +1703,8 @@ in { colour = callPackage ../development/python-modules/colour { }; + cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; + commandparse = callPackage ../development/python-modules/commandparse { }; commentjson = callPackage ../development/python-modules/commentjson { }; From aef33e00c064ca26736d1494e500c155d608b3a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 09:03:24 +0100 Subject: [PATCH 10/27] python3Packages.finitude: init at 0.1.1 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2ad56b3fbc5..c3bfad518d10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2734,7 +2734,7 @@ in { fingerprints = callPackage ../development/python-modules/fingerprints { }; finitude = callPackage ../development/python-modules/finitude { }; - + fints = callPackage ../development/python-modules/fints { }; fiona = callPackage ../development/python-modules/fiona { From 102079d1fea5db03186ab03357b3e5056469ca6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 10:53:22 +0100 Subject: [PATCH 11/27] python3Packages.tago: init at 3.0.0 --- .../python-modules/tago/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/tago/default.nix diff --git a/pkgs/development/python-modules/tago/default.nix b/pkgs/development/python-modules/tago/default.nix new file mode 100644 index 000000000000..220c8f2b0bb7 --- /dev/null +++ b/pkgs/development/python-modules/tago/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, promise +, python-socketio +, pythonOlder +, requests +, websockets +}: + +buildPythonPackage rec { + pname = "tago"; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "tago-io"; + repo = "tago-sdk-python"; + rev = version; + sha256 = "sha256-eu6n83qmo1PQKnR/ellto04xi/3egl+LSKMOG277X1k="; + }; + + propagatedBuildInputs = [ + aiohttp + promise + python-socketio + requests + websockets + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "tago" + ]; + + meta = with lib; { + description = "Python module for interacting with Tago.io"; + homepage = "https://github.com/tago-io/tago-sdk-python"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee2cc85022da..8156e6d3461b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9235,6 +9235,8 @@ in { tag-expressions = callPackage ../development/python-modules/tag-expressions { }; + tago = callPackage ../development/python-modules/tago { }; + tahoma-api = callPackage ../development/python-modules/tahoma-api { }; tailer = callPackage ../development/python-modules/tailer { }; From 421c59e907fec2a02bdeb4ab42b3a0ee4a86cd72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 18:14:59 +0000 Subject: [PATCH 12/27] libsolv: 0.7.19 -> 0.7.20 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index c7dede355df6..1062cc8e6505 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.19"; + version = "0.7.20"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-AN4cgpMBqTtK04CU89Yqd1ZfWyPrCociPd3XKdVONMU="; + sha256 = "sha256-NVyLa/fPGnO5jAz9rePFXg/z6RZeFCrkJBCG3gGh+YM="; }; cmakeFlags = [ From 646d1192d87e334d486e7fe32e1fc8a5831e7fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Dec 2021 03:25:25 +0100 Subject: [PATCH 13/27] gmailctl: 0.9.0 -> 0.10.0, add SuperSandro2000 as maintainer --- pkgs/applications/networking/gmailctl/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index 8d0b9915d0d7..ff620989f9de 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-1gOixuOvPHEjnnDNNda9sktnhffovOfeG4XDrLRRMlE="; + sha256 = "sha256-JuE8+OW+qM6tir4A25tN2GTXQIkcKVE4uKbZNSTcNlA="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildGoModule rec { --zsh <($out/bin/gmailctl completion zsh) ''; - vendorSha256 = "sha256-Yv3OGHFOmenst/ujUgvCaSEjwwBf3W9n+55ztVhuWjo="; + vendorSha256 = "sha256-zEWEcv6G/9tmM6/+lhMFkyew3r/pvQRjvh74BENTYI4="; doCheck = false; @@ -34,7 +34,6 @@ buildGoModule rec { description = "Declarative configuration for Gmail filters"; homepage = "https://github.com/mbrt/gmailctl"; license = licenses.mit; - maintainers = [ maintainers.doronbehar ]; - platforms = platforms.unix; + maintainers = with maintainers; [ doronbehar SuperSandro2000 ]; }; } From dec246428e3e77eb746f6231710fbe43ac42ef25 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Dec 2021 04:20:00 +0000 Subject: [PATCH 14/27] rubyPackages: update --- .../ruby-modules/with-packages/Gemfile | 1 + pkgs/top-level/ruby-packages.nix | 131 ++++++++++-------- 2 files changed, 72 insertions(+), 60 deletions(-) diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index a476912cdd7f..ca8e09704a11 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -97,6 +97,7 @@ source 'https://rubygems.org' do gem 'patron' gem 'pcaprub' gem 'pg' + gem 'prettier' gem 'pry' gem 'pry-byebug' gem 'pry-doc' diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 9ff91a764816..3a7c16c08714 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -270,10 +270,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00s388z1akvj2j77ylr1mgp02zxp4ybcgc4ds3bz4647dfk0cwxk"; + sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.5"; }; charlock_holmes = { groups = ["default"]; @@ -311,10 +311,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y04ig8p9rparhff5dh3781pwf1xlirgq8p0fzvggjjpx761bvra"; + sha256 = "10vcm1dadj5sjrg31afzv7h1f0irhc7va5sr5y0fcvlkg2hms8jk"; type = "gem"; }; - version = "3.4.2"; + version = "3.4.3"; }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored" "escape" "fourflusher" "molinillo" "nap" "xcodeproj"]; @@ -603,10 +603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z50v9y66kl0s9s84syd8vai77hhysdaymmgbdmpaq54bra6xk72"; + sha256 = "09g67hih1y1ibj85mc9w6xrwwv3402620i031jivc55msm6dmdvs"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.1"; }; cocoapods-wholemodule = { groups = ["default"]; @@ -868,10 +868,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g45ib20cjwkf4lzgm30cl6n7b6h1k8p6pdg4vh8s1rllrzrz342"; + sha256 = "0153rr745g48h48vaplgmx7xkfjbc79acpq5jsl7agdrk4yf75ih"; type = "gem"; }; - version = "0.87.0"; + version = "0.89.0"; }; execjs = { groups = ["default"]; @@ -1128,10 +1128,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnlra517pfj3hx07kasbqlcw51ix4xajr6bsd3mwg8bc92dlwy7"; + sha256 = "11kc33j6m0nayppkb7645w0ldh8g18pgmxgb8wz39pd5vilr6qpv"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.0"; }; glib2 = { dependencies = ["native-package-installer" "pkg-config"]; @@ -1150,10 +1150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; + sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; type = "gem"; }; - version = "0.5.2"; + version = "1.0.0"; }; gobject-introspection = { dependencies = ["glib2"]; @@ -1193,10 +1193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; type = "gem"; }; - version = "4.1.0"; + version = "5.0.0"; }; highline = { groups = ["default"]; @@ -1286,10 +1286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; iconv = { groups = ["default"]; @@ -1306,10 +1306,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1papdw0503grmbl51jwaa2yn7ndvm94vbdqzz46r25hp3r6d1pls"; + sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.4"; }; jaro_winkler = { groups = ["default"]; @@ -1327,10 +1327,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz0vp5lbp1bz2samyn8nk49vyh6zhvcqz35faq4i3kgsd4xlnhp"; + sha256 = "1a8fhj01wqsjyr3cm6fzrv54p879v83xpm2vrh7if9q5zwvkqmfn"; type = "gem"; }; - version = "2.11.2"; + version = "2.11.3"; }; jekyll = { dependencies = ["colorator" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "rouge" "safe_yaml"]; @@ -1487,10 +1487,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry"; + sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.1"; }; jwt = { groups = ["default"]; @@ -1570,10 +1570,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; + sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; type = "gem"; }; - version = "2.12.0"; + version = "2.13.0"; }; mab = { groups = ["default"]; @@ -1674,20 +1674,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "3.3.1"; + version = "3.4.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv"; + sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; type = "gem"; }; - version = "3.2021.0901"; + version = "3.2021.1115"; }; mini_magick = { groups = ["default"]; @@ -2018,6 +2018,16 @@ }; version = "0.3.5"; }; + prettier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vi8yzllqgjnmx0lcqrcyqw5lah06w4qln0mg8nczvgp8finflcb"; + type = "gem"; + }; + version = "2.0.0"; + }; pry = { dependencies = ["coderay" "method_source"]; groups = ["default"]; @@ -2288,10 +2298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; + sha256 = "008yn8j44414qxhn1c0nxp4a70rq0bqhz70hnjpgx8cjh2g0makp"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2310,10 +2320,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6"; + sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; rexml = { groups = ["default"]; @@ -2404,10 +2414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; + sha256 = "0pjckrh8q6sqxy38xw7f4ziylq1983k84xh927s6352pps68zj35"; type = "gem"; }; - version = "3.10.2"; + version = "3.10.3"; }; rubocop = { dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2458,10 +2468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d754d6pgdqyq52pl9hp0x38q1vn3vf9nz4nm5gqdj5i4fw7pba6"; + sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; ruby-lxc = { groups = ["default"]; @@ -2499,10 +2509,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qx9r75bfwglzv03lwvghd9gzw66wnbhdj5pc1qg896cbzna2cc0"; + sha256 = "19pzpx406rr9s3qk527rn9y3b76sjq5pi7y0xzqiy50q3k0hhg7g"; type = "gem"; }; - version = "2.1.3"; + version = "2.1.4"; }; ruby2_keywords = { groups = ["default"]; @@ -2615,20 +2625,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mlccf70slrjpxvpvmnk2cls39nkpgksa7sd90jlnm0s0z7lhdd"; + sha256 = "0hiifw2zm2w00h3c7hfqy9n23q270aq18wwd5fs8wh9f6ap0vjvz"; type = "gem"; }; - version = "0.11.4"; + version = "0.11.6"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fmk4fkmqnh033sdsvbb6r2dadir0f9zaq0z2jyx1wfnvv5712md"; + sha256 = "0kx1vvld5n51jamvgv4xj14fq9jqw93vjwkalx4809z8jh08znbz"; type = "gem"; }; - version = "5.49.0"; + version = "5.51.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2752,10 +2762,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; type = "gem"; }; - version = "3.2.2"; + version = "3.4.2"; }; sqlite3 = { groups = ["default"]; @@ -2902,6 +2912,16 @@ }; version = "0.2.0"; }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; @@ -2955,35 +2975,26 @@ }; version = "0.6.0"; }; - yaggo = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18ffl28d2wyzyq47350xas1n1fwgsqms316bb1bvfqhdqnwgmy6g"; - type = "gem"; - }; - version = "1.5.10"; - }; yard = { + dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; + sha256 = "0d08gkis1imlvppyh8dbslk89hwj5af2fmlzvmwahgx2bm48d9sn"; type = "gem"; }; - version = "0.9.26"; + version = "0.9.27"; }; zeitwerk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.1"; }; ZenTest = { groups = ["default"]; @@ -3000,9 +3011,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1prdwbi9prykva3iqyk23fzgi0z7pphldybba8s76mil1fd3svif"; + sha256 = "06i33nf1b9hsb19na42yvxmiplijw994dhij1f71cp8n4krhymhv"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; } From 16f195c00186277f19c52b9999e923294e6e03ce Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 1 Dec 2021 11:43:15 -0500 Subject: [PATCH 15/27] kafka-delta-ingest: init at unstable-2021-12-08 --- .../tools/kafka-delta-ingest/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/tools/kafka-delta-ingest/default.nix diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/development/tools/kafka-delta-ingest/default.nix new file mode 100644 index 000000000000..9287b4d90874 --- /dev/null +++ b/pkgs/development/tools/kafka-delta-ingest/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, perl +, rdkafka +}: + +rustPlatform.buildRustPackage rec { + pname = "kafka-delta-ingest"; + version = "unstable-2021-12-08"; + + src = fetchFromGitHub { + owner = "delta-io"; + repo = pname; + rev = "c48c854145b5aab1b8f36cc04978880794a2273c"; + sha256 = "sha256-q0jOVZlxMHIhnc8y2N8o7Sl5Eg7DfJ96kXrPIV8RD1Y="; + }; + + nativeBuildInputs = [ + pkg-config + perl + ]; + + buildFeatures = [ "dynamic-linking" ]; + + buildInputs = [ + openssl + rdkafka + ]; + + cargoSha256 = "sha256-srSu3Rx58Ee2Y+8MVis1ACXBQ92u1mIvy1DNp0qJ4IA="; + + # many tests seem to require a running kafka instance + doCheck = false; + + meta = with lib; { + description = "A highly efficient daemon for streaming data from Kafka into Delta Lake"; + homepage = "https://github.com/delta-io/kafka-delta-ingest"; + license = licenses.asl20; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 031e293860f2..70778481d6cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14821,6 +14821,8 @@ with pkgs; k2tf = callPackage ../development/tools/misc/k2tf { }; + kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { }; + kati = callPackage ../development/tools/build-managers/kati { }; kcat = callPackage ../development/tools/kcat { }; From 6dfe6024b04292b992cbd295bc5624ec61ac7bde Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 10 Dec 2021 23:59:30 +0100 Subject: [PATCH 16/27] metabase: 0.38.0 -> 0.41.4 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index d64279bf7e17..5af55a3e41ec 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.38.0"; + version = "0.41.4"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "170fj2cc7drh6c1dgl60f9n79vfrsw2v57lmds677naxnq254jhp"; + sha256 = "1xql4d7kipyxsibzyg0c4lgkms12g1cxxnf0zkc6cbwz2vdva54a"; }; nativeBuildInputs = [ makeWrapper ]; From 9eee84f9f067195c9901326f30f39bc0c0b680a2 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sat, 11 Dec 2021 00:11:52 +0100 Subject: [PATCH 17/27] metabase: add passthru tests --- pkgs/servers/metabase/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 5af55a3e41ec..4cb970047326 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk11 }: +{ lib, stdenv, fetchurl, makeWrapper, jdk11, nixosTests }: stdenv.mkDerivation rec { pname = "metabase"; @@ -24,4 +24,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; }; + passthru.tests = { + inherit (nixosTests) metabase; + }; } From 35ed694793c5c45b9b8d2890dfa4dafc98948e03 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 11 Dec 2021 08:28:20 +0100 Subject: [PATCH 18/27] nixos/invidious: remove syslog.target from service It has been removed from systemd, see #149721. --- nixos/modules/services/web-apps/invidious.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index 7fb826af5835..50370629e47c 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -11,7 +11,7 @@ let systemd.services.invidious = { description = "Invidious (An alternative YouTube front-end)"; wants = [ "network-online.target" ]; - after = [ "syslog.target" "network-online.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; script = From de16da59f269861f40e35035d917954c31901263 Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Sun, 5 Dec 2021 13:02:30 +0200 Subject: [PATCH 19/27] Fix the syntax error on tt-rss config file --- nixos/modules/services/web-apps/tt-rss.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 08356cee1dfe..97a6a8d3f6c4 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -18,9 +18,9 @@ let tt-rss-config = let password = if (cfg.database.password != null) then - "${(escape ["'" "\\"] cfg.database.password)}" + "'${(escape ["'" "\\"] cfg.database.password)}'" else if (cfg.database.passwordFile != null) then - "file_get_contents('${cfg.database.passwordFile}'" + "file_get_contents('${cfg.database.passwordFile}')" else "" ; @@ -40,7 +40,7 @@ let putenv('TTRSS_DB_HOST=${optionalString (cfg.database.host != null) cfg.database.host}'); putenv('TTRSS_DB_USER=${cfg.database.user}'); putenv('TTRSS_DB_NAME=${cfg.database.name}'); - putenv('TTRSS_DB_PASS=${password}'); + putenv('TTRSS_DB_PASS=' . ${password}); putenv('TTRSS_DB_PORT=${toString dbPort}'); putenv('TTRSS_AUTH_AUTO_CREATE=${boolToString cfg.auth.autoCreate}'); From 0eaecd60cb90f6c7247751cee304476869a72fd1 Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Sat, 11 Dec 2021 15:01:15 +0200 Subject: [PATCH 20/27] tt-rss-module handle situations without any password --- nixos/modules/services/web-apps/tt-rss.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 97a6a8d3f6c4..9aa38ab25c9a 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -22,7 +22,7 @@ let else if (cfg.database.passwordFile != null) then "file_get_contents('${cfg.database.passwordFile}')" else - "" + null ; in pkgs.writeText "config.php" '' Date: Sat, 11 Dec 2021 15:56:17 +0000 Subject: [PATCH 21/27] closurecompiler: 20210808 -> 20211107 --- pkgs/development/compilers/closure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index c967af75bf22..3f32be22bd10 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20210808"; + version = "20211107"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "1cvibvm8l4mp64ml6lpsh3w62bgbr42pi3i7ga8ss0prhr0dsk3y"; + sha256 = "sha256-cz8A8KFlHJ1UCdkWLm+U8KPmFGNiiSXT1u9mvmDsFKY="; }; dontUnpack = true; From 04152bb85c11e7f4586c3085683ff573a2a04b48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 18:04:16 +0100 Subject: [PATCH 22/27] flexget: 3.2.1 -> 3.2.4 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 0bf312bd971b..cdd7eba2332a 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.1"; + version = "3.2.4"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "sha256-EOE72zpQj2yxxqDL9gqmu1NQ1B/lY1fh3EUwqpxf2xg="; + sha256 = "sha256-kwvZvIu+uACI2vBBy9eVuLLJlv1evUJ/4gI6rx1NW/g="; }; postPatch = '' From e7048a6c2b586845f8130b8005b18ccb753310a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 06:23:37 +0000 Subject: [PATCH 23/27] python38Packages.colorcet: 2.0.6 -> 3.0.0 --- pkgs/development/python-modules/colorcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 42945e8a152a..33e7942dfc89 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "colorcet"; - version = "2.0.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433"; + sha256 = "21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db"; }; propagatedBuildInputs = [ From 1bc0716555ef9184117a61c4d0d133f0b6c85464 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 11 Dec 2021 20:01:07 +0100 Subject: [PATCH 24/27] qt515.qtwebkit: fix build on darwin This fixes the build on darwin by correcting the patch which no longer applies. --- .../qt-5/5.15/qtwebkit-darwin-no-readline.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch index 26d189d86019..4871032f6f2c 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch @@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h #define HAVE_SYS_TIMEB_H 1 #if !PLATFORM(GTK) && !PLATFORM(QT) -diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake ---- a/Source/WTF/wtf/PlatformMac.cmake -+++ b/Source/WTF/wtf/PlatformMac.cmake -@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) - - find_library(COCOA_LIBRARY Cocoa) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) --find_library(READLINE_LIBRARY Readline) - list(APPEND WTF_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} -- ${READLINE_LIBRARY} - libicucore.dylib - ) - From cf504b2330061b05b7e449de74b02fcf0f5fe078 Mon Sep 17 00:00:00 2001 From: erdnaxe Date: Sat, 11 Dec 2021 20:45:54 +0100 Subject: [PATCH 25/27] nixos/nitter: remove syslog.target from service (#150224) --- nixos/modules/services/misc/nitter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix index 0c562343d85d..6a9eeb02095c 100644 --- a/nixos/modules/services/misc/nitter.nix +++ b/nixos/modules/services/misc/nitter.nix @@ -299,7 +299,7 @@ in systemd.services.nitter = { description = "Nitter (An alternative Twitter front-end)"; wantedBy = [ "multi-user.target" ]; - after = [ "syslog.target" "network.target" ]; + after = [ "network.target" ]; serviceConfig = { DynamicUser = true; StateDirectory = "nitter"; From fe44db8271d87ddf2747d145373c0b9f04188b77 Mon Sep 17 00:00:00 2001 From: spacefrogg Date: Sat, 11 Dec 2021 20:46:23 +0100 Subject: [PATCH 26/27] openafsServer: remove dependency on syslog.target (#150294) syslog.target has been deprecated and removed --- nixos/modules/services/network-filesystems/openafs/server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index c1bf83be77b9..9c974335defa 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -248,7 +248,7 @@ in { systemd.services = { openafs-server = { description = "OpenAFS server"; - after = [ "syslog.target" "network.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; restartIfChanged = false; unitConfig.ConditionPathExists = [ From bb976f4e86c91deb124d7267cc02b76e7b8f75b8 Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Sat, 11 Dec 2021 12:04:13 -0800 Subject: [PATCH 27/27] haskell.packages.ghcjs.vector: Fix evaluation failure (#150002) The derivation for the GHCJS `vector` package broke in #142940 due to introducing the line of code that this change deletes. The offending line appears to have been unintentionally added and causes an evaluation failure for two separate reason : * The argument order is wrong The change in #142940 switched the `haskellLib` utilities to flip their argument order, but the `appendPatch` in the offending line has the original argument order * The patch file referenced by the offending line does not exist The correct fix is to delete the line, because the patch is not necessary. The default version of the `vector` package is `0.12.3.1`, which already includes the fix from that patch. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 87f83182ea00..aa416012759e 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -101,9 +101,6 @@ self: super: # still present here https://github.com/glguy/th-abstraction/issues/53 th-abstraction = dontCheck super.th-abstraction; - # https://github.com/haskell/vector/issues/410 - vector = appendPatch super.vector (../compilers/ghcjs/patches/vector-ghcjs-storable-set.patch); - # Need hedgehog for tests, which fails to compile due to dep on concurrent-output zenc = dontCheck super.zenc; }