From 424f07f328f2b696aa316da6b0302eae4152b46d Mon Sep 17 00:00:00 2001 From: Pasquale Date: Tue, 23 Nov 2021 22:32:31 +0100 Subject: [PATCH 001/114] xxh: init at 0.8.7 --- pkgs/tools/networking/xxh/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/networking/xxh/default.nix diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix new file mode 100644 index 000000000000..99a0cc17e06d --- /dev/null +++ b/pkgs/tools/networking/xxh/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh }: +buildPythonApplication rec{ + pname = "xxh"; + version = "0.8.7"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + hash = "sha256-AKfiFBaV8DC/Z7Bc+ZpwcJor/mzYomUaQKKobKXICn4="; + }; + propagatedBuildInputs = [ pexpect pyyaml openssh ]; + meta = with lib; { + description = "Bring your favorite shell wherever you go through the ssh"; + homepage = "https://github.com/xxh/xxh"; + license = licenses.bsd2; + maintainers = [ maintainers.pasqui23 ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76b708f76c84..aee551573508 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10165,6 +10165,8 @@ in { inherit (pkgs.xorg) xorgserver; }; + xxh = callPackage ../tools/networking/xxh { }; + xxhash = callPackage ../development/python-modules/xxhash { }; yahooweather = callPackage ../development/python-modules/yahooweather { }; From 510ef1697788b82d3caa5d60b84ffab3263a2418 Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Wed, 24 Nov 2021 20:36:26 +0000 Subject: [PATCH 002/114] xxh:platform set by python Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/tools/networking/xxh/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index 99a0cc17e06d..c6a7769fd0b8 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -14,7 +14,6 @@ buildPythonApplication rec{ homepage = "https://github.com/xxh/xxh"; license = licenses.bsd2; maintainers = [ maintainers.pasqui23 ]; - platforms = platforms.all; }; } From a37d5183204a2587780691b52955a31487a17753 Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Thu, 25 Nov 2021 16:57:45 +0000 Subject: [PATCH 003/114] xxh: formatting Co-authored-by: Sandro --- pkgs/tools/networking/xxh/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index c6a7769fd0b8..3cc862cb48ed 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -1,14 +1,18 @@ { lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh }: + buildPythonApplication rec{ pname = "xxh"; version = "0.8.7"; + src = fetchFromGitHub { owner = pname; repo = pname; rev = version; hash = "sha256-AKfiFBaV8DC/Z7Bc+ZpwcJor/mzYomUaQKKobKXICn4="; }; + propagatedBuildInputs = [ pexpect pyyaml openssh ]; + meta = with lib; { description = "Bring your favorite shell wherever you go through the ssh"; homepage = "https://github.com/xxh/xxh"; From 6024d6cc61064ed231e2b0e89416ec2fe873fc0e Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Sun, 28 Nov 2021 14:41:30 +0000 Subject: [PATCH 004/114] xxh: better description Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/tools/networking/xxh/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index 3cc862cb48ed..0799f8cfe942 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -14,10 +14,9 @@ buildPythonApplication rec{ propagatedBuildInputs = [ pexpect pyyaml openssh ]; meta = with lib; { - description = "Bring your favorite shell wherever you go through the ssh"; + description = "Bring your favorite shell wherever you go through ssh"; homepage = "https://github.com/xxh/xxh"; license = licenses.bsd2; maintainers = [ maintainers.pasqui23 ]; }; - } From 5e9f0c1e979eafe21808905a2830c0c628e6bef5 Mon Sep 17 00:00:00 2001 From: Pasquale Date: Sat, 1 Jan 2022 21:49:11 +0100 Subject: [PATCH 005/114] xxh: 0.8.7 -> 0.8.8 --- pkgs/tools/networking/xxh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index 0799f8cfe942..1e9464ce8445 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec{ pname = "xxh"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-AKfiFBaV8DC/Z7Bc+ZpwcJor/mzYomUaQKKobKXICn4="; + hash = "sha256-TzC8GTDmnYN56Rp5DyZxh+yGrkgWr6Xt86a/jyB3j5k="; }; propagatedBuildInputs = [ pexpect pyyaml openssh ]; From 45db27da2ee6b8923c2ad5fcde2af1d82215fb69 Mon Sep 17 00:00:00 2001 From: Pasquale Date: Sat, 1 Jan 2022 22:16:13 +0100 Subject: [PATCH 006/114] xxh: added tests --- nixos/tests/all-tests.nix | 1 + nixos/tests/xxh.nix | 67 +++++++++++++++++++++++++++ pkgs/tools/networking/xxh/default.nix | 6 ++- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/xxh.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b8219416dc42..edf0a17cf690 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -504,6 +504,7 @@ in xrdp = handleTest ./xrdp.nix {}; xss-lock = handleTest ./xss-lock.nix {}; xterm = handleTest ./xterm.nix {}; + xxh = handleTest ./xxh.nix {}; yabar = handleTest ./yabar.nix {}; yggdrasil = handleTest ./yggdrasil.nix {}; zfs = handleTest ./zfs.nix {}; diff --git a/nixos/tests/xxh.nix b/nixos/tests/xxh.nix new file mode 100644 index 000000000000..3af8e53779e3 --- /dev/null +++ b/nixos/tests/xxh.nix @@ -0,0 +1,67 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + + let + inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + xxh-shell-zsh = pkgs.stdenv.mkDerivation { + pname = "xxh-shell-zsh"; + version = ""; + src = pkgs.fetchFromGitHub { + owner = "xxh"; + repo = "xxh-shell-zsh"; + # gets rarely updated, we can then just replace the hash + rev = "91e1f84f8d6e0852c3235d4813f341230cac439f"; + sha256 = "sha256-Y1FrIRxTd0yooK+ZzKcCd6bLSy5E2fRXYAzrIsm7rIc="; + }; + + postPatch = '' + substituteInPlace build.sh \ + --replace "echo Install wget or curl" "cp ${zsh-portable-binary} zsh-5.8-linux-x86_64.tar.gz" \ + --replace "command -v curl" "command -v this-should-not-trigger" + ''; + + installPhase = '' + mkdir -p $out + mv * $out/ + ''; + }; + + zsh-portable-binary = pkgs.fetchurl { + # kept in sync with https://github.com/xxh/xxh-shell-zsh/tree/master/build.sh#L27 + url = "https://github.com/romkatv/zsh-bin/releases/download/v3.0.1/zsh-5.8-linux-x86_64.tar.gz"; + sha256 = "sha256-i8flMd2Isc0uLoeYQNDnOGb/kK3oTFVqQgIx7aOAIIo="; + }; + in + { + name = "xxh"; + meta = with lib.maintainers; { + maintainers = [ lom ]; + }; + + nodes = { + server = { ... }: { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; + }; + + client = { ... }: { + programs.zsh.enable = true; + users.users.root.shell = pkgs.zsh; + environment.systemPackages = with pkgs; [ xxh git ]; + }; + }; + + testScript = '' + start_all() + + client.succeed("mkdir -m 700 /root/.ssh") + + client.succeed( + "cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa" + ) + client.succeed("chmod 600 /root/.ssh/id_ecdsa") + + server.wait_for_unit("sshd") + + client.succeed("xxh server -i /root/.ssh/id_ecdsa +hc \'echo $0\' +i +s zsh +I xxh-shell-zsh+path+${xxh-shell-zsh} | grep -Fq '/root/.xxh/.xxh/shells/xxh-shell-zsh/build/zsh-bin/bin/zsh'") + ''; + }) diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index 1e9464ce8445..c03708f08a31 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh }: +{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh, nixosTests }: buildPythonApplication rec{ pname = "xxh"; @@ -13,6 +13,10 @@ buildPythonApplication rec{ propagatedBuildInputs = [ pexpect pyyaml openssh ]; + passthru.tests = { + inherit (nixosTests) xxh; + }; + meta = with lib; { description = "Bring your favorite shell wherever you go through ssh"; homepage = "https://github.com/xxh/xxh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b91291488a..4aed44a93ac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29219,6 +29219,8 @@ with pkgs; gtk = gtk2; }; + xxh = with python3Packages; toPythonApplication xxh; + kodiPackages = recurseIntoAttrs (kodi.packages); kodi = callPackage ../applications/video/kodi { From a01bb4e8ce573a2aae7ad87f0c617e3154c4cbfb Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 23 Jan 2022 11:51:39 +0100 Subject: [PATCH 007/114] promtail: add package --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c387d041fdf..9a9e48049d5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21016,6 +21016,12 @@ with pkgs; buildGoModule = buildGo116Module; }; + promtail = grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; + }); + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; From 3e4ce974302e58b7d5ef90c41239cea3712d6160 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 23 Jan 2022 11:50:19 +0100 Subject: [PATCH 008/114] nixos/promtail: use promtail package --- nixos/modules/services/logging/promtail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 95c83796ece6..a34bc07b6ab2 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -45,7 +45,7 @@ in { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; From 0f09fb54d0dec50d3dd9f79bf5762c1b37a8b273 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 23 Jan 2022 15:13:25 +0100 Subject: [PATCH 009/114] impressive: 0.12.1 -> 0.13.0-beta2 --- pkgs/applications/office/impressive/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index f46d893d8948..09251ff3c9b6 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, stdenv, python2, makeWrapper, lib +{ fetchurl, stdenv, python3, makeWrapper, lib , SDL, ghostscript, pdftk, dejavu_fonts }: let - version = "0.12.1"; - pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); + version = "0.13.0-beta2"; + pythonEnv = python3.withPackages (ps: with ps; [pyopengl pygame pillow]); in stdenv.mkDerivation { # This project was formerly known as KeyJNote. # See http://keyj.emphy.de/apple-lawsuit/ for details. @@ -13,7 +13,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl"; + sha256 = "042a84yl1pfk7dmac4rgf5dlgbdvhv3i5zq5fqayg2yb278lb91q"; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" "$out/share/doc/impressive" "$out/share/man/man1" - mv impressive.py "$out/bin/impressive" + install -m 0755 impressive.py "$out/bin/impressive" mv impressive.1 "$out/share/man/man1" mv changelog.txt impressive.html license.txt "$out/share/doc/impressive" From c6d7a29ab605a5e1804cd30d5320c27dc8dfc91b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 05:52:02 +0000 Subject: [PATCH 010/114] codeql: 2.7.3 -> 2.7.5 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 7491b5892744..33dc9267eaba 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.7.3"; + version = "2.7.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-wvN9NODw8JV30mDGhs7qlCoyp3Z3bJSGUfQ6+GtE5kE="; + sha256 = "sha256-qTLpvb0yPB0+hR0Kkb7d3APlwdkkn6uNM0A80nPmjB4="; }; nativeBuildInputs = [ From 54aa307bd6bcf9e3390eaf5b22a1431502be17e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 11:42:25 +0000 Subject: [PATCH 011/114] go-swagger: 0.28.0 -> 0.29.0 --- pkgs/development/tools/go-swagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 06ae29938198..4f3a32fc3995 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bw84HQxrI8cSBEM1cxXmWCPqKZa5oGsob2iuUsiAZ+A="; + sha256 = "sha256-sahInHXv1GtylsY8kpw1dDjKiENmq4myx+7mq60vJAI="; }; - vendorSha256 = "sha256-ZNRJZQ7DwT/+scsbSud/IpSX06veOtJ5Aszj0RbS870="; + vendorSha256 = "sha256-DL2eN277cXfsw1dDvIbzkJRuKThgqFOzIufPQVpUzmU="; doCheck = false; From 1c7a90375cc8d2dccf3aff51eb828ccd2b5b63b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 20:54:07 +0100 Subject: [PATCH 012/114] python3Packages.pycfmodel: init at 0.13.0 --- .../python-modules/pycfmodel/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pycfmodel/default.nix diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix new file mode 100644 index 000000000000..320e6d51c7ac --- /dev/null +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pydantic +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pycfmodel"; + version = "0.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = pname; + rev = version; + hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; + }; + + propagatedBuildInputs = [ + pydantic + ]; + + checkInputs = [ + httpx + pytestCheckHook + ]; + + disabledTests = [ + # Test require network access + "test_cloudformation_actions" + ]; + + pythonImportsCheck = [ + "pycfmodel" + ]; + + meta = with lib; { + description = "Model for Cloud Formation scripts"; + homepage = "https://github.com/Skyscanner/pycfmodel"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34507b7a5bef..8af348f452b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6550,6 +6550,8 @@ in { inherit (pkgs) graphviz; }; + pycfmodel = callPackage ../development/python-modules/pycfmodel { }; + pychannels = callPackage ../development/python-modules/pychannels { }; pychart = callPackage ../development/python-modules/pychart { }; From 599d9d112c4aee5d724abd9757ec6f6ca7bd4099 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 21:22:24 +0100 Subject: [PATCH 013/114] python3Packages.cfn-flip: 1.2.2 -> 1.3.0 --- .../python-modules/cfn-flip/default.nix | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index bf3eab19d4fa..105775a4547e 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -1,25 +1,25 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib - -# pythonPackages +{ lib +, buildPythonPackage , click -, pytest -, pytest-cov -, pytest-runner +, fetchFromGitHub +, pytestCheckHook +, pythonOlder , pyyaml , six }: buildPythonPackage rec { pname = "cfn-flip"; - version = "1.2.2"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-cfn-template-flip"; rev = version; - sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm"; + hash = "sha256-1cV0mHc6+P0CbnLIMSSwNEzDB+1QzNjioH/EoIo40xU="; }; propagatedBuildInputs = [ @@ -29,27 +29,27 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest - pytest-cov - pytest-runner + pytestCheckHook ]; - checkPhase = '' - py.test \ - --cov=cfn_clean \ - --cov=cfn_flip \ - --cov=cfn_tools \ - --cov-report term-missing \ - --cov-report html + postPatch = '' + sed -i "/--cov/d" tox.ini ''; + disabledTests = [ + # TypeError: load() missing 1 required positional argument: 'Loader' + "test_flip_to_yaml_with_longhand_functions" + "test_yaml_no_ordered_dict" + ]; + + pythonImportsCheck = [ + "cfn_flip" + ]; + meta = with lib; { description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = licenses.asl20; - maintainers = with maintainers; [ - kamadorueda - psyanticy - ]; + maintainers = with maintainers; [ kamadorueda psyanticy ]; }; } From 6341bc1fcb9eae788307c5cd42fd27b6e905ebcb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 21:37:43 +0100 Subject: [PATCH 014/114] python3Packages.pydash: 4.9.3 -> 5.1.0 --- .../python-modules/pydash/default.nix | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index 7d75896397f3..5b0ffade5885 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -1,23 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, invoke +, mock +, pytestCheckHook +, pythonOlder +, sphinx_rtd_theme +}: buildPythonPackage rec { pname = "pydash"; - version = "4.9.3"; + version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dgilland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; + hash = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; }; - patches = [ ./0001-Only-build-unit-tests.patch ]; + checkInputs = [ + invoke + mock + sphinx_rtd_theme + pytestCheckHook + ]; - checkInputs = [ mock pytestCheckHook invoke ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov/d" setup.cfg + ''; + + pythonImportsCheck = [ + "pydash" + ]; meta = with lib; { - homepage = "https://github.com/dgilland/pydash"; - description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library."; + description = "Python utility libraries for doing stuff in a functional way"; + homepage = "https://pydash.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; From 4ea11f45a80b20ce31b856530fb8ca4f61e95c35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 22:18:07 +0100 Subject: [PATCH 015/114] cfripper: init at 1.3.1 --- pkgs/tools/security/cfripper/default.nix | 56 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/tools/security/cfripper/default.nix diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix new file mode 100644 index 000000000000..fd39847c014b --- /dev/null +++ b/pkgs/tools/security/cfripper/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cfripper"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = pname; + rev = version; + hash = "sha256-BWdXSHIicMa3PgGoF4GGAOh2LAJWt+7svMLFGhWIkn0="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + boto3 + cfn-flip + click + pluggy + pycfmodel + pydash + pyyaml + setuptools + ]; + + checkInputs = with python3.pkgs; [ + moto + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "click~=7.1.1" "click" \ + --replace "pluggy~=0.13.1" "pluggy" \ + --replace "pydash~=4.7.6" "pydash" + ''; + + disabledTestPaths = [ + # Tests are failing + "tests/test_boto3_client.py" + "tests/config/test_pluggy.py" + ]; + + pythonImportsCheck = [ + "cfripper" + ]; + + meta = with lib; { + description = "Tool for analysing CloudFormation templates"; + homepage = "https://github.com/Skyscanner/cfripper"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de4423285068..393ba848d060 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14379,6 +14379,8 @@ with pkgs; cfr = callPackage ../development/tools/java/cfr { }; + cfripper = callPackage ../tools/security/cfripper { }; + checkra1n = callPackage ../development/mobile/checkra1n { }; checkstyle = callPackage ../development/tools/analysis/checkstyle { }; From a87e48162bf374b994d76dd2f5f189e94968c380 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 25 Jan 2022 02:29:24 +0100 Subject: [PATCH 016/114] ddrescue: 1.25 -> 1.26 --- pkgs/tools/system/ddrescue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 6191947ac32f..829d249da5b0 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ddrescue"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; - sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"; + sha256 = "sha256-5RPNOpDZgQ392RGX1AqkD23wFZe/tez9+yBd4RJ8VR8="; }; nativeBuildInputs = [ lzip ]; From 03d1f34183e3f087bb5e702fe048ac902424fba7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 25 Jan 2022 02:37:07 +0100 Subject: [PATCH 017/114] janus-gateway: 0.11.5 -> 0.11.7 --- pkgs/servers/janus-gateway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 1ccaca421337..681d7b2ded59 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "0.11.5"; + version = "0.11.7"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+ojBVdglOTqdmWT8QPUzJRT7RgtXxEOLNC5GqP0vO6Y="; + sha256 = "sha256-7Q/mbY3Sh2Hl1iXDN/ZM3sLz0FCsYdT8QxiyCQC2qN0="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; From f520cc575ad5da8200d90a8b2381cd8430509b28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 15:55:42 +0100 Subject: [PATCH 018/114] skjold: init at 0.4.1 --- pkgs/development/tools/skjold/default.nix | 79 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/tools/skjold/default.nix diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix new file mode 100644 index 000000000000..173de27d945e --- /dev/null +++ b/pkgs/development/tools/skjold/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "skjold"; + version = "0.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "twu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-xz6N7/LS3wOymh9tet8OLgsSaretzuMU4hQd+LeUPJ4="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + packaging + pyyaml + toml + ]; + + checkInputs = with python3.pkgs; [ + pytest-mock + pytest-watch + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/twu/skjold/pull/91 + (fetchpatch { + name = "switch-poetry-core.patch"; + url = "https://github.com/twu/skjold/commit/b341748c9b11798b6a5182d659a651b0f200c6f5.patch"; + sha256 = "sha256-FTZTbIudO6lYO9tLD4Lh1h5zsTeKYtflR2tbbHZ5auM="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'packaging = "^21.0"' 'packaging = "*"' \ + --replace 'pyyaml = "^5.3"' 'pyyaml = "*"' + ''; + + disabledTestPaths = [ + # Too sensitive to pass + "tests/test_cli.py" + ]; + + disabledTests = [ + # Requires network access + "pyup-werkzeug" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_gemnasium_update" + "test_ensure_missing_github_token_raises_usage_error" + "test_ensure_pypi_advisory_db_update" + "test_ensure_source_is_affected_single" + "test_osv_advisory_with_vulnerable_package_via_osv_api" + "urllib3" + ]; + + pythonImportsCheck = [ + "skjold" + ]; + + meta = with lib; { + description = "Tool to Python dependencies against security advisory databases"; + homepage = "https://github.com/twu/skjold"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de4423285068..76fedb7b8664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19765,6 +19765,8 @@ with pkgs; skaffold = callPackage ../development/tools/skaffold { }; + skjold = callPackage ../development/tools/skjold { }; + skalibs = skawarePackages.skalibs; skalibs_2_10 = skawarePackages.skalibs_2_10; From 59078992d1d0b961d57b477b946a31d7aed3d6aa Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 26 Jan 2022 08:46:04 +0100 Subject: [PATCH 019/114] ptcollab: 0.5.0.3 -> 0.6.0.2 --- pkgs/applications/audio/ptcollab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 16ef4ed6e45e..279105605d34 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.5.0.3"; + version = "0.6.0.2"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-8bgi621psvUlhiLyZ15tKGmGOs6HTf5/6Ru2Z9l8QIo="; + sha256 = "sha256-9goELqV7GP2/8w3Tw4Gph0UBgR/2T+wo2g+lhrQG4tA="; }; nativeBuildInputs = [ qmake pkg-config ]; From f39d5951477fcb366fe858543ac9500da6a8a9c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jan 2022 21:15:34 +0100 Subject: [PATCH 020/114] extrude: init at 0.0.12 --- pkgs/tools/security/extrude/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/extrude/default.nix diff --git a/pkgs/tools/security/extrude/default.nix b/pkgs/tools/security/extrude/default.nix new file mode 100644 index 000000000000..dbe9471bf2da --- /dev/null +++ b/pkgs/tools/security/extrude/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "extrude"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "liamg"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7gCEBhnNU5CqC5n0KP4Dd/fmddPRwNqyMFXTrRrJjfU="; + }; + + vendorSha256 = "sha256-auhRXKt5dcQ+gr3a9Wfen8/BISP17HVsIRP16sBmiZM="; + + meta = with lib; { + description = "Tool to analyse binaries for missing security features"; + homepage = "https://github.com/liamg/extrude"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 778ce279d7e6..de84ef9f9d2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2975,6 +2975,8 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + extrude = callPackage ../tools/security/extrude { }; + f3 = callPackage ../tools/filesystems/f3 { }; f3d = callPackage ../applications/graphics/f3d { From e5dfca887c243a401effa3eb7912d2b2a5ed57ea Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 26 Jan 2022 23:11:45 +0100 Subject: [PATCH 021/114] hydrus: 470b -> 471 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 08293f748de7..7efd1192642a 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "470b"; + version = "471"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "0v52krjcqykrm3zqj6idzvbpjv4fhbgvq2jr8k0g63f7db7p08h9"; + sha256 = "sha256-KRAPnYjDWXZ56OctGvEticQs5wSMFS27kGdpxj0mk0g="; }; nativeBuildInputs = [ From 47c82c04aec0e4be42a858d09a9c27430595f957 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 25 Jan 2022 19:31:30 -0800 Subject: [PATCH 022/114] update-python-libraries: use sri-hash --- .../update-python-libraries.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index ee610b262026..5f55ed5ecaf1 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -340,13 +340,19 @@ def _update_package(path, target): raise ValueError("no file available for {}.".format(pname)) text = _replace_value('version', new_version, text) + # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts + # sri hashes have been the default format since nix 2.4+ + try: + sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + except subprocess.CalledProcessError: + # nix<2.4 compat + sri_hash = subprocess.check_output(["nix", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + # fetchers can specify a sha256, or a sri hash try: - text = _replace_value('sha256', new_sha256, text) + text = _replace_value('sha256', sri_hash, text) except ValueError: - # hashes from pypi are 16-bit encoded sha256's, need translate to an sri hash if used with "hash" - sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': From c8033a0787adce888234db268e216928279183ef Mon Sep 17 00:00:00 2001 From: StephenWithPH Date: Wed, 26 Jan 2022 18:56:15 -0800 Subject: [PATCH 023/114] LAStools: 201003 -> 2.0.0 --- pkgs/development/libraries/LAStools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index f9f3b09ba0ac..d38fa0609d86 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "LAStools"; - version = "201003"; # LAStools makes release-ish commits with a message containing their version number as YYMMDD; these align with their website changelog + version = "2.0.0"; src = fetchFromGitHub { owner = "LAStools"; repo = "LAStools"; - rev = "635b76b42cc4912762da31b92f875df5310e1714"; - sha256 = "0682ca3bp51lmfp46vsjnd1bqpn05g95pf4kclvjv1y8qivkxsaq"; + rev = "v${version}"; + sha256 = "19y49j5af3z3fsiknq9kg9yjcsr73ywng8dfy837y97q4shc9g00"; }; patches = [ From 471845e52a1f6c24e0251acc376dc09dd18f732e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 04:21:44 +0000 Subject: [PATCH 024/114] qownnotes: 22.1.9 -> 22.1.10.1 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index c6ee045dfbf9..2f2446169891 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.1.9"; + version = "22.1.10.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "sha256-vUYfZpqOe7cZJxrNPXN2gCyNRNqC2/NA83+UCL9+mq0="; + sha256 = "sha256-uXDkLDDIRGSxXCczG9TQxtcLFjjOjKtyl/LRMax7JX4="; }; nativeBuildInputs = [ qmake qttools ]; From 487aa0781d2151e5be83f0f39f73c3941ba24028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 26 Jan 2022 14:03:05 +0100 Subject: [PATCH 025/114] breitbandmessung: init at 3.1.0 --- nixos/tests/all-tests.nix | 1 + nixos/tests/breitbandmessung.nix | 32 ++++ .../networking/breitbandmessung/default.nix | 153 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 188 insertions(+) create mode 100644 nixos/tests/breitbandmessung.nix create mode 100644 pkgs/applications/networking/breitbandmessung/default.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 62bc8acef606..44015e1e4b77 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -55,6 +55,7 @@ in borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {}; + breitbandmessung = handleTest ./breitbandmessung.nix {}; brscan5 = handleTest ./brscan5.nix {}; btrbk = handleTest ./btrbk.nix {}; buildbot = handleTest ./buildbot.nix {}; diff --git a/nixos/tests/breitbandmessung.nix b/nixos/tests/breitbandmessung.nix new file mode 100644 index 000000000000..0ad82d45331d --- /dev/null +++ b/nixos/tests/breitbandmessung.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "breitbandmessung"; + meta.maintainers = with lib.maintainers; [ b4dm4n ]; + + machine = { pkgs, ... }: { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + test-support.displayManager.auto.user = "alice"; + + environment.systemPackages = with pkgs; [ breitbandmessung ]; + environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; + + # breitbandmessung is unfree + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "breitbandmessung" ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + # increase screen size to make the whole program visible + machine.succeed("xrandr --output Virtual-1 --mode 1280x1024") + machine.execute("su - alice -c breitbandmessung >&2 &") + machine.wait_for_window("Breitbandmessung") + machine.wait_for_text("Breitbandmessung") + machine.wait_for_text("Datenschutz") + machine.screenshot("breitbandmessung") + ''; +}) diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix new file mode 100644 index 000000000000..2a57379d9916 --- /dev/null +++ b/pkgs/applications/networking/breitbandmessung/default.nix @@ -0,0 +1,153 @@ +{ lib +, stdenv +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, dpkg +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, libdrm +, libxkbcommon +, makeWrapper +, mesa +, nixosTests +, nspr +, nss +, pango +, pciutils +, systemd +, undmg +, writeShellScriptBin +, xorg +}: + +let + inherit (stdenv.hostPlatform) system; + + version = "3.1.0"; + + # At first start, the program checks for supported operating systems by calling `lsb_release -a` + # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy. + fake-lsb-release = writeShellScriptBin "lsb_release" '' + echo "Distributor ID: Debian" + echo "Description: Debian GNU/Linux 10 (buster)" + echo "Release: 10" + echo "Codename: buster" + ''; + + binPath = lib.makeBinPath [ + fake-lsb-release + ]; + + systemArgs = rec { + x86_64-linux = rec { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-linux.deb"; + sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = runtimeDependencies; + + runtimeDependencies = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + pciutils + systemd + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + xorg.libxshmfence + ]; + + installPhase = '' + dpkg-deb -x $src $out + mkdir -p $out/bin + + chmod -R g-w $out + + addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung + autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung + + makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \ + --prefix PATH : ${binPath} + + mv $out/usr/share $out/share + rmdir $out/usr + + # Fix the desktop link + substituteInPlace $out/share/applications/breitbandmessung.desktop \ + --replace /opt/Breitbandmessung $out/bin + ''; + + dontAutoPatchelf = true; + dontPatchELF = true; + }; + + x86_64-darwin = { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-mac.dmg"; + sha256 = "sha256-2c8mDKJuHDSw7p52EKnJO5vr2kNTLU6r9pmGPANjE20="; + }; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications/Breitbandmessung.app + cp -R . $out/Applications/Breitbandmessung.app + runHook postInstall + ''; + }; + + aarch64-darwin = x86_64-darwin; + }.${system} or (throw "Unsupported system: ${system}"); +in +stdenv.mkDerivation ({ + pname = "breitbandmessung"; + inherit version; + + passthru.tests = { inherit (nixosTests) breitbandmessung; }; + + meta = with lib; { + description = "Broadband internet speed test app from the german Bundesnetzagentur"; + homepage = "https://www.breitbandmessung.de"; + license = licenses.unfree; + maintainers = with maintainers; [ b4dm4n ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} // systemArgs) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54e661d6af0f..63fcff0c5cd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1083,6 +1083,8 @@ with pkgs; archi = callPackage ../tools/misc/archi { }; + breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; From 6896f3beb7b358b23f9fc485bc36887e0b376630 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 27 Jan 2022 14:00:40 +0100 Subject: [PATCH 026/114] phoronix-test-suite: 10.8.0 -> 10.8.1 Fixes CVE-2022-0238 https://github.com/phoronix-test-suite/phoronix-test-suite/releases/tag/v10.8.1 --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index edf61ddf6b40..4d0c33137345 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.8.0"; + version = "10.8.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-HvyMkafW2QdSlizWkOsv9U8VSN9Y9Z3F1jt1PwF9nuo="; + sha256 = "sha256-O1jqaUQZymCNcp+mznLtK0xRr0RHKe77zcbmcCkMqn8="; }; buildInputs = [ php ]; From ee68e7a2a9c8cc97aae3a5e16b7b3ad5bb273a50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 19:23:57 +0800 Subject: [PATCH 027/114] =?UTF-8?q?libshumate:=20unstable-2021-10-06=20?= =?UTF-8?q?=E2=86=92=201.0.0.alpha.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/blob/1.0.0.alpha.1/NEWS --- .../libraries/libshumate/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index e987e5a892c4..7443ec4c502d 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -13,12 +13,12 @@ , libsoup , gtk4 , xvfb-run -, unstableGitUpdater +, gnome }: stdenv.mkDerivation rec { pname = "libshumate"; - version = "unstable-2021-10-06"; + version = "1.0.0.alpha.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libshumate"; - rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; - sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; + rev = version; + sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg="; }; nativeBuildInputs = [ @@ -68,11 +68,14 @@ stdenv.mkDerivation rec { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput share/doc/libshumate-0.0 "$devdoc" + moveToOutput share/doc/libshumate-1.0 "$devdoc" ''; - passthru.updateScript = unstableGitUpdater { - url = meta.homepage; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; }; meta = with lib; { From a56682b80e51912c0c0b35e1efdb90c1725d2b47 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 27 Jan 2022 20:27:22 +0800 Subject: [PATCH 028/114] =?UTF-8?q?ashpd-demo:=200.0.1-alpha=20=E2=86=92?= =?UTF-8?q?=200.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/bilelmoussaoui/ashpd/releases/tag/0.2.0 https://github.com/bilelmoussaoui/ashpd/releases/tag/0.2.1 https://github.com/bilelmoussaoui/ashpd/releases/tag/0.2.2 --- pkgs/development/tools/ashpd-demo/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index a52a6ca8179b..f6842dacec9e 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -4,7 +4,6 @@ , nix-update-script , meson , ninja -, python3 , rustPlatform , pkg-config , glib @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { pname = "ashpd-demo"; - version = "0.0.1-alpha"; + version = "0.2.2"; src = let @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { owner = "bilelmoussaoui"; repo = "ashpd"; rev = version; - sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY="; }; in "${share}/ashpd-demo"; @@ -38,14 +37,13 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc @@ -70,13 +68,6 @@ stdenv.mkDerivation rec { # included by libspa-sys requires BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; - postPatch = '' - patchShebangs build-aux/meson_post_install.py - # https://github.com/bilelmoussaoui/ashpd/pull/32 - substituteInPlace build-aux/meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - passthru = { updateScript = nix-update-script { attrPath = pname; @@ -86,7 +77,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for playing with XDG desktop portals"; homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; - broken = true; # requires older libadwaita license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; From 9ec1d80c55807213d54548708c52a8c1c9a7df4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 27 Jan 2022 14:39:02 +0100 Subject: [PATCH 029/114] nixos/tests/breitbandmessung: use virtualisation.resolution option --- nixos/tests/breitbandmessung.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/breitbandmessung.nix b/nixos/tests/breitbandmessung.nix index 0ad82d45331d..12b1a094839b 100644 --- a/nixos/tests/breitbandmessung.nix +++ b/nixos/tests/breitbandmessung.nix @@ -8,6 +8,9 @@ import ./make-test-python.nix ({ lib, ... }: { ./common/x11.nix ]; + # increase screen size to make the whole program visible + virtualisation.resolution = { x = 1280; y = 1024; }; + test-support.displayManager.auto.user = "alice"; environment.systemPackages = with pkgs; [ breitbandmessung ]; @@ -21,8 +24,6 @@ import ./make-test-python.nix ({ lib, ... }: { testScript = '' machine.wait_for_x() - # increase screen size to make the whole program visible - machine.succeed("xrandr --output Virtual-1 --mode 1280x1024") machine.execute("su - alice -c breitbandmessung >&2 &") machine.wait_for_window("Breitbandmessung") machine.wait_for_text("Breitbandmessung") From ddab64189776da29169fbdc30b9e6c0024ebb43b Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 16 Sep 2021 21:23:17 +0200 Subject: [PATCH 030/114] python3Packages.warcio: init at 1.7.4 --- .../python-modules/warcio/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/warcio/default.nix diff --git a/pkgs/development/python-modules/warcio/default.nix b/pkgs/development/python-modules/warcio/default.nix new file mode 100644 index 000000000000..ae870a37fe57 --- /dev/null +++ b/pkgs/development/python-modules/warcio/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, six +, setuptools +, pytestCheckHook +, httpbin +, requests +, wsgiprox +, multidict +}: + +buildPythonPackage rec { + pname = "warcio"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "webrecorder"; + repo = "warcio"; + rev = "aa702cb321621b233c6e5d2a4780151282a778be"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 + sha256 = "sha256-wn2rd73wRfOqHu9H0GIn76tmEsERBBCQatnk4b/JToU="; + }; + + patches = [ + (fetchpatch { + name = "add-offline-option.patch"; + url = "https://github.com/webrecorder/warcio/pull/135/commits/2546fe457c57ab0b391764a4ce419656458d9d07.patch"; + sha256 = "sha256-3izm9LvAeOFixiIUUqmd5flZIxH92+NxL7jeu35aObQ="; + }) + ]; + + propagatedBuildInputs = [ + six + setuptools + ]; + + checkInputs = [ + pytestCheckHook + httpbin + requests + wsgiprox + multidict # Optional. Without this, one test in test/test_utils.py is skipped. + ]; + + pytestFlagsArray = [ "--offline" ]; + + pythonImportsCheck = [ "warcio" ]; + + meta = with lib; { + description = "Streaming WARC/ARC library for fast web archive IO"; + homepage = "https://github.com/webrecorder/warcio"; + license = licenses.asl20; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cd3243d1a98..95937fe941ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10308,6 +10308,8 @@ in { wandb = callPackage ../development/python-modules/wandb { }; + warcio = callPackage ../development/python-modules/warcio { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; From a68c4e1d287ed3fecb825934e2de17244d637f23 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 27 Jan 2022 18:35:15 +0200 Subject: [PATCH 031/114] nextcloud-client: 3.4.1 -> 3.4.2 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index bbdddbf60682..874c0f8a177f 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-1fUk4PUFkWcLOvrYvM+K+ZarUSeq/JtDU2bHHPoAoC8="; + sha256 = "sha256-cqpdn2STxJtUTBRFrUh1lRIDaFZfrRkJMxcJuTKxgk8="; }; patches = [ From 8e7c58dc44e043f8629d5e96848ab594f684cbbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:04:04 +0000 Subject: [PATCH 032/114] =?UTF-8?q?poppler:=2021.06.1=20=E2=86=92=2022.01.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://lists.freedesktop.org/archives/poppler/2021-July/014803.html - https://lists.freedesktop.org/archives/poppler/2021-August/014836.html - https://lists.freedesktop.org/archives/poppler/2021-September/014870.html - https://lists.freedesktop.org/archives/poppler/2021-October/014910.html - https://lists.freedesktop.org/archives/poppler/2021-November/014954.html - https://lists.freedesktop.org/archives/poppler/2021-December/014991.html - https://lists.freedesktop.org/archives/poppler/2022-January/015023.html c++17 is now minimum --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 08ca1456ea8f..6fa07bcaf806 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ="; + sha256 = "sha256-fTSTBWtbhkE+XGk8LK4CxcBs2OYY0UwsMeLIS2eyMT4="; }; nativeBuildInputs = [ From 490b9b0fa0e7e90ca5bea9cfe79561a97a641530 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Dec 2021 10:44:31 +0100 Subject: [PATCH 033/114] poppler-data: clean up https://lists.freedesktop.org/archives/poppler/2021-September/014871.html --- pkgs/data/misc/poppler-data/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d1e0434dc286..6d35279b6de2 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,20 +1,30 @@ -{ fetchurl, lib, stdenv, cmake, ninja }: +{ fetchurl +, lib +, stdenv +, cmake +, ninja +, poppler +}: stdenv.mkDerivation rec { - name = "poppler-data-0.4.11"; + pname = "poppler-data"; + version = "0.4.11"; src = fetchurl { - url = "https://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "sha256-LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; + url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz"; + sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = with maintainers; [ ]; + maintainers = poppler.meta.maintainers; }; } From c4b9851332bcef5e4554e306df791b3b4b14409a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Dec 2021 16:57:10 +0100 Subject: [PATCH 034/114] inkscape: fix build with Poppler 21.11.0 --- pkgs/applications/graphics/inkscape/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 24f3a555fd5a..271173a8b027 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "share/extensions/"; }) + + # Fix build with Poppler 21.11.0. + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch"; + sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg="; + }) + # Remove mandatory break from end of paragraphs, added in Pango 1.49 # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 # TODO: Remove in Inkscape 1.1.2 From a18bad9ba31880f612d6536611a4daf7f044800d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 16 Jan 2022 13:14:25 -0500 Subject: [PATCH 035/114] kodi.packages.controller-topology-project: init at unstable-2022-01-22 --- .../controller-topology-project/default.nix | 35 +++++++++++++++++++ .../video/kodi/addons/controllers/default.nix | 22 ------------ pkgs/top-level/kodi-packages.nix | 28 ++++----------- 3 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 pkgs/applications/video/kodi/addons/controller-topology-project/default.nix delete mode 100644 pkgs/applications/video/kodi/addons/controllers/default.nix diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix new file mode 100644 index 000000000000..2607ee64f70a --- /dev/null +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, toKodiAddon, addonDir }: +let + drv = stdenv.mkDerivation { + pname = "controller-topology-project"; + version = "unstable-2022-01-22"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "controller-topology-project"; + rev = "e2a9bac903f21b2acfeee374070cfc97d03aba2d"; + sha256 = "sha256-o6uKxOjEYNAK27drvNOokOFPdjkOEnr49mBre9ycM0w="; + }; + + postPatch = '' + # remove addons already included in the base kodi package + rm -r addons/game.controller.default + rm -r addons/game.controller.snes + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out${addonDir} + cp -r addons/* $out${addonDir} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/kodi-game/controller-topology-project"; + description = "Models how controllers connect to and map to each other for all gaming history"; + license = with licenses; [ odbl ]; + maintainers = teams.kodi.members; + }; + }; +in + toKodiAddon drv diff --git a/pkgs/applications/video/kodi/addons/controllers/default.nix b/pkgs/applications/video/kodi/addons/controllers/default.nix deleted file mode 100644 index 825ad5d53fc4..000000000000 --- a/pkgs/applications/video/kodi/addons/controllers/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildKodiAddon, fetchFromGitHub, controller }: -buildKodiAddon rec { - pname = "game-controller-${controller}"; - namespace = "game.controller.${controller}"; - version = "1.0.3"; - - sourceDir = "addons/" + namespace; - - src = fetchFromGitHub { - owner = "kodi-game"; - repo = "kodi-game-controllers"; - rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18"; - sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; - }; - - meta = with lib; { - description = "Add support for different gaming controllers."; - platforms = platforms.all; - license = licenses.odbl; - maintainers = teams.kodi.members; - }; -} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index d86c9c6778e8..6771ffe65b1d 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -1,4 +1,4 @@ -{ lib, newScope, kodi, libretro }: +{ config, lib, newScope, kodi, libretro }: with lib; @@ -54,25 +54,7 @@ let self = rec { arteplussept = callPackage ../applications/video/kodi/addons/arteplussept { }; - controllers = { - default = callPackage ../applications/video/kodi/addons/controllers { controller = "default"; }; - - dreamcast = callPackage ../applications/video/kodi/addons/controllers { controller = "dreamcast"; }; - - gba = callPackage ../applications/video/kodi/addons/controllers { controller = "gba"; }; - - genesis = callPackage ../applications/video/kodi/addons/controllers { controller = "genesis"; }; - - mouse = callPackage ../applications/video/kodi/addons/controllers { controller = "mouse"; }; - - n64 = callPackage ../applications/video/kodi/addons/controllers { controller = "n64"; }; - - nes = callPackage ../applications/video/kodi/addons/controllers { controller = "nes"; }; - - ps = callPackage ../applications/video/kodi/addons/controllers { controller = "ps"; }; - - snes = callPackage ../applications/video/kodi/addons/controllers { controller = "snes"; }; - }; + controller-topology-project = callPackage ../applications/video/kodi/addons/controller-topology-project { }; iagl = callPackage ../applications/video/kodi/addons/iagl { }; @@ -171,4 +153,8 @@ let self = rec { trakt-module = callPackage ../applications/video/kodi/addons/trakt-module { }; trakt = callPackage ../applications/video/kodi/addons/trakt { }; -}; in self +}; in self // lib.optionalAttrs (config.allowAliases or true) { + # deprecated or renamed packages + + controllers = throw "kodi.packages.controllers has been replaced with kodi.packages.controller-topology-project - a package which contains a large number of controller profiles." { }; +} From d8bcc674c4bac48aedc7f421fcc2c3d0487a150a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Jan 2022 17:20:17 +0100 Subject: [PATCH 036/114] gdal: fix build with latest poppler Poppler 22.01.0 requires std=c++17: https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1027 --- pkgs/development/libraries/gdal/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 124c0a48cde6..3e5ae303dd77 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -62,7 +62,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = lib.concatStringsSep " " [ + "-fpermissive" + # poppler uses std::optional + "-std=c++17" + ]; # - Unset CC and CXX as they confuse libtool. # - teach gdal that libdf is the legacy name for libhdf From 46c427535a72a3bcd32c2e9ff0eafc0e9e399996 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Jan 2022 17:23:13 +0100 Subject: [PATCH 037/114] scribusUnstable: fix build with latest poppler Poppler 22.01.0 requires std=c++17: https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1027 It will be enforced in next release: https://github.com/scribusproject/scribus/commit/0b1abeff0891b0907cdccb4ae965541b24b611f8 --- pkgs/applications/office/scribus/unstable.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 6aed41d7f9af..21adb90cab9e 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -83,6 +83,11 @@ mkDerivation rec { qttools ]; + cmakeFlags = [ + # poppler uses std::optional + "-DWANT_CPP17=ON" + ]; + meta = with lib; { maintainers = with maintainers; [ erictapen From 683d5696e38d777c1743d5b57a2c6d9a2a586457 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Jan 2022 00:46:16 +0000 Subject: [PATCH 038/114] varnish70: 7.0.1 -> 7.0.2 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 030af847874b..7684510d7715 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -52,8 +52,8 @@ in sha256 = "1g0pwyckc0xh6ag6wj082x9wn4q6p6krjgc16fkw1arl71c18wsh"; }; varnish70 = (common { - version = "7.0.1"; - sha256 = "0q265fzarz5530g8lasvfpgks8z1kq1yh7rn88bn2qfly3pmpry4"; + version = "7.0.2"; + sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj"; }).overrideAttrs (oA: { patches = [ (fetchpatch { From cf2bdd298b4a406bfe37efb1e9fc37294bad02f1 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 27 Jan 2022 00:57:45 +0000 Subject: [PATCH 039/114] varnish60: 6.0.9 -> 6.0.10 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 7684510d7715..7d52b3a0a266 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -48,8 +48,8 @@ let in { varnish60 = common { - version = "6.0.9"; - sha256 = "1g0pwyckc0xh6ag6wj082x9wn4q6p6krjgc16fkw1arl71c18wsh"; + version = "6.0.10"; + sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb"; }; varnish70 = (common { version = "7.0.2"; From 617d557d3bdd0d558d52ed423314ac12ead6e8e3 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Thu, 27 Jan 2022 15:40:02 -0500 Subject: [PATCH 040/114] gnome-2048: init at 3.38.2 --- .../services/x11/desktop-managers/gnome.nix | 1 + .../gnome/games/gnome-2048/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 57 insertions(+) create mode 100644 pkgs/desktops/gnome/games/gnome-2048/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index efc9bd39b366..e2323785149a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -569,6 +569,7 @@ in atomix five-or-more four-in-a-row + pkgs.gnome-2048 gnome-chess gnome-klotski gnome-mahjongg diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/desktops/gnome/games/gnome-2048/default.nix new file mode 100644 index 000000000000..bba3000b7f21 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-2048/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, meson +, vala +, pkg-config +, ninja +, itstool +, clutter-gtk +, libgee +, gnome +, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-twenty-forty-eight"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; + sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; + }; + + nativeBuildInputs = [ + itstool + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gtk + libgee + gnome.libgnome-games-support + gtk3 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-2048"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/2048"; + description = "Obtain the 2048 tile"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54e661d6af0f..58c48237e1fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5896,6 +5896,8 @@ with pkgs; gnirehtet = callPackage ../tools/networking/gnirehtet { }; + gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; + gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; From 6c2acb04c244f6065f223072cd6b1829114560b7 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 20:50:30 +0000 Subject: [PATCH 041/114] python3Packages.dm-haiku: jaxlib is a test dependency --- pkgs/development/python-modules/dm-haiku/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 5468776c72d1..14ceebf0a19b 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -4,6 +4,7 @@ , dill , dm-tree , fetchFromGitHub +, jaxlib , jmp , lib , pytestCheckHook @@ -31,6 +32,7 @@ buildPythonPackage rec { chex cloudpickle dm-tree + jaxlib pytestCheckHook tensorflow ]; From 501df061ed4be9c1609bbb0c73cddf458dfc3f80 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 20:50:47 +0000 Subject: [PATCH 042/114] python3Packages.jmp: jaxlib is a test dependency --- pkgs/development/python-modules/jmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix index dc096b93ae46..09c41a7ededd 100644 --- a/pkgs/development/python-modules/jmp/default.nix +++ b/pkgs/development/python-modules/jmp/default.nix @@ -19,10 +19,9 @@ buildPythonPackage rec { sha256 = "0hh4cmp93wjyidj48gh07vhx2kjvpwd23xvy79bsjn5qaaf6q4cm"; }; - # Wheel requires only `numpy`, but the import needs both `jax` and `jaxlib`. + # Wheel requires only `numpy`, but the import needs `jax`. propagatedBuildInputs = [ jax - jaxlib ]; pythonImportsCheck = [ @@ -30,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + jaxlib pytestCheckHook ]; From 97a90b8d6fb51d3308255a90ba9c5f6a2b9e7a0e Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 20:51:07 +0000 Subject: [PATCH 043/114] python3Packages.treeo: jaxlib is a test dependency --- pkgs/development/python-modules/treeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 3629b47e8a29..4eac9ddeae12 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { poetry-core ]; - # These deps are not needed for the wheel, but required during the import. + # jax is not declared in the dependencies, but is necessary. propagatedBuildInputs = [ jax - jaxlib ]; + checkInputs = [ jaxlib ]; pythonImportsCheck = [ "treeo" ]; From 9d9a54adeaff2f1c4d46dad6baa8084867303b71 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 20:51:58 +0000 Subject: [PATCH 044/114] python3Packages.elegy: jaxlib belongs in buildInputs --- pkgs/development/python-modules/elegy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix index ec968dce8ec3..5b0cb293c0a3 100644 --- a/pkgs/development/python-modules/elegy/default.nix +++ b/pkgs/development/python-modules/elegy/default.nix @@ -4,6 +4,7 @@ , deepmerge , dm-haiku , fetchFromGitHub +, jaxlib , lib , poetry , pytestCheckHook @@ -35,6 +36,8 @@ buildPythonPackage rec { poetry ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ cloudpickle deepdish From c674a64ce671d3b8df1b6afa57e581dc47d793cd Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 20:52:07 +0000 Subject: [PATCH 045/114] python3Packages.flax: jaxlib belongs in buildInputs --- pkgs/development/python-modules/flax/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index b8479c0f73ca..b5a22858b57a 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, jaxlib , keras , lib , matplotlib @@ -21,6 +22,8 @@ buildPythonPackage rec { sha256 = "0zvq0vl88hiwmss49bnm7gdmndr1dfza2bcs1fj88a9r7w9dmlsr"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ matplotlib msgpack From 236bab3f1fbb85e06ee21c813253f192f31289c0 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 20:52:20 +0000 Subject: [PATCH 046/114] python3Packages.optax: jaxlib belongs in buildInputs --- pkgs/development/python-modules/optax/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index bf0383fa1530..6a3b6a9d3e67 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -22,10 +22,11 @@ buildPythonPackage rec { sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ absl-py chex - jaxlib numpy ]; From 93f88be7d11bb7bf62bcd9b8767db41cb9d68b03 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 20:52:33 +0000 Subject: [PATCH 047/114] python3Packages.treex: jaxlib belongs in buildInputs --- pkgs/development/python-modules/treex/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 1f4a55416d56..0b5ad0c89839 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , flax , hypothesis +, jaxlib , keras , lib , poetry-core @@ -38,6 +39,8 @@ buildPythonPackage rec { poetry-core ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ einops flax From 7a76b746d315a8209841beafb074b5c339dfe432 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 23 Jan 2022 15:56:40 +0100 Subject: [PATCH 048/114] impressive: remove - The latest stable release 0.11.0 does not support python 2.x and relies on an outdated Pillow which has several vulnerabilities - The latest beta release 0.13.0-beta2 supports python 3.x and is packageable but segfaults - I am the only maintainer and not willing to put further effort into it. --- .../office/impressive/default.nix | 70 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 - 3 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 pkgs/applications/office/impressive/default.nix diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix deleted file mode 100644 index 09251ff3c9b6..000000000000 --- a/pkgs/applications/office/impressive/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ fetchurl, stdenv, python3, makeWrapper, lib -, SDL, ghostscript, pdftk, dejavu_fonts }: - -let - version = "0.13.0-beta2"; - pythonEnv = python3.withPackages (ps: with ps; [pyopengl pygame pillow]); -in stdenv.mkDerivation { - # This project was formerly known as KeyJNote. - # See http://keyj.emphy.de/apple-lawsuit/ for details. - - pname = "impressive"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "042a84yl1pfk7dmac4rgf5dlgbdvhv3i5zq5fqayg2yb278lb91q"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pythonEnv ]; - - configurePhase = '' - # Let's fail at build time if the library we're substituting in doesn't - # exist/isn't marked as executable - test -x ${SDL}/lib/libSDL.so - sed -i "impressive.py" \ - -e '/^__website__/a SDL_LIBRARY = "${SDL}/lib/libSDL.so"' \ - -e 's/sdl = CDLL.*/sdl = CDLL(SDL_LIBRARY)/' \ - -e 's^FontPath =.*/usr/.*$^FontPath = ["${dejavu_fonts}/share/fonts", ""]^' - ''; - - installPhase = '' - mkdir -p "$out/bin" "$out/share/doc/impressive" "$out/share/man/man1" - install -m 0755 impressive.py "$out/bin/impressive" - mv impressive.1 "$out/share/man/man1" - mv changelog.txt impressive.html license.txt "$out/share/doc/impressive" - - wrapProgram "$out/bin/impressive" \ - --prefix PATH ":" "${ghostscript}/bin:${pdftk}/bin" - ''; - - meta = { - description = "Impressive, an effect-rich presentation tool for PDFs"; - - longDescription = '' - Impressive is a program that displays presentation slides. - But unlike OpenOffice.org Impress or other similar - applications, it does so with style. Smooth alpha-blended - slide transitions are provided for the sake of eye candy, but - in addition to this, Impressive offers some unique tools that - are really useful for presentations. Read below if you want - to know more about these features. - - Creating presentations for Impressive is very simple: You just - need to export a PDF file from your presentation software. - This means that you can create slides in the application of - your choice and use Impressive for displaying them. If your - application does not support PDF output, you can alternatively - use a set of pre-rendered image files – or you use Impressive - to make a slideshow with your favorite photos. - ''; - - homepage = "http://impressive.sourceforge.net/"; - - license = lib.licenses.gpl2; - - maintainers = with lib.maintainers; [ lheckemann ]; - platforms = lib.platforms.mesaPlatforms; - }; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7ae975c5cbe7..c974ece5a857 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -405,6 +405,7 @@ mapAliases ({ imagemagick7_light = imagemagick_light; # added 2021-02-22 imagemagick7 = imagemagick; # added 2021-02-22 imagemagick7Big = imagemagickBig; # added 2021-02-22 + impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # added 2022-01-27 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c387d041fdf..acb9d3f742a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26436,9 +26436,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - # Impressive, formerly known as "KeyJNote". - impressive = callPackage ../applications/office/impressive { }; - index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; From e533f9d3b2f2c0d578c935741674d72a7a1ecee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 27 Jan 2022 23:25:59 +0100 Subject: [PATCH 049/114] breitbandmessung: throw later for unsupported systems This will provide at least the `name` and `meta` attributes when evaluating on such a system. `meta.platforms` and therefore `meta.broken` can then be used to determine if the package can be evaluated further. --- pkgs/applications/networking/breitbandmessung/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix index 2a57379d9916..31f33be38670 100644 --- a/pkgs/applications/networking/breitbandmessung/default.nix +++ b/pkgs/applications/networking/breitbandmessung/default.nix @@ -135,7 +135,7 @@ let }; aarch64-darwin = x86_64-darwin; - }.${system} or (throw "Unsupported system: ${system}"); + }.${system} or { src = throw "Unsupported system: ${system}"; }; in stdenv.mkDerivation ({ pname = "breitbandmessung"; From b0b0ffd4662c75d2e94b7382901faa782d0e7acc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 27 Jan 2022 23:24:22 +0100 Subject: [PATCH 050/114] chromiumBeta: 98.0.4758.66 -> 98.0.4758.74 --- pkgs/applications/networking/browsers/chromium/common.nix | 7 ------- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 74133a9d47e9..5640b993013b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -171,13 +171,6 @@ let sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; }) ./patches/m97-ozone-wayland-fix-surface_augmenter.patch - ] ++ lib.optionals (versionRange "98" "99") [ - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; - sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; - }) - ] ++ lib.optionals (versionRange "97" "99") [ (githubPatch { # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 981861d6a2fa..1ea90bec07f1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "98.0.4758.66", - "sha256": "06hdd2cy6mdiiwbrn2jawmcidxbf46z9wyklkm3mmzbrj1xrh0gd", - "sha256bin64": "0r1lmgvvxb1h6p20gzp8qwdfs4czvqyg6bgp4wb2aax1n0448rbr", + "version": "98.0.4758.74", + "sha256": "01v9bfq3905zqhyp78zq69ipz2b5ldsrm8yjr9qb6434zrhlcvyb", + "sha256bin64": "0p85zanpmlkxc34zhx2rybbwriwqbjmg27rrjcf76gvfljlj3g51", "deps": { "gn": { "version": "2021-12-07", From 54cbee8d9700668eaa51219f6c852b4019cfd2ba Mon Sep 17 00:00:00 2001 From: Yipeng Sun Date: Thu, 27 Jan 2022 19:37:36 -0500 Subject: [PATCH 051/114] root: tweak wrapping flags for auxiliary programs, avoid forcing CMAKE_CXX_STANDARD (#157069) --- pkgs/applications/science/misc/root/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9962b1ce60f5..f8037c01e087 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" - "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" @@ -176,7 +175,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH : "$out/lib" + --set PYTHONPATH "$out/lib" \ + --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib" done ''; From b56e79f0bdd5251386835ecb0ac05bede81a9d55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 00:55:16 +0000 Subject: [PATCH 052/114] vorta: 0.8.2 -> 0.8.3 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 7434c12cba29..271efc0283d7 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-ut4HCfLU/P22y5QbNakTV4d4CnFRxJvn+cnJ0ZGpTlw="; + sha256 = "06sb24pimq9ckdkp9hzp4r9d3i21kxacsx5b7x9q99qcwf7h6372"; }; nativeBuildInputs = [ wrapQtAppsHook ]; From 268157dc83f8bbf421d983093715b6f667e976cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Jan 2022 02:00:25 +0100 Subject: [PATCH 053/114] nixos/nix-daemon: fix buildMachines eval --- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 10f9a4afb36c..cd4408cef411 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -673,7 +673,7 @@ in text = concatMapStrings (machine: - (concatStringsSep " " [ + (concatStringsSep " " ([ "${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") (if machine.sshKey != null then machine.sshKey else "-") @@ -682,7 +682,7 @@ in (concatStringsSep "," machine.supportedFeatures) (concatStringsSep "," machine.mandatoryFeatures) ] - ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-")) + ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) + "\n" ) cfg.buildMachines; From a175820f63c00a7eb1b18c654aa5ad0f2b98c8b0 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 28 Jan 2022 02:14:49 +0000 Subject: [PATCH 054/114] pokerth, pokerth-server: pin to boost16x to fix build Tracking issue: #151469 --- pkgs/top-level/all-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc90840a84..2a8606b468b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31112,9 +31112,14 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = libsForQt5.callPackage ../games/pokerth { }; + pokerth = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + }; - pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; }; + pokerth-server = libsForQt5.callPackage ../games/pokerth { + boost = boost16x; + target = "server"; + }; powermanga = callPackage ../games/powermanga { }; From 16a14fbc13425d087dd2d948ddc6df9e9c715489 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 03:27:42 +0000 Subject: [PATCH 055/114] thunderbird-unwrapped: 91.5.0 -> 91.5.1 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index c9cc9f901a33..e373c443ea57 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.5.0"; + version = "91.5.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e1cafbd99e67e8fef346e936890a22aeadded4aa8be604607535ae933251bc1b2a3b56c2b62045b3d37ecb09999adb746157df188d1a32dfe75685f3af959b7d"; + sha512 = "5939e09b143e440efa906d95cda06826bd3a73b2edde5eed86229b8a0e4d1434519059f37d319d26978d7eea9b3906c5e1c1543a2bc2465625d5ab5438855717"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 4b4f7e12cddb80dca862bd4a1d47ddfc9edb67ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 03:48:32 +0000 Subject: [PATCH 056/114] vault: 1.9.2 -> 1.9.3 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 67b48f9ce6d4..6f1de7b45a94 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-vuwVPBB7zxpmJsBZ+J/vl0E49gx7CUGGi5j1Grgv2Jo="; + sha256 = "sha256-2pysQsJynuedqX9Yi4BjTnWuJZ5XTq11UEgkSh7eZyw="; }; - vendorSha256 = "sha256-i7f/7BRn++m+0KAK1V9dWJykgGobzmB2OZ6ltR//kRg="; + vendorSha256 = "sha256-LNN0u48B6xGjrUasxGF+4sw1HxiR22hj8H2/mSyh1SI="; subPackages = [ "." ]; From 40057471f245e073a955020b4a1777d236b8fa9e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 28 Jan 2022 12:11:00 +0800 Subject: [PATCH 057/114] kdiff3: 1.8.5 -> 1.9.4 --- pkgs/tools/text/kdiff3/default.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index c230278c0a02..1362591e24c1 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,26 +1,38 @@ -{ - mkDerivation, lib, fetchurl, - extra-cmake-modules, kdoctools, wrapGAppsHook, - kcrash, kconfig, kinit, kparts, kiconthemes +{ mkDerivation +, lib +, fetchurl +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, boost +, kcrash +, kconfig +, kinit +, kparts +, kiconthemes }: mkDerivation rec { pname = "kdiff3"; - version = "1.8.5"; + version = "1.9.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vJL30E6xI/nFbb4wR69nv3FSQPqZSHrB0czypF4IVME="; + sha256 = "sha256-oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo="; }; + buildInputs = [ boost ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; + cmakeFlags = [ "-Wno-dev" ]; + meta = with lib; { + description = "Compares and merges 2 or 3 files or directories"; homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; From c2d49ebbaa30b7f5175b09258dd9c6951d7a69ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 04:11:57 +0000 Subject: [PATCH 058/114] python310Packages.aioesphomeapi: 10.8.0 -> 10.8.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index e0f1b1df3c77..a10a84a0425e 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.8.0"; + version = "10.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "1349b2as6r3m9sxlfss8plzafn31kf3rihwa58b4f7cmc4dhb2s8"; + sha256 = "1hi312gvkrmcxhrc8s3zxwbh87hakd42k5hk7c3xqilc4in3d5dv"; }; propagatedBuildInputs = [ From 8804d87bd35f52f81d964061457f14a39ee861c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 04:15:55 +0000 Subject: [PATCH 059/114] tailscale: 1.20.2 -> 1.20.3 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index ee768981f9bc..e3852931d18f 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-uW/C4Bks7qGJEQhPoqd2LSk8MAD9gcDRsJbbowgsSuY="; + sha256 = "sha256-6ZiMkid5RneOIlDDSDkB8m0nAywZEUCJ96qveE2l53k="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From 5bb20f9dc70e9ee16e21cc404b6508654931ce41 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 27 Jan 2022 10:19:43 +1000 Subject: [PATCH 060/114] mandown: init at 0.1.3 --- pkgs/tools/misc/mandown/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/misc/mandown/default.nix diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix new file mode 100644 index 000000000000..08755ede14db --- /dev/null +++ b/pkgs/tools/misc/mandown/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "mandown"; + version = "0.1.3"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-8a4sImsjw+lzeVK4V74VpIKDcAhMR1bOmJYVWzfWEfc="; + }; + + cargoHash = "sha256-Wf1+dxwgPZ4CHpas+3P6n6kKDIISbnfI01+XksjxQlQ="; + + meta = with lib; { + description = "Markdown to groff (man page) converter"; + homepage = "https://gitlab.com/kornelski/mandown"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc90840a84..55669acf3ede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3367,6 +3367,8 @@ with pkgs; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; + mandown = callPackage ../tools/misc/mandown { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; mapproxy = callPackage ../applications/misc/mapproxy { }; From 8e660e42f60bd21580ca11cedaed4d3ed423118d Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 28 Jan 2022 08:49:01 +0100 Subject: [PATCH 061/114] libesmtp: 1.0.6 -> 1.1.0 * libesmtp: 1.0.6 -> 1.1.0 (#149884) And refresh meta attributes: New homepage and SPDX 3.0 license identifier Co-authored-by: Renaud --- .../libraries/libesmtp/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 542cff712c82..3193f383d610 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, openssl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libESMTP"; - version = "1.0.6"; + version = "1.1.0"; - src = fetchurl { - url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2"; - sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ openssl ]; + + src = fetchFromGitHub { + owner = "libesmtp"; + repo = pname; + rev = "v${version}"; + sha256 = "1bhh8hlsl9597x0bnfl563k2c09b61qnkb9mfyqcmzlq63m1zw5y"; }; meta = with lib; { - homepage = "http://brianstafford.info/libesmtp/index.html"; description = "A Library for Posting Electronic Mail"; - license = licenses.lgpl21; + longDescription = '' + libESMTP is an SMTP client library which manages submission of electronic mail + via a preconfigured Mail Transport Agent (MTA) such as Exim or Postfix. + It implements many SMTP extensions including TLS for security + and PIPELINING for high performance. + ''; + homepage = "https://libesmtp.github.io/"; + license = licenses.lgpl21Plus; }; } From c053bd3a4b7353a2f0bf3bd7c6b3949ecbf50748 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 26 Jan 2022 13:16:10 +0100 Subject: [PATCH 062/114] bundler: 2.2.24 -> 2.3.6 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- pkgs/development/ruby-modules/gem/nix-bundle-install.rb | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 330664836821..ecf98d75ce7d 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.2.24"; - source.sha256 = "1x3czmqhlyb593ap7mxkk47idi2jnbnrpwj8xlsjdpi7iair9y62"; + version = "2.3.6"; + source.sha256 = "1531z805j3gls2x0pqp2bp1vv1rf5k7ynjl4qk72h8lpm1skqk9r"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 0d501bd9add7..b0be71102c38 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -118,9 +118,7 @@ else source = Bundler::Source::Path.new(options) end spec = source.specs.search_all(name).first -Bundler.rubygems.with_build_args build_flags do - source.install(spec) -end +source.install(spec, :build_args => build_flags) msg = spec.post_install_message if msg From 86d7f2d5e1d1de07a18c524682057cc02caecdd5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 27 Jan 2022 16:05:00 -0800 Subject: [PATCH 063/114] linuxPackages.amdgpu-pro: fix build --- pkgs/os-specific/linux/amdgpu-pro/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index b293f8513bbd..241145a24843 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -11,6 +11,7 @@ , expat , libffi , libselinux +, libdrm , udev , kernel ? null }: @@ -204,6 +205,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ + libdrm patchelf perl ]; From 5253f848dd03f490e4d0c1ce75f4cc841aed067b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 09:35:04 +0000 Subject: [PATCH 064/114] python310Packages.types-futures: 3.3.7 -> 3.3.8 --- pkgs/development/python-modules/types-futures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-futures/default.nix b/pkgs/development/python-modules/types-futures/default.nix index e56cbb62b33e..afff438efef1 100644 --- a/pkgs/development/python-modules/types-futures/default.nix +++ b/pkgs/development/python-modules/types-futures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-futures"; - version = "3.3.7"; + version = "3.3.8"; src = fetchPypi { inherit pname version; - sha256 = "d286db818fb67e3ce5c28acd9058c067329b91865acc443ac3cf91497fa36f05"; + sha256 = "6fe8ccc2c2af7ef2fdd9bf73eab6d617074f09f30ad7d373510b4043d39c42de"; }; meta = with lib; { From 37df4305c65ab6d3f34beebbacca491b4d122769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 27 Jan 2022 17:45:08 +0300 Subject: [PATCH 065/114] polymc: 1.0.4 -> 1.0.6 --- .../polymc/0001-pick-latest-java-first.patch | 48 ------------------- pkgs/games/polymc/default.nix | 22 +-------- 2 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 pkgs/games/polymc/0001-pick-latest-java-first.patch diff --git a/pkgs/games/polymc/0001-pick-latest-java-first.patch b/pkgs/games/polymc/0001-pick-latest-java-first.patch deleted file mode 100644 index a65dcbfd037d..000000000000 --- a/pkgs/games/polymc/0001-pick-latest-java-first.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Tue, 22 Jun 2021 21:50:11 +0300 -Subject: [PATCH] pick latest java first - ---- - launcher/java/JavaInstallList.cpp | 4 ++-- - launcher/java/JavaUtils.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp -index 0bded03c..40898e20 100644 ---- a/launcher/java/JavaInstallList.cpp -+++ b/launcher/java/JavaInstallList.cpp -@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList versions) - - bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) - { -- auto rleft = std::dynamic_pointer_cast(left); -- auto rright = std::dynamic_pointer_cast(right); -+ auto rleft = std::dynamic_pointer_cast(right); -+ auto rright = std::dynamic_pointer_cast(left); - return (*rleft) > (*rright); - } - -diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp -index 5f004a10..6d633631 100644 ---- a/launcher/java/JavaUtils.cpp -+++ b/launcher/java/JavaUtils.cpp -@@ -350,7 +350,6 @@ QList JavaUtils::FindJavaPaths() - qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; - - QList javas; -- javas.append(this->GetDefaultJava()->path); - auto scanJavaDir = [&](const QString & dirPath) - { - QDir dir(dirPath); -@@ -379,6 +378,7 @@ QList JavaUtils::FindJavaPaths() - // general locations used by distro packaging - scanJavaDir("/usr/lib/jvm"); - scanJavaDir("/usr/lib32/jvm"); -+ javas.append(this->GetDefaultJava()->path); - // javas stored in MultiMC's folder - scanJavaDir("java"); - return javas; --- -2.31.1 - diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index ddfc76b8b97b..0d63a8ad5f91 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, makeDesktopItem , fetchFromGitHub , cmake , jdk8 @@ -17,21 +16,19 @@ mkDerivation rec { pname = "polymc"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - patches = [ ./0001-pick-latest-java-first.patch ]; - postPatch = '' # hardcode jdk paths substituteInPlace launcher/java/JavaUtils.cpp \ @@ -42,19 +39,6 @@ mkDerivation rec { cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; - desktopItems = [ - (makeDesktopItem { - name = "polymc"; - desktopName = "PolyMC"; - genericName = "Minecraft Launcher"; - comment = "Free, open source launcher and instance manager for Minecraft."; - icon = "launcher"; - exec = "polymc"; - categories = "Game"; - terminal = "false"; - }) - ]; - dontWrapQtApps = true; postInstall = let @@ -68,8 +52,6 @@ mkDerivation rec { libGL ]; in '' - install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg - # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/polymc \ "''${qtWrapperArgs[@]}" \ From a9ebd6decfdb99b7b1445f0bb25ca721ec7ce616 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 28 Jan 2022 11:26:05 +0100 Subject: [PATCH 066/114] dart: 2.14.3 -> 2.15.1 Fixes CVE-2021-22567 and CVE-2021-22568. https://github.com/dart-lang/sdk/blob/2.15.1/CHANGELOG.md --- pkgs/development/interpreters/dart/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index d41c0a3c1f59..366b7df3edd4 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.14.3" +, version ? "2.15.1" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; @@ -10,24 +10,24 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.14.3"; + version = "2.15.1"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0is4gz99i06yb4jisxcz2c15jqkaz6ayhg9b8zb3s0s8yp59r2iq"; + sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I="; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0wg1mnj4qrv22z510032jnwb3z39gvzlrv5wic2ci5mg7316xlya"; + sha256 = "sha256-D0XcqlO0CQtpsne4heqaTLOkFYnJEZET4bl4rVXOM18="; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0gnjk3lh63m0naaw67g9w7wys5cgx2ipzd1dznqnlvxp2vj1gj5p"; + sha256 = "sha256-SRq5TtxS+bwCqVxa0U2Zhn8J1Wtm4Onq+3uQS+951sw="; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1j7snnf3a0jly85njq8npqikrdhz9lkirhvik1hkpd9sv7qfbvd6"; + sha256 = "sha256-iDbClCNDUsxT6K6koc4EQuu7dppTbOfzCVedpQIKI5U="; }; } }: From a36902286e17406c76996ee4525049d4d28ef543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 28 Jan 2022 11:29:06 +0100 Subject: [PATCH 067/114] yq-go: 4.17.2 -> 4.18.1 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 59ba7ca8db4e..5d0108083655 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.17.2"; + version = "4.18.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-jfb/r4Z8i23A0e4cJqZoG2TPXGVFOf64FfnZy/keAeQ="; + sha256 = "sha256-1jPYrZgA1Sg8Cvhfd7BULcpePHH/Buczvgu92KrkSg8="; }; - vendorSha256 = "sha256-0eaD4oT6DyCWkJ0He4A7ysOEJD8CtFH6diQYBuEOoIk="; + vendorSha256 = "sha256-5GPSyBWiQZ7Yb//JjPyamqvoeMdhvtuKpzOJZVjSREw="; doCheck = false; From 36bea6f5f8357ee4e06ab5f9e22c446e28a4b3af Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Thu, 27 Jan 2022 20:47:31 -0800 Subject: [PATCH 068/114] darktable: set lua version in all-packages.nix --- pkgs/applications/graphics/darktable/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index d62addea4fea..7feeb08105d5 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -52,8 +52,7 @@ , libaom , portmidi , fetchpatch -, lua5_4 -, ... +, lua }: stdenv.mkDerivation rec { @@ -104,7 +103,7 @@ stdenv.mkDerivation rec { libheif libaom portmidi - lua5_4 + lua ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 279ca9162fad..2c29cec597fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24934,7 +24934,7 @@ with pkgs; darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; darktable = callPackage ../applications/graphics/darktable { - lua = lua5_3; + lua = lua5_4; pugixml = pugixml.override { shared = true; }; }; From 36a038ca52fe70d44f22420316effd8db2e37100 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 10:58:47 +0000 Subject: [PATCH 069/114] python310Packages.pyweatherflowrest: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/pyweatherflowrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index 32a5c5d8abc3..a36f3a2ccfc2 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "v${version}"; - sha256 = "17zas565jqvp0qrs8l589rm4f9xpyynhqk8lrqcx089w3rv0hh2p"; + sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; }; propagatedBuildInputs = [ From 63a65f2d1acaff52ec38e027e67cf2f98a615273 Mon Sep 17 00:00:00 2001 From: amesgen Date: Fri, 28 Jan 2022 12:41:21 +0100 Subject: [PATCH 070/114] macdylibbundler: 1.0.0 -> 1.0.4 --- pkgs/development/tools/misc/macdylibbundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index dbcd49dcfbe4..504b79c50048 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "macdylibbundler"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { owner = "auriamg"; repo = "macdylibbundler"; rev = version; - sha256 = "02w04qvaf9v8yw8bgncx5qj3jx08xdfa855isvq92q27hsb8m8hv"; + sha256 = "0j4ij48jf5izgymzxxaakf6vc50w9q0761yir6nfj1n6qlnrlidf"; }; nativeBuildInputs = [ makeWrapper ]; From 99deb1c41814a9991756bae8793b074544743898 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Thu, 27 Jan 2022 14:21:12 -0500 Subject: [PATCH 071/114] podman-compose: available on all unix platforms --- pkgs/applications/virtualization/podman-compose/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 974aa712d62f..a05ff32e397b 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; } From 07029944a55c5dee33ed0a2414605c61715487e9 Mon Sep 17 00:00:00 2001 From: Sage Hane Date: Fri, 28 Jan 2022 13:14:38 +0000 Subject: [PATCH 072/114] river: make XWayland support optional (#157002) Co-authored-by: Sandro --- pkgs/applications/window-managers/river/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index ca95806b7920..1e3effeba55b 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -13,8 +13,8 @@ , udev , libevdev , libinput -, libX11 , libGL +, xwaylandSupport ? true, libX11 }: stdenv.mkDerivation rec { @@ -39,9 +39,8 @@ stdenv.mkDerivation rec { udev libevdev libinput - libX11 libGL - ]; + ] ++ lib.optional xwaylandSupport libX11; dontConfigure = true; @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install runHook postInstall ''; From 067201c3cccc7e5290447a3d9a331c558179a75d Mon Sep 17 00:00:00 2001 From: Madoura Date: Fri, 28 Jan 2022 08:29:01 -0600 Subject: [PATCH 073/114] linux_testing-bcachefs: 2021-12-26 -> 2022-01-12 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index e417ee6d389b..52fc24e101e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2021-12-26" -, commit ? "b034dfb24fece43a7677b9a29781495aeb62767f" -, diffHash ? "0m7qrnfrcx3dki9lmsq3jk3mcrfm99djh83gwwjh401ql0cycx5p" +, date ? "2022-01-12" +, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9" +, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... From 3f81985d746fbbfff71d91b6e34d70e9699de3c7 Mon Sep 17 00:00:00 2001 From: Madoura Date: Fri, 28 Jan 2022 08:29:38 -0600 Subject: [PATCH 074/114] bcachefs-tools: 2021-12-25 -> 2022-01-12 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index cb8d74aa1618..9e0752b5482c 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2021-12-25"; + version = "unstable-2022-01-12"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "07b18011cc885f0ef5cadc299d0321322f442388"; - sha256 = "0yvdbjasl05w1afiszygrfv7hn39fxx7kcy42vk39rb6fb3xpvzy"; + rev = "7b15324de1095f3e2e423e9c53da076d208b52d5"; + sha256 = "0glpq0n1xv7ck28v0gahl1fak9dhyp04id8d1l8yxvnriyw19zxa"; }; postPatch = '' From 5efc8ca954272c4376ac929f4c5ffefcc20551d5 Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Fri, 28 Jan 2022 15:59:01 +0100 Subject: [PATCH 075/114] h: 1.0.0 -> 1.0.3 (#156966) Fixes the ruby warnings --- pkgs/tools/misc/h/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 3f5878472a79..7a7ac2002544 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - sha256 = "10y42nn9lgkwdjia74qfyf937nam4md3pkyfjinj7jybvcran4bj"; + hash = "sha256-RyQZ9F+rZ0a/90hljSyNCzYK8eA3rYJlJkV7B5NPRzY="; }; buildInputs = [ ruby ]; From 70574630cac16a0f657f3bdde59bf03d84fc231f Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 28 Jan 2022 12:48:24 -0400 Subject: [PATCH 076/114] laminar: 1.1 -> 1.2 --- .../tools/continuous-integration/laminar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 05f96c0695b6..3c48506a6bf7 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -25,12 +25,12 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ohwgiles"; repo = "laminar"; rev = version; - sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk="; + sha256 = "sha256-PLnfiWpelgKhs4FNry60sm6/QdhYs76FnZ/ZcRmb4Ok="; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; From d4ecaf699e25872a010438c88ec24696cb727862 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 Jan 2022 02:24:36 +0100 Subject: [PATCH 077/114] glib: correct update script --- pkgs/development/libraries/glib/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9d21d8e06f01..c8138431a0a7 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -198,7 +198,10 @@ stdenv.mkDerivation rec { getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { + packageName = "glib"; + versionPolicy = "odd-unstable"; + }; }; meta = with lib; { From cc44eb980615068d90f0affcbca1c1fb06c4451e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 19:42:34 +0000 Subject: [PATCH 078/114] link-grammar: 5.9.1 -> 5.10.2 --- pkgs/tools/text/link-grammar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 3a6686dba5f2..c685ef603319 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -13,13 +13,13 @@ let link-grammar = stdenv.mkDerivation rec { pname = "link-grammar"; - version = "5.9.1"; + version = "5.10.2"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-4D/rqoIGlvR+q7Az8E1xPYSQQMJMRVeRM9HQIbjssLo="; + sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY="; }; nativeBuildInputs = [ From 0700dde63b10aff31b96240d83a035a6f0e7fd5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 10:10:57 +0000 Subject: [PATCH 079/114] php74Extensions.blackfire: 1.71.0 -> 1.72.0 --- pkgs/development/tools/misc/blackfire/php-probe.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 31ea03a2f868..5eec86d02476 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -19,11 +19,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.71.0"; + version = "1.72.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "8LsYkzNy98qQ9niXrRCkL47Ouyd33ZICnSXx29WIWl4="; + sha256 = "FczlRevMn3VGCW+mtIqjGMNZKjsqzCGW3DQLQG7dJ8c="; }; nativeBuildInputs = [ From 80ec92d55a0ef54eeee13759258ac6acbdfcf2eb Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 23 Jan 2022 11:41:48 +0200 Subject: [PATCH 080/114] openrgb: add desktop icon --- pkgs/applications/misc/openrgb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index 284339b13ee5..6de5736e9ac8 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -26,6 +26,9 @@ mkDerivation rec { mkdir -p $out/etc/udev/rules.d cp 60-openrgb.rules $out/etc/udev/rules.d + install -Dm444 -t "$out/share/applications" qt/OpenRGB.desktop + install -Dm444 -t "$out/share/icons/hicolor/128x128/apps" qt/OpenRGB.png + runHook postInstall ''; From da637a36249f283b2d785831814165559a1e966c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 13:11:30 +0000 Subject: [PATCH 081/114] python310Packages.httpagentparser: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/httpagentparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpagentparser/default.nix b/pkgs/development/python-modules/httpagentparser/default.nix index e0c9dd09bcba..44c521ff3304 100644 --- a/pkgs/development/python-modules/httpagentparser/default.nix +++ b/pkgs/development/python-modules/httpagentparser/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "httpagentparser"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY="; + sha256 = "a190dfdc5e63b2f1c87729424b19cbc49263d6a1fb585a16ac1c9d9ce127a4bf"; }; # PyPi version does not include test directory From 0646cd48211abc34f1fe6b95a7be3d89dcc4a4b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 08:12:50 +0000 Subject: [PATCH 082/114] python310Packages.types-decorator: 5.1.3 -> 5.1.4 --- pkgs/development/python-modules/types-decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index e668f324fabb..f8dc74c00f98 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.3"; + version = "5.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "15d859bec0adca9edd948e94a5773c32710ee5dd4ad14ec983f08f979a821610"; + sha256 = "463c04b192108e2b3f409df8a3eaaf8d44e3e98965c11e473ed2a97da591798b"; }; # Modules doesn't have tests From 5911f67c522127961b4de46791e639ca9aa8e62d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 06:09:04 +0000 Subject: [PATCH 083/114] python310Packages.svglib: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/svglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 9a0cf1a30f8d..145b24e55787 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "33f075dc853807e56e92d6dc404104c6ccc7fb5388d96ab943d7b349b1c924c7"; + sha256 = "c77a0702fafd367c0fdca08ca1b7e1ee10058bde3bae252f49a3836e51e54519"; }; disabled = !isPy3k; From 066a7a3091b307ed1d47f79191fc0be18611e107 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 10:43:12 +0000 Subject: [PATCH 084/114] python310Packages.chiavdf: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/chiavdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 9b4bc575cab2..1525c5ac9058 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.4"; + version = "1.0.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i6ylxtw1dMtylS4m0mz6rATU1trbMpcmsB2WhD++CeM="; + hash = "sha256-2pC6sFRwgAwIEanZXe99848XMxK/lyLGxiA+UA+q3H0="; }; patches = [ From 6db3ef222870aaae2a6a8aebebd9f1c60b72453d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 02:09:21 +0000 Subject: [PATCH 085/114] python310Packages.pymazda: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/pymazda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index b153b14c5f3b..fdc7e1f67873 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eb4b275bcdfbf947e00b27c20dfc8ebcedfc1fb1252449141eccb5c39d782440"; + sha256 = "d51619cfbd90f4bb4e8fbfe1bccd58d4f5ece9bdb78d8f33fed1776d749d5fa9"; }; propagatedBuildInputs = [ From 50b04db0c0d2822a046945951cf93ed1f83f7501 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 01:14:12 +0000 Subject: [PATCH 086/114] python310Packages.aioconsole: 0.3.3 -> 0.4.0 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 14ff06324bbf..8fbe99e2a113 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.3.3"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "v${version}"; - sha256 = "1hjdhj1y9xhq1i36r7g2lccsicbvgm7lzkyrxygs16dw11ah46mx"; + sha256 = "185lzyqimi02l6q9dazkps7nlj08lf9l730ndyk59470jivccc21"; }; checkInputs = [ From fb6b8ffbca4f14784853f82e2ae216aa0efe0547 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 09:46:57 +0000 Subject: [PATCH 087/114] python310Packages.jdatetime: 3.8.1 -> 3.8.2 --- pkgs/development/python-modules/jdatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 6989c4257c79..97e500eebcf6 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "db57ee517356b1bfc1603ef412f5da61eae92241ba0bcaf0851028cae424780c"; + sha256 = "c685687e3f39e1b9a3ba9c00ed9d8e88603bc8994413e84623e6c5d43214e6f8"; }; propagatedBuildInputs = [ From 71557df5928b0e90e4238b9b81f0145df00b8cd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jan 2022 23:10:55 +0000 Subject: [PATCH 088/114] telepresence2: 2.4.9 -> 2.4.10 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 7b61dcf746cd..91d739679e60 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "sha256-cGG357Z0OI+aXGHWJaOPkkKUm1KcsYBvhHxNlIYlL+0="; + sha256 = "sha256-OM0kMQYYHjk17x4VmrIXyTq/DxXnTrt6oRHEdV+1+Ns="; }; # The Helm chart is go:embed'ed as a tarball in the binary. @@ -21,7 +21,7 @@ buildGoModule rec { go run ./build-aux/package_embedded_chart/main.go ${src.rev} ''; - vendorSha256 = "sha256-DzAxqSiWag9mOgPznjhMCQJhtJZo7hsezhwJBidsvJQ="; + vendorSha256 = "sha256-rl3vb5TbGnQNLfnEqj63c2h/U7UKkgPEy/zU3gmdtYU="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" From 614a3c32292885f23a9771b10dc0711ffff489e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 16:15:29 +0000 Subject: [PATCH 089/114] python310Packages.pony: 0.7.15rc1 -> 0.7.16 --- pkgs/development/python-modules/pony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 27c35abe5739..4cea071d2772 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.15rc1"; + version = "0.7.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ponyorm"; repo = pname; rev = "v${version}"; - hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ="; + hash = "sha256-yATIsX2nKsW5DBwg9/LznQqf+XPY3q46WZut18Sr0v0="; }; checkInputs = [ From 13c3d9f5c8c3efb12417dc250061597a92e5d530 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 04:19:10 +0000 Subject: [PATCH 090/114] python310Packages.trimesh: 3.9.42 -> 3.9.43 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 9032b7637cbe..31459b2afb50 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.42"; + version = "3.9.43"; src = fetchPypi { inherit pname version; - sha256 = "d9a6e977989f1f8344b1f86dbce0511dc431733deb0ad21ff8375f6f47282b39"; + sha256 = "f7d4adf2df0fe19ea49c5f3268c33ffe28b3be818d280bb4c113d7463c58ddf9"; }; propagatedBuildInputs = [ numpy ]; From 0b2eb3e2a6635d11088b081c6c1ff9b2b416bc84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jan 2022 16:40:20 +0000 Subject: [PATCH 091/114] vips: 8.12.1 -> 8.12.2 --- 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 26d63791be8e..270f508a88b5 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.12.1"; + version = "8.12.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-Zo1Y4pYa+o55+ASrAiDUO7SAC4zpcAniEKkTFvIoU6o="; + sha256 = "sha256-ffDJJWe/SzG+lppXEiyfXXL5KLdZgnMjv1SYnuYnh4c="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From c707c3ab3e568503090a61cc6c04865fb4876b3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Jan 2022 14:15:32 +0100 Subject: [PATCH 092/114] python3Packages.meshtastic: 1.2.76 -> 1.2.77 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 9193d0590697..36656281675c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.76"; + version = "1.2.77"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-LQo7TwD91o9j/fJ5BTNV7WoCDFXnJVy1PDObH5FiNtk="; + sha256 = "sha256-Z5YwZccyQ3LOuOf9NFuRQc8lYr6mbPp38Y4iIpD02CI="; }; propagatedBuildInputs = [ From f07cd03eadba172e2c7c287144a36f8451d3d389 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Tue, 25 Jan 2022 23:08:34 +0900 Subject: [PATCH 093/114] python3Packages.importlab: init at 0.7 --- .../python-modules/importlab/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/importlab/default.nix diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix new file mode 100644 index 000000000000..2ea3f01d2ccb --- /dev/null +++ b/pkgs/development/python-modules/importlab/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, networkx +, pytestCheckHook +}: + +buildPythonPackage { + pname = "importlab"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "google"; + repo = "importlab"; + rev = "676d17cd41ac68de6ebb48fb71780ad6110c4ae3"; + sha256 = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE="; + }; + + propagatedBuildInputs = [ networkx ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "tests/test_parsepy.py" ]; + + pythonImportsCheck = [ "importlab" ]; + + meta = with lib; { + description = "A library that automatically infers dependencies for Python files"; + homepage = "https://github.com/google/importlab"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99da2711f62a..0566e7237534 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3925,6 +3925,8 @@ in { impacket = callPackage ../development/python-modules/impacket { }; + importlab = callPackage ../development/python-modules/importlab { }; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; importlib-resources = callPackage ../development/python-modules/importlib-resources { }; From 581b57b274cab94bc89d060df17d0a5509d68b65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Jan 2022 05:18:02 +0000 Subject: [PATCH 094/114] netpbm: 10.96.2 -> 10.97.2 --- pkgs/tools/graphics/netpbm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index fc7d909ca0dd..ce3205f7b2e2 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "10.96.2"; + version = "10.97.2"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4158"; - sha256 = "NK8GXCvCEnbQJWvVngB5UMOVmfsiyU4Fq0JIY9UNSjo="; + rev = "4242"; + sha256 = "ljfowjaa3whNXavrLTFVUq87nG47sykYtrtGSrZb/rE="; }; nativeBuildInputs = [ From 60376d0d7dca6ed29d60280cd17b27b37645d141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jan 2022 22:09:46 +0000 Subject: [PATCH 095/114] timetagger: 22.1.2 -> 22.1.3 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 58bf190495f4..0efc930550ba 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.1.2"; + version = "22.1.3"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw"; + sha256 = "1x0hy9wnifi694glwv6irhnjvwh1kgl6wn6qlk5qy4x6z6bkii24"; }; meta = with lib; { From ef0bee504770e9d1b8ee553425c379556bccf60e Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 25 Jan 2022 18:34:52 -0600 Subject: [PATCH 096/114] python3Packages.timetagger: format --- .../python-modules/timetagger/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 0efc930550ba..c41952f85424 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -16,24 +16,6 @@ python3Packages.buildPythonPackage rec { sha256 = "1x0hy9wnifi694glwv6irhnjvwh1kgl6wn6qlk5qy4x6z6bkii24"; }; - meta = with lib; { - homepage = "https://timetagger.app"; - license = licenses.gpl3; - description = "Tag your time, get the insight"; - maintainers = with maintainers; [ matthiasbeyer ]; - }; - - checkInputs = [ - pytestCheckHook - requests - ]; - - preCheck = '' - # https://github.com/NixOS/nixpkgs/issues/12591 - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - propagatedBuildInputs = with python3Packages; [ asgineer itemdb @@ -44,4 +26,19 @@ python3Packages.buildPythonPackage rec { uvicorn ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = [ + pytestCheckHook + requests + ]; + + meta = with lib; { + homepage = "https://timetagger.app"; + license = licenses.gpl3; + description = "Tag your time, get the insight"; + maintainers = with maintainers; [ matthiasbeyer ]; + }; } From d90ae4bfac0f23a38700de4278486c9483015504 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 25 Jan 2022 19:09:39 -0600 Subject: [PATCH 097/114] python3Packages.timetagger: disable tests on python versions older than 3.10 --- pkgs/development/python-modules/timetagger/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index c41952f85424..1b1460ae0e05 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , pytestCheckHook , requests +, pytest +, pythonOlder }: python3Packages.buildPythonPackage rec { @@ -33,8 +35,12 @@ python3Packages.buildPythonPackage rec { checkInputs = [ pytestCheckHook requests + pytest ]; + # fails with `No module named pytest` on python version 3.10 + doCheck = pythonOlder "3.10"; + meta = with lib; { homepage = "https://timetagger.app"; license = licenses.gpl3; From bd8eca52fadda92f9ac987b386388469f5b47071 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 27 Jan 2022 22:42:57 +0100 Subject: [PATCH 098/114] timetagger: use SPDX 3.0 license identifier --- pkgs/development/python-modules/timetagger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 1b1460ae0e05..d8cc7a9e0117 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { homepage = "https://timetagger.app"; - license = licenses.gpl3; + license = licenses.gpl3Only; description = "Tag your time, get the insight"; maintainers = with maintainers; [ matthiasbeyer ]; }; From 9441234abcec11c95d60cf1900fc63c3600c7320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Jan 2022 13:45:32 +0000 Subject: [PATCH 099/114] rpm-ostree: 2021.14 -> 2022.1 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 4dd19a7f397a..4f3a4ef985b2 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.14"; + version = "2022.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-WOG21wSbjXMc/6OHJBEKFOhvnIt+SFpZikB8XkfN32Y="; + sha256 = "sha256-v7vAj045gLHdH1kQ9oMnLLBYXu/oWOW+MS+m7w2VoW0="; }; nativeBuildInputs = [ From b404fb822899a3c2ff83d0d691debcfaaa564303 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 17:44:50 +0000 Subject: [PATCH 100/114] python39Packages.pdm-pep517: 0.9.4 -> 0.10.2 --- pkgs/development/python-modules/pdm-pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 11d677e11004..aa99d5f23f7b 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.9.4"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c="; + sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29"; }; preCheck = '' From 68544ccc3460d7ebecfb921f1841d7fece2319c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 16:33:58 +0000 Subject: [PATCH 101/114] python310Packages.nengo: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/nengo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix index 566540a4c972..c422278c830c 100644 --- a/pkgs/development/python-modules/nengo/default.nix +++ b/pkgs/development/python-modules/nengo/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "nengo"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nengo"; repo = "nengo"; rev = "v${version}"; - sha256 = "1wkayimf2jqkbr6piikh5zd6yw8gf2qv4v4bfrprs4laa6wzh2qh"; + sha256 = "12lz8lzirxvwnpa74k9k48c64gs6gi092928rh97siya3i6gjs6i"; }; propagatedBuildInputs = [ numpy ] From 232fc41914cdd64bda2cf8df021c23b20ccf363e Mon Sep 17 00:00:00 2001 From: ners Date: Thu, 27 Jan 2022 11:12:47 +0100 Subject: [PATCH 102/114] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 280 ++++++++++++++-------------- 1 file changed, 140 insertions(+), 140 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c3599c908ade..2b84c6211a6b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-01-19"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "845a1052f7d8c084eab15d190b62d87350f6fa37"; - sha256 = "0k16c83qn8rcg0gfmwlwlj27apj1k081yy4aqgyrkn485fdlv3sl"; + rev = "95916d1b5f171eb44faf54bb414f48856ec96aa6"; + sha256 = "14a4h0h6g8rkglhn3f77s3bil63y1vz1qnd03026r8bhzcdbqn3j"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -497,12 +497,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-24"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7f1b916fabbae134b37c0a5ac09f0bfc555ab010"; - sha256 = "0xmm0fikqj95m836nv8y6cyvqkn3p0iklqhqj32cxqfrvh0mbnb6"; + rev = "723d926f75680badc6cb95ba69668324833be8a3"; + sha256 = "19wxzny2xha79ajjqwya5c20nlpmn584g97i0j9y83fvcx1bljs6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -545,12 +545,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-08-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "a2fb69aabbe2bbbf1fd08d34c168f2348a4af493"; - sha256 = "1fd6pk0vl8il42d53rzddlbbk5r4k0gz95bk964pc81z38bmskcw"; + rev = "6d0254b845e1cf42ee778763190f852b6d013dc3"; + sha256 = "15z2mfjgpr36bqady1ijvaha41d1rfw5prcwr9czcmh2iaphp2j8"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -773,12 +773,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-01-20"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "276f3a5e43465c479164f00258f7454ff0b4d3a1"; - sha256 = "145gpizsa28g3rd872hxflnw644k9ki5qvw9012yjrfm5n8mmfcp"; + rev = "2a051347190a22b738e9784426199b9db745e1da"; + sha256 = "1z3imhw4jgswd957aqhf1yf5dihb1k9dfd22abshziv45fb0fggy"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -881,12 +881,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-01-14"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "eae915d529503a7a281e2e80aaa0bcb7ef04a576"; - sha256 = "18pfamaczbcpf35dh2sn9cp1wd6fha882qpbzvhx8qrvhjdz0n2a"; + rev = "80a1100866354d2e057fb5a7ef979978b5990ecc"; + sha256 = "1jqx2195c01im5gnp5knqwgrb9fkxsasb9m54s8c2vhqg7i7j7pg"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -917,12 +917,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-01-22"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5b8cc589540e82e6862b2948924f06461261a09a"; - sha256 = "0j1v9nckv86b4z2pz6b9kssp59fl3da9hyadjplnqgilbbcqplxm"; + rev = "873b5942be70bb00541b995d501ac7c96ae5b185"; + sha256 = "181drp1dyrprfv7ljprmyh1mn1nqdqw4c2lb4kna5qh9bfg6051i"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -990,12 +990,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-01-02"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "90df2f87c0b17193d073d1f72cea2e528e5b162d"; - sha256 = "1zrmcmz7vr74pamr8ig7a4r0y9jqjs2rh4zd66gx67ccf4bjapsy"; + rev = "7365bfe9fc6dc004cc97b8977aa8129999d81bf5"; + sha256 = "160pd7d2n66p3nxjp80sm6qhxlcmsg6nlv79ssyi9sxh1z27qm0l"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1182,24 +1182,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-01-24"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "c878e9f1886f86a0210753fa9c146b2e863d84bc"; - sha256 = "1nhzj0pslfzzski3z0synv5vpacfbx359ggsq1z5d9cyapsxchkx"; + rev = "120fcb4231fb8f9852a7c366c183b300ffcf5aef"; + sha256 = "0b29qdgwglj84m4brpn3ic6pdky3xhjnw3mgb97slb7vqkpq450y"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-01-23"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a036b5e3c15baeda71bd76f4b7e9d3de9a057e42"; - sha256 = "1i2yygw4j6g7zihcbja58k2qh0sdn3mqbx277k91bdkf4y1hjdxd"; + rev = "9d386079d0fb5598598a3bbbe62cfba96e764ce2"; + sha256 = "0rg97cqp91cj6czhs6fjk5xw1ydxazvm3dqn01n7l2bngbx44b0j"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1314,12 +1314,12 @@ final: prev: dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2021-08-17"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "08764627ce85fc0c0bf9d8fd11b3cf5fc05d58ba"; - sha256 = "0fqjgnpc6zajqr4pd3hf73fg0cjx7cnkhz6cjdf5mvjwllgv92gp"; + rev = "42e6f57f2404b882cb7e491d50e525f8a8eb7f1f"; + sha256 = "1lla0ldgayryib0868zl10dz6yy9dxa0k86fxl5sr6y0csfpi23z"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1906,12 +1906,12 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2021-09-30"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "eee93cca626fdcdfae0ddcc6f8a956c85455acd3"; - sha256 = "1jm8dnr7p8k9ilc97vqrr5cx1adfhla0rc679iajg2h5ydxngfxk"; + rev = "e4a51e0f6763720ab1d1889e1ce3fa3beaaf00d3"; + sha256 = "11v3jh8qrpwpnvjj1r9z522v9bsyvxwxb8s8856a2zl6vn9caqml"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; @@ -2075,12 +2075,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-01-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "a8efb538f4be58b4f4586bc964f9f10496c05e31"; - sha256 = "0yj7ijr091jsd8rny4zx34427w8v87iywysig5pgrz7iz421wib4"; + rev = "4f6bd8eb5fbe0e45d57e732783ead2c3a01f549c"; + sha256 = "07g44znpv866m1p4hms8ksvadnlhlbbgfx2b8q0kqjidn674z2gy"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2207,12 +2207,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-12-10"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "b6027756f5bdfaaa24b26c5472f8904f78e86c3e"; - sha256 = "0w0nvf1ha065d16zlgqf77rvf52qs350zzy2rb4b741h1fk34v59"; + rev = "dad100bf745aef2739c56ac53c7d34c84956c0eb"; + sha256 = "0bsgmjxdl2vcf786qibksg8psh5zmmvf6cx4x7nkamc4xpy67jhp"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -2255,12 +2255,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-01-19"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d0c1ad8cdb6ad9455f9e084e55c6e411bdb03b49"; - sha256 = "0mavqgxf4ryd5p101c7nzzaxhpcpxlrzlr2mznfg23i1a36ibzxy"; + rev = "d1412ddfadc845f6a98789d7583b2bd428bae14f"; + sha256 = "0r4c2a0fv8y5r97yg37p2v7v1ab6hvwrq5knn2ya29b1am6zzhi3"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2315,12 +2315,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-01-22"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f43cee333fdfeb27aae86bab73a38c5885d5c7f4"; - sha256 = "1rxx8abg4kx6n6xbg2fyw3cjixcnynkg4l00xjh4yk44bi0f65f8"; + rev = "4a2d30f5fb77750c7a42be9bb58a9cc2c6c7f31d"; + sha256 = "0w105nggv6k2b22hkhlh7j19fp6gra70i3skaq1gihhh0x0h5pav"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2351,12 +2351,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-01-20"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "df202bd09bab4b63f5f64857eb8f3411d46fdf11"; - sha256 = "1ndgrrlhw87vwy12fzvf5fhnjdsl9na1a3j4hj6slq9v48rkv87f"; + rev = "c6685381d31df262b776775b9f4252f6c7fa98d0"; + sha256 = "08f6qi6ncicw7zj9vyf08pays9sbxvzwm920i3mbkld6nmb87j39"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3012,12 +3012,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-12-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "5626a1f71bcc2dd7a74156f22c53734621c12433"; - sha256 = "0xr76yf5wm4mggf5993m5sywim08dg3qsgx84xck5zcqiz84i3q9"; + rev = "18dc0d630250c3d3b8cb4139bed53327aa4fed50"; + sha256 = "0cxvhinwd7afsy8jxy9c6ql9ybv1w0m8xv4dh5sl1bpybf8dsg96"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -3132,12 +3132,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-10-05"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "61c7c8668b80537aefa69654a6e5a5e63095be61"; - sha256 = "0aa7cwzaqzma1w5xyvppj6g3i8kc7199zwd4nhc9ydx9isn885sh"; + rev = "81c3ed800ce24bc09802899c1dc0c0b4d8d4f9b2"; + sha256 = "1ahbd3l2jjjjcwsvjlbr0q4vhhlsngz9jwvmrkl5a7q9c7h0y7m6"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3887,24 +3887,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-01-17"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d31b4251cb9985a2c21e6c6dc53decdc48954680"; - sha256 = "1j8h9gv3ilx42gm36xh9z2br3hzakf99z49s08cwfy5xvfwbm2ds"; + rev = "0d665b05efa344977208c230f164440e3a5ce52f"; + sha256 = "1ckz7lrnwgnijf6mm6dxamqhwkr0y0wswc5gcm3np37r58yc5mbh"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-01-16"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3086635873ae37fc8e28d7de55c2969682104a7d"; - sha256 = "1kff4hzgvp5fplzzi4gkmjc99mn5h414c5g1i6i0kddk4cpmhh2z"; + rev = "c8a320359cea86834f62225849a75632258a7503"; + sha256 = "070ji1x52hj0xnmxhdncwq78fybpsvak6b8bdy19rf7grg3ddrzk"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3959,12 +3959,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-24"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "02b185ff04083df22d8d1f957eaee9d1d50c6684"; - sha256 = "1kqcnyk8hb80w4ngggjmhnqnpmks3bzb8l0sqh3vdxzpz2d8bpj1"; + rev = "c5f9957b00aa54cc66bcccb686e586859d44b484"; + sha256 = "1ml0zrrij6a1f42q35wv7ml36yngc9gszzq1nqqh7mdad5zszxk5"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4151,12 +4151,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-01-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9c536aa95f80dd9f5eb08da8499fc5f6145407aa"; - sha256 = "1hcbzwyqr5zypl6v9q6b2c2y7zjvql84mc2ip07066090v6l3qx7"; + rev = "90e616ac6ee2363577cc54f87c50dd958c2e32f9"; + sha256 = "1x87d69fypz0k424xzd8vy1x4lwhgb8hkmc7mybl4bqfdwi00fhr"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4211,24 +4211,24 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-01-20"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "2ec29eda54f5bbc8856794361847729b0f724095"; - sha256 = "1fz30h6nvgy71yc6ccn6m8wbc18kz29xm11zmsxc1qlp0a6j7c59"; + rev = "5fdd8f273145f493c05eeff3d46c7538aea9f126"; + sha256 = "0fj7w8ckp8949ysxnkq9h136pkd9ddqj54rzdb2dnia59wl2i2s1"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-01-14"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "b97cc5faafb10edd8fb5b261423b2f917ba43e1b"; - sha256 = "0b1643j492v7pm9b1z6ana3pjvaf4dqz1zvbqnl5r0bmkl2bb4m4"; + rev = "a7cf7e887454b86a45243bfc3e8dbd4aa73007ba"; + sha256 = "0ri0m0l8kv78ddkf9rgh4dn2857swrnsp6lnx6svpipi38cwz3w1"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-01-23"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "0adceda4fb3fdd25ff015e68ebe176268b12bb2c"; - sha256 = "1nczxn4mxnl5qylzg0kmd7jbybf856x554xv83kwhjv4zzwpaj84"; + rev = "59067dae4bf2367eb06326e419c23353722ecbec"; + sha256 = "0337mwsvd1jjjyvfg6xnmmadjw199i35wc0aiycv22kfdn7y4ybw"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4379,12 +4379,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-01-24"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "27123b1297e37109bdb2fd0cd4638621b0eab65a"; - sha256 = "0wn1jb9pfq541k7lq6qm6434p5vgd6bj7f374rn56x93nxlll1g1"; + rev = "d93104244c3834fbd8f3dd01da9729920e0b5fe7"; + sha256 = "1gn4m5ppqbhk3y5ad98kkgc72ms5xdgx6jdz3176dkd8ah6lnpf0"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4643,12 +4643,12 @@ final: prev: nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-01-11"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "fb2f9d86c036b52eaf6b7901e36a71632ceea264"; - sha256 = "13ddy2g3dlg1b9wy08bxkrq2bjmqmi4xdddrwad7jv47fwpmwgrb"; + rev = "64d233a8859e27139c55472248147114e0be1652"; + sha256 = "1isnz4pys9wdf7w4qfiyjl4a2h66b0iwnxlbs88pn0r7hc8kgr74"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; @@ -4659,8 +4659,8 @@ final: prev: src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "12a0d3a81af173a330c957ca51b81e5f66144ef8"; - sha256 = "06qxdr8dzc7i9fvn9yyjnb1yypdgj35dppivx8752c8czd5bmshw"; + rev = "c51096481dc13193991571b7132740d762902355"; + sha256 = "02gpqp2r6f6zz3mfbxhsg2hvs00yldkz5wn3snk8nyqllm13i3dm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4799,12 +4799,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-01-24"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "91fdda9b5c3896b4b630d98292d657afa00bba2d"; - sha256 = "0qknkalnsjbyqfi9kgmscswwwck40vpwwx6cbrrk4pgkwykabi21"; + rev = "620cc936ad6b26c59bb2d888b3890bb8d06c50c7"; + sha256 = "0f2lg3dwcfvgjal1b87sgf6kvqs16h3a90w4994hp0ps9imipsp8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4847,12 +4847,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-01-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "1ce9933a1be6e16f788d51dcaa9602accfa25030"; - sha256 = "120gqzh205sx26gadilwawx761s6ibyzkbhwybfdd2f1fq832pag"; + rev = "f107174097df7ec29dfeb573ebc2ede8a1f0a067"; + sha256 = "18nwch845kfasgrjfn5asgak02s71cg4n1xxbzqdq4y3g4fvbxjq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5087,12 +5087,12 @@ final: prev: package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-01-06"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "c862335f303c631f53a642a1ea60f15634c720fa"; - sha256 = "05n17r2grh25d6srb5lwazj790xp00l3jsyjc0drf4npyd1m424r"; + rev = "139bcf19837213d4e5d541b46f79390a75e84701"; + sha256 = "0siir143hkw87dzkmm64fdyq3raqd9k50wppjafnvdz6i1pgb7nz"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -5521,12 +5521,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-01-21"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "4f63e903fbcfa5d17fdbe6ae9b03e0b09ab5af89"; - sha256 = "0krvp2q20f6iwk33www097c2i8ah9pls6j1lmbx92n437k6sj5gj"; + rev = "d05b5c1e144f4e0617d184741338d55cb5553538"; + sha256 = "173wff2zys45s3bz14lqzm8s766ypw51gwg3qq0hxig4mb3qmyzm"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5701,12 +5701,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "c9d7de2dc3dc23d2bd6d3f1d147f40ee4c016f79"; - sha256 = "1va0zbhr7j2hym6arg4nfdgk30ypsw2k8nb6j3lfi1fj41l3lmr4"; + rev = "6c831123b78a352216adb640d34bebe355b7df15"; + sha256 = "016r63vkyb2dpc6nvnky7ypv351893pyr5d1b11wpv53s0hr5z4y"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6462,12 +6462,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2022-01-21"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "36df6b281eb3cb47494933a3dc44c874086fa688"; - sha256 = "1lra7c38m3amqgdlb4gnl3rnvszwzn0yv624v2h4lhax8nzzq85j"; + rev = "b46686fd5a928aaf5d433dc9e2aae7d26453f530"; + sha256 = "1dv4m8xycqq1npc99m5mdv4vh6dwcgf6p7nh1lk82kwyhz1rcw8l"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6691,12 +6691,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-01-13"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "f23866b8fbb0703be4e15d50c814ffe496242a67"; - sha256 = "0rvsba0zr3d35dxyjk99shgn7h15r93diwnga1k4s9mcxg07fsmm"; + rev = "d2ceb2ca3268d09db3033b133c0ee4642e07f059"; + sha256 = "0ijmx8rsf8v4m32044bfzprlmbsnlphjcrzvh3jryf6sc58spx6k"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6823,12 +6823,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-01-24"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e12dd76d4a4d9d18c985bbafe8b6a55f7f8ea917"; - sha256 = "0i64rrg3q8w80hskwxsbs1a1nzbkbbwz5vs62dpd6vbi02ghkkzg"; + rev = "e98466fe8e95ceea51dae3337430accbc7a20151"; + sha256 = "0wvd4lr4mspsj8gzh4b5y5byiifyf7lkwbzn7x8g8gifx245vh9m"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -7543,12 +7543,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-01-21"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7aa3959cad43302601d530671808f1b9cd1b5233"; - sha256 = "07298d5fzsg1jyvwiqpphn9add0ihvk0cdhmsvz3zvabh32mx8lz"; + rev = "5ce5ea352432acfe8e9a15ee86dfe623e28b96f6"; + sha256 = "1yh0iqcq6v5gj9bm2ni58bh69cy4y6ihlmp8x49lsr2jv9x4hck9"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8059,12 +8059,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-10-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "8ace05a9a4e225d103a9c06f6d5148d0e07408df"; - sha256 = "0b3lk6z5l3bmxkh4syk8jrqh9s0d4kikna23990f3j06k141k6gp"; + rev = "ff7a1223dfc5386c41bb582039a90a262d488607"; + sha256 = "0a82c6vmdjfq1cjiakdxd9mz0ivqivrjcrppqpwch9rzp98qspag"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -8251,12 +8251,12 @@ final: prev: vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2021-07-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "ddceec6c457fd59bc2a9321cbf817e42aa4bfd86"; - sha256 = "0w0g0wjikvvah6fckay2slrcl7zh9f199safhfs875g6f8halj6g"; + rev = "5bd58732be452a32e923179673b94e5f1ed5dc9e"; + sha256 = "0x79nnscv11xdldb26j42w268bfhw9haph03l587j2pm5bnkd9qb"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; @@ -8347,12 +8347,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-01-13"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a93ceff61f070a095c3c712c389247a80897e3b0"; - sha256 = "0shf5l5rax465hsppswf58lypz9x80jaz74g93jlrx4xfs9k1agl"; + rev = "59529a2c3634dc1cb3956c4faaf824f5c4dd7be1"; + sha256 = "06hj3xl0xpah7hq63lxhlrr66h6prk6x30vxih8sm3ahrhmcwf9w"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8455,12 +8455,12 @@ final: prev: vim-github-dashboard = buildVimPluginFrom2Nix { pname = "vim-github-dashboard"; - version = "2018-09-03"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-github-dashboard"; - rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; - sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; + rev = "a639ab203418210eff3e09cea820102a53e15f5b"; + sha256 = "10dw9lmii3li5hw9sfbam8b2hv19dz6cxfkadmv1xz12cqwfdlwi"; }; meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; @@ -8684,12 +8684,12 @@ final: prev: vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2022-01-15"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "9669226c6db7da5fe96f9ea069f9db254a299796"; - sha256 = "079mhfiqkgn789wl18xd03307k28ixyz37rx6vd2nh0gsfscwf25"; + rev = "ff16bf3bac23fb4e17c976f4e1ff7941cd686c8d"; + sha256 = "0slnykqkbqnncz0vjwhf9p9x8wi5p8xfv485wbip1njd6vqhd965"; }; meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; @@ -9322,12 +9322,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-01-19"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "43483d27bc7abdd8f7c8c71f4d0bbf56d62e0461"; - sha256 = "0py53inwl5csh8aa0cnldqjq73m5yl46frgylcawkx1n99q350v6"; + rev = "07196cfb15070cb8f7f71f8ef4dfbebfc5e83304"; + sha256 = "1z6xnmvq7k0g9wxhzai61jkk5kdywj1jbmqjlm01mydn328nsqj0"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10402,12 +10402,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-01-18"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "b14a41a070d774c562eba7ff63e5f5f6968812fc"; - sha256 = "1997ipivg7y712z2pmaqzgav6irff3gcc5vw809k8syds618w0hh"; + rev = "65ade2453342062010386e226eaa754889e2b557"; + sha256 = "005z7l99lp89lwz7y8a2gfrnby3j2macncbpprjfmnwc0f1y9wvg"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10630,12 +10630,12 @@ final: prev: vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-05-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "5695f97fc803767bf657a5e512daec19dd1fd786"; - sha256 = "0lksvgk3g2yqbm8pw8ba5f8594djh5cj795hwjhnxc8rrhl29qpq"; + rev = "6286cda3f9222bfd490fe34a00a2d8cd4925adec"; + sha256 = "1lsfxrdxqzk0pqrv6him2s4j0vl1khxa5njknsbn8bvmshv8grap"; }; meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; @@ -11111,12 +11111,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-01-21"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "e7f67547956667dd87c4c74bff2760567c3e3ab1"; - sha256 = "0v6kyjsw8ridyvvlwncprfz56iyk9rlsiva5k6sn5ir62cdwhipj"; + rev = "6fd8b9401af0597cfe8f05550d0194d057fce9c7"; + sha256 = "1j3d0fl449a539azm1ldralmijnc8qgn6c703k4qg2kzdkvpaa48"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11412,12 +11412,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-22"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c7c084a5215c9402f1cdfdaa662a7eaa9b67d81b"; - sha256 = "0mcd8wzq9xhidfyyir689050j2nfvwhgjp1ypnp3nib0m10n7kb8"; + rev = "5659e6ac5ffc3ae43bd401d78b3a62653a28b750"; + sha256 = "1nqq10isng6fdkxbn5bjy8c54i00h85m3m13sm0j94lzcia7qxqr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From ec0a4972c81a18b02d6a7b9c49b491d8f9ddcd1d Mon Sep 17 00:00:00 2001 From: ners Date: Thu, 27 Jan 2022 11:13:21 +0100 Subject: [PATCH 103/114] vimPlugins.fidget-nvim: init at 2022-01-26 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2b84c6211a6b..ce5ffb483b7d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1976,6 +1976,18 @@ final: prev: meta.homepage = "https://github.com/wincent/ferret/"; }; + fidget-nvim = buildVimPluginFrom2Nix { + pname = "fidget.nvim"; + version = "2022-01-26"; + src = fetchFromGitHub { + owner = "j-hui"; + repo = "fidget.nvim"; + rev = "66c5ba6ea5f9da9e6a9ef0da07ab594768d5bd39"; + sha256 = "0065rw25rw4r7bnh80z6bis543zynk961w28dqz7pp1x3i4h9lmg"; + }; + meta.homepage = "https://github.com/j-hui/fidget.nvim/"; + }; + file-line = buildVimPluginFrom2Nix { pname = "file-line"; version = "2016-10-21"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d836b5247b86..587c93be4f7d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -277,6 +277,7 @@ itchyny/vim-gitbranch itspriddle/vim-shellcheck ivalkeen/vim-simpledb ivanov/vim-ipython +j-hui/fidget.nvim jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jakwings/vim-pony From da815397a7e60c89bff5a80b24a7ca713599078e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 28 Jan 2022 09:42:47 -0800 Subject: [PATCH 104/114] python3Packages.sentry-sdk: disable web test --- pkgs/development/python-modules/sentry-sdk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a59ec10be037..26ccb1aacc51 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -109,6 +109,8 @@ buildPythonPackage rec { "test_circular_references" # Failing wsgi test "test_session_mode_defaults_to_request_mode_in_wsgi_handler" + # Network requests to public web + "test_crumb_capture" ]; disabledTestPaths = [ From 5b958f0c226edd2a90d1f776cd7db0fdf47276e3 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 27 Jan 2022 07:44:35 +0000 Subject: [PATCH 105/114] python3Packages.apache-beam: fix build --- pkgs/development/python-modules/apache-beam/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 44748f2fdb05..f3e47bfc9010 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -57,6 +57,12 @@ buildPythonPackage rec { ./fix-cython.patch ]; + # See https://github.com/NixOS/nixpkgs/issues/156957. + postPatch = '' + substituteInPlace setup.py \ + --replace "typing-extensions>=3.7.0,<4" "typing-extensions" + ''; + sourceRoot = "source/sdks/python"; nativeBuildInputs = [ From 65a33fec2a6ab71d165e2caacc7254c6669edec0 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 28 Jan 2022 11:04:10 -0800 Subject: [PATCH 106/114] python3Packages.jaxlibWithCuda: init at 0.1.75 (#157055) * python3Packages.jaxlibWithCuda: init at 0.1.75 * python3Packages.jaxlibWithoutCuda: init at 0.1.75 --- pkgs/top-level/python-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0566e7237534..99f85295f4d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4127,6 +4127,14 @@ in { jaxlib = self.jaxlib-build; + jaxlibWithCuda = self.jaxlib-build.override { + cudaSupport = true; + }; + + jaxlibWithoutCuda = self.jaxlib-build.override { + cudaSupport = false; + }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; From 078e4df095d9d1f4b5c4cb30da88546f20473b3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jan 2022 23:27:33 +0000 Subject: [PATCH 107/114] gupnp: 1.4.1 -> 1.4.3 --- pkgs/development/libraries/gupnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index f5aba82956e5..afb6c0d037cb 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.4.1"; + version = "1.4.3"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iZGWteZvA7jiXwRqemWM0qaFG+y4Py1VNFqzKBZV3Aw="; + sha256 = "sha256-FO2nd5NNot90PQckiZM72YETMre1v0Fia4Ay77KLM7o="; }; patches = [ From b612b6bd37202cab045ba2fc3dc458e2f17e2e8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 11:03:39 +0000 Subject: [PATCH 108/114] libredwg: 0.12 -> 0.12.4 --- pkgs/development/libraries/libredwg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index e5123fa61af3..53aab4431088 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -6,13 +6,13 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12"; + version = "0.12.4"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "0ayhp3ym30hzp5f6dz7mmp9hpxf6a48nx3kq5crcmzycm5fllbn7"; + sha256 = "sha256-CZZ5/uCls2tY3PKmD+hBBvp7d7KX8nZuCPf03sa4iXc="; fetchSubmodules = true; }; From cdcb8468e67a0bad93f4fbf76179d5dccce67401 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 03:09:09 +0000 Subject: [PATCH 109/114] libwpe-fdo: 1.10.0 -> 1.12.0 --- pkgs/development/libraries/libwpe/fdo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index e68c60ebbdbf..a711fab63143 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.10.0"; + version = "1.12.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-uJ39NQCk3scREyzXv/clmeZ9VqQZ0ABzDhS7mVR1Ccw="; + sha256 = "sha256-YjnJwVUjQQeY1mMV3mtJFxKrMACboYDz4N0HbZsAdKw="; }; depsBuildBuild = [ From 84726d052e8512cd7697c6cac3c25d044b116af1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 Jan 2022 11:23:18 -0800 Subject: [PATCH 110/114] libunibreak: 4.3 -> 5.0 Co-authored-by: Anderson Torres --- pkgs/development/libraries/libunibreak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 9e6cec471d4d..7dee1d6b1eca 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "4.3"; + version = "5.0"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx"; + sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; }; nativeBuildInputs = [ autoreconfHook ]; From 957b835e7153e75de66e1b0ffeedc894d6a39c63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 19:37:44 +0000 Subject: [PATCH 111/114] python310Packages.pytest-httpserver: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/pytest-httpserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index cd07a104038c..eb04881455d7 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "87561c4fa6a7bc306d76d1979a3eb9d54eb26bfb2f3f51f1643bf3c090ce629d"; + sha256 = "6de464ba5f74628d6182ebbdcb56783edf2c9b0caf598dc35c11f014f24a3f0d"; }; propagatedBuildInputs = [ werkzeug ]; From fe580dcffa4a82da576cc61f27c9996b8bda115e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 28 Jan 2022 13:16:31 +0100 Subject: [PATCH 112/114] terraform: fix the plugins wrapper Terraform needs the plugin directory to not be a tree of symlinks, because it uses https://pkg.go.dev/path/filepath#Walk under the hood. This restores some of the work that had been undone in e7dbfd7ece0e8f11ef0617919cc5597258eda90f --- .../networking/cluster/terraform/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a5e92bedef6a..00175a19aecd 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, buildEnv , buildGoModule , fetchFromGitHub , makeWrapper @@ -102,16 +101,35 @@ let terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) else - lib.appendToName "with-plugins" (buildEnv { + lib.appendToName "with-plugins" (stdenv.mkDerivation { inherit (terraform) name meta; - paths = actualPlugins; nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - mkdir -p $out/bin + + buildCommand = '' + # Create wrappers for terraform plugins because Terraform only + # walks inside of a tree of files. + for providerDir in ${toString actualPlugins} + do + for file in $(find $providerDir/libexec/terraform-providers -type f) + do + relFile=''${file#$providerDir/} + mkdir -p $out/$(dirname $relFile) + cat < $out/$relFile + #!${runtimeShell} + exec "$file" "$@" + WRAPPER + chmod +x $out/$relFile + done + done + + # Create a wrapper for terraform to point it to the plugins dir. + mkdir -p $out/bin/ makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; + + inherit passthru; }); in withPlugins (_: [ ]); From e87db3c8c332cfed455f39a7784f473bab886c2d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 28 Jan 2022 21:04:54 +0000 Subject: [PATCH 113/114] poke: 1.4 -> 2.0 (#157108) Co-authored-by: Sandro --- pkgs/applications/editors/poke/default.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index cdfacaf92ede..31c43fb19a3a 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -13,17 +13,20 @@ , nbdSupport ? !stdenv.isDarwin, libnbd , textStylingSupport ? true , dejagnu + +# update script only +, writeScript }: let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.4"; + version = "2.0"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-zgVN8pVgySEjATJwPuRJ/hMLbiWrA6psx5a7QBUGqiQ="; + sha256 = "sha256-W4Ir8+ESyftcDJqyKjCkWl1eTRbj90NgUrtyCqJrmlg="; }; outputs = [ "out" "dev" "info" "lib" "man" ]; @@ -65,6 +68,20 @@ in stdenv.mkDerivation rec { moveToOutput share/emacs "$out" ''; + passthru = { + updateScript = writeScript "update-poke" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of 'poke 2.0' + new_version="$(curl -s https://www.jemarch.net/poke | + pcregrep -o1 '>poke ([0-9.]+)')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; From 1e8d75b093ee7c759b171f4f7b202f9a7de455ff Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 27 Jan 2022 10:23:23 -0800 Subject: [PATCH 114/114] live555: add vlc test --- pkgs/development/libraries/live555/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 6ff8d54ca301..2e5ec92cf4c4 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,6 +3,9 @@ , fetchurl , darwin , openssl + +# major and only downstream dependency +, vlc }: stdenv.mkDerivation rec { @@ -62,6 +65,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit vlc; + }; + meta = with lib; { homepage = "http://www.live555.com/liveMedia/"; description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";