From 5b70697f7ba0a3484c756a2544012d91082ef28d Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sun, 19 Jun 2022 14:57:17 +0300 Subject: [PATCH 001/104] lexend: init at 0.pre+date=2022-01-27 Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/data/fonts/lexend/default.nix | 36 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/data/fonts/lexend/default.nix diff --git a/pkgs/data/fonts/lexend/default.nix b/pkgs/data/fonts/lexend/default.nix new file mode 100644 index 000000000000..3efb1886b171 --- /dev/null +++ b/pkgs/data/fonts/lexend/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "lexend"; + version = "0.pre+date=2022-01-27"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "57e6c14e2a9b457e8376044a31525c2100297e9c"; + sha256 = "sha256-+tPggQIO50a8kOSnOVN/MR9ZwX5xZqYVNZO79eog9QA="; + }; + + installPhase = '' + runHook preInstall + + cd fonts + for f in *; do + mkdir -p $out/share/fonts/truetype/lexend/$f + install $f/ttf/* $out/share/fonts/truetype/lexend/$f/ + done + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.lexend.com"; + description = "A variable font family designed to aid in reading proficiency"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ fufexan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dba7006d611e..ca698ccde1b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3899,6 +3899,8 @@ with pkgs; lepton-eda = callPackage ../applications/science/electronics/lepton-eda { }; + lexend = callPackage ../data/fonts/lexend { }; + lexicon = callPackage ../tools/admin/lexicon { }; lief = callPackage ../development/libraries/lief { From b17f522053dbd627bc599f9cab3a7f63200778de Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 7 Jul 2022 22:47:19 +0200 Subject: [PATCH 002/104] palemoon: 31.1.0 -> 31.1.1 --- pkgs/applications/networking/browsers/palemoon/default.nix | 6 +++--- pkgs/applications/networking/browsers/palemoon/mozconfig | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index c4c00d563786..f359f05c18ba 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,15 +45,15 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.1.0"; + version = "31.1.1"; src = fetchFromGitea { domain = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; - rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0 + rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4="; + sha256 = "sha256-lKD6+mXHWkNLc1XAX5mJGmwgz60P8mH+zrOi2WoOyJU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index 65143fdac187..d680dc1ab44c 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -19,7 +19,10 @@ ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 +ac_add_options --enable-phoenix-extensions +ac_add_options --disable-eme +ac_add_options --disable-webrtc ac_add_options --disable-gamepad ac_add_options --disable-tests ac_add_options --disable-debug @@ -34,8 +37,10 @@ export MOZILLA_OFFICIAL=1 ac_add_options --x-libraries=@xlibs@ +# MOZ_PKG_SPECIAL is only relevant for upstream's packaging + # -# NixOS-specific adjustments +# NixOS-specific additions # ac_add_options --prefix=@prefix@ From 2cc04ccafe7775b498ac9fbf33e828ec2a098059 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 8 Jul 2022 01:24:25 +0200 Subject: [PATCH 003/104] palemoon: Further limit build cores count Still not consistent with 32. Let's try upstream's job count for releases. --- pkgs/applications/networking/browsers/palemoon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index f359f05c18ba..e4325267e600 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { # Too many cores can lead to build flakiness # https://forum.palemoon.org/viewtopic.php?f=5&t=28480 - export jobs=$(($NIX_BUILD_CORES<=32 ? $NIX_BUILD_CORES : 32)) + export jobs=$(($NIX_BUILD_CORES<=20 ? $NIX_BUILD_CORES : 20)) if [ -z "$enableParallelBuilding" ]; then jobs=1 fi From f276a4435be2b497048c92fbe7d98a4fd32223ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 09:17:44 +0000 Subject: [PATCH 004/104] ergo: 4.0.30 -> 4.0.34 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 1ebcf47146fe..67f44eac450e 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.30"; + version = "4.0.34"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-Jeufmt2Dso13Z/TQnSA8IPNxTfha+wcklKZb+BF/dNE="; + sha256 = "sha256-VFzjoa9TdFMSdWtYvpW1ZfECEmuj25yCXIV99/lzZwI="; }; nativeBuildInputs = [ makeWrapper ]; From 82dc6d6354ca74c1a926ce63e0db23fb33be0d8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 11:11:31 +0000 Subject: [PATCH 005/104] frugal: 3.15.1 -> 3.15.4 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index db83912af638..664392f1674e 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.15.1"; + version = "3.15.4"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pRWTjlPTVwFzamq67hzb+ElqZuqP9aEAVz581DNMUBM="; + sha256 = "sha256-5Q5HPS5MOOJRRUA0sRZS+QURDz52OGKgwuFswhqQFAg="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-ljZ3tpIJ+tg4UDBDzbse4M6ksb8AgPJLJCZeusMtQ0Q="; + vendorSha256 = "sha256-Nqfhrf8zX5F35W3B/XW11Sw7M+mmIL/dfXl+zXqBL0g="; meta = with lib; { description = "Thrift improved"; From f1485955248e4776febff40edcc95311649955f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 06:47:58 +0000 Subject: [PATCH 006/104] mopidy-youtube: 3.5 -> 3.6 --- pkgs/applications/audio/mopidy/youtube.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index 386e372d7987..5110d6ace93f 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.5"; + version = "3.6"; format = "setuptools"; src = fetchFromGitHub { owner = "natumbri"; repo = pname; - rev = "v${version}"; - hash = "sha256-hlokysFFgZZYY7flghgRq6wVG824kpcLkXxk6nMhxn4="; + rev = "refs/tags/v${version}"; + hash = "sha256-Mp8eCVNGokJRwmYiZYCYRwV1QVDV02Uqfh6fGcPgJss="; }; propagatedBuildInputs = with python3.pkgs; [ From 549c0e99714911e6034dcf396703a6e50393d462 Mon Sep 17 00:00:00 2001 From: heyarne Date: Sun, 10 Jul 2022 12:07:04 +0200 Subject: [PATCH 007/104] carp: 0.5.4 -> 0.5.5 --- pkgs/development/compilers/carp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index 6941e5f71b18..209fc6aed611 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -2,13 +2,13 @@ haskellPackages.mkDerivation rec { pname = "carp"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "carp-lang"; repo = "Carp"; rev = "v${version}"; - sha256 = "sha256-o7NLd7jC1BvcoVzbD18LvHg/SqOnfn9yELUrpg2uZtY="; + sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI="; }; # -Werror breaks build with GHC >= 9.0 From 3e2996c31e071ccedfebbe2c072aafac019a35b4 Mon Sep 17 00:00:00 2001 From: devhell Date: Sun, 10 Jul 2022 15:03:19 +0100 Subject: [PATCH 008/104] libstrophe: 0.12.0 -> 0.12.1 --- pkgs/development/libraries/libstrophe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index cddc563ccf04..e0dfd4b3cc60 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-YJ8A97ECc3VxdGfhUu0YYijAamnrHCO6kr7TAIan96o="; + sha256 = "sha256-hNUpHuLwnq66w/VbVAv3QqBFOXDOzd/xPtGGX+j9K2U="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From ef6d6d4c4ae396b9cd4b3a7cb9d61067ff5dcb11 Mon Sep 17 00:00:00 2001 From: Melvyn Date: Sun, 10 Jul 2022 16:26:05 -0700 Subject: [PATCH 009/104] Add `bash` to netdata service path The `bash` binary is needed for running some plugins, notably the alarm notify plugins. If the binary isn't in the path, alarms notifications aren't sent and the netdata error log instead contains `/usr/bin/env: 'bash': No such file or directory`. --- nixos/modules/services/monitoring/netdata.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 489dd337bb7c..5c6cbd33899d 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -186,7 +186,7 @@ in { description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = (with pkgs; [ curl gawk iproute2 which procps ]) + path = (with pkgs; [ curl gawk iproute2 which procps bash ]) ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages) ++ lib.optional config.virtualisation.libvirtd.enable (config.virtualisation.libvirtd.package); environment = { From 16a1651a4affd59157722e5488091d5e267d3465 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 11 Jul 2022 16:45:30 +0200 Subject: [PATCH 010/104] gephi: 0.9.2 -> 0.9.6 Gephi now requies Java 11+. --- pkgs/applications/science/misc/gephi/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index f945e909308b..bb17fcc9c283 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, jdk, maven, javaPackages }: let - version = "0.9.2"; + version = "0.9.6"; src = fetchFromGitHub { owner = "gephi"; repo = "gephi"; rev = "v${version}"; - sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r"; + sha256 = "sha256-3+tOwcE7TUeexJCugFsx9SgsKeb7ApNqbMEIi9QaKPE="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -24,7 +24,7 @@ let installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif"; + outputHash = "sha256-kIPsZN0alRAgiMbckQnMWKOKtCZ37D/6MgT17VYcr+s="; }; in stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6242b1ec4f96..0b71943bf7c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17629,9 +17629,7 @@ with pkgs; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gephi = callPackage ../applications/science/misc/gephi { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + gephi = callPackage ../applications/science/misc/gephi { }; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenCL; From cecee2a6d90c2147d3b60f06f6b26a3c133bbabf Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 12 Jul 2022 08:47:46 +0200 Subject: [PATCH 011/104] tautulli: 2.10.1 -> 2.10.2 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index c2d44b29a0e0..ceb8582a6868 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.10.1"; + version = "2.10.2"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qM3PiBZD0AfbhIdJFYFUGYhsB4U6ZZEW4i7S9waP7VE="; + sha256 = "sha256-nEiyYpj5J95tQAFcyRlaF5VEfosCkk4cmdYKLjfeA98="; }; installPhase = '' From 6c6dd0e32b6419ed1bc1c938185c41fe13149b66 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 3 Jul 2022 15:31:49 +0200 Subject: [PATCH 012/104] python3Packages.classify-imports: init at 4.1.0 Signed-off-by: Florian Brandes --- .../classify-imports/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/classify-imports/default.nix diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix new file mode 100644 index 000000000000..3e0245ab58d1 --- /dev/null +++ b/pkgs/development/python-modules/classify-imports/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "classify-imports"; + version = "4.1.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = pname; + rev = "v${version}"; + hash = "sha256-w/+Sf2ZVSDmFNPICJfAKzfukcznWyFBhi7hjIELtYGI="; + }; + + pythonImportsCheck = [ + "classify_imports" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Utilities for refactoring imports in python-like syntax"; + homepage = "https://github.com/asottile/classify-imports"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7c6532b67c3..7d8978e03933 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1706,6 +1706,8 @@ in { claripy = callPackage ../development/python-modules/claripy { }; + classify-imports = callPackage ../development/python-modules/classify-imports { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cle = callPackage ../development/python-modules/cle { }; From 51be699b02483deb1340f43743f5fed9b92c667a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Jul 2022 08:03:01 +0000 Subject: [PATCH 013/104] manim: 0.15.2 -> 0.16.0 --- pkgs/applications/video/manim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index bdaa216ffaa9..67a406d134e9 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -45,14 +45,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "manim"; format = "pyproject"; - version = "0.15.2"; + version = "0.16.0"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; - rev = "v${version}"; - sha256 = "l5JiFWCMQbGnwRRtYzCHBXdVzWBrTNPdcIYaAt/wRNA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-NQI+kJV0Mu2O/DlwwLYQw2jjJk/TmR7avBX9Fe7zmdk="; }; nativeBuildInputs = [ From 2e40126eff24c0e539679e850034ba16effe40de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Jul 2022 08:37:02 +0000 Subject: [PATCH 014/104] mmc-utils: unstable-2022-04-26 -> unstable-2022-07-13 --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 7f9c72ad870d..6d737ea6bad3 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-04-26"; + version = "unstable-2022-07-13"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "b7e4d5a6ae9942d26a11de9b05ae7d52c0802802"; - sha256 = "D2QgntRsa6Y39nCkXQupXFbJR++JfBpMeEZE0Gv0btc="; + passthru.rev = "d7b343fd262880994f041ce2335442e7bd1071f5"; + sha256 = "cTF3xSNvZ1wifItPmflNFd+fpYArPRvinM7Cyg3JoeE="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; From abe093ebf6cd0d2a41e3aa7c45d83739b5d4b82f Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 14 Jul 2022 19:12:19 +0200 Subject: [PATCH 015/104] mandelbulber: 2.27 -> 2.28 --- pkgs/applications/graphics/mandelbulber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index 8dc057a17c5b..fd552df11b41 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.27"; + version = "2.28"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-CNIt+DC3ZYyT8EY1t641y7jW7vn7Rr1PLOsy9bjKaDk="; + sha256 = "sha256-NrXfEUoTJSz8C6rNU+tSO4PUUo5YWP0bknzXQieOqDc="; }; nativeBuildInputs = [ From 231e13abb9cedc246da43b64a546dd0a0703d3f3 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Thu, 14 Jul 2022 21:08:50 +0200 Subject: [PATCH 016/104] displaylink: 5.5.0-59.151 -> 5.6.0-59.176 --- pkgs/os-specific/linux/displaylink/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 1823613a58a4..f75dd014bc68 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -20,22 +20,22 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.5.0-59.151"; + version = "5.6.0-59.176"; src = requireFile rec { - name = "displaylink-55.zip"; - sha256 = "0pswmczzrqqq0s0ksp6rfnkm693ligq4nblki1v53jdh0y7d1gff"; + name = "displaylink-56.zip"; + sha256 = "1v9s4ksr4mnl629n24si14g762b7knr00sqacz60mxcmy4mch5fa"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.5 + https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.6 Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.5-EXE.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.6-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} ''; }; From b75199faf03a932c8a517f92fe35a2d722de7852 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 14 Jul 2022 23:02:58 +0200 Subject: [PATCH 017/104] electron-mail: 4.14.0 -> 5.0.1 --- .../networking/mailreaders/electron-mail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 43f4f5e2f214..f454a8b43daf 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "4.14.0"; + version = "5.0.1"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-sahMEj9m10gsceTBnYk8wkWcQoM5s6s1ek1U6u3PTgw="; + sha256 = "sha256-w6ZZPIJnAlA8WhNHtM9gsjr7U6wMYT21fGFmkDDAVJU="; }; appimageContents = appimageTools.extract { inherit name src; }; @@ -30,7 +30,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; homepage = "https://github.com/vladimiry/ElectronMail"; - license = licenses.mit; + license = licenses.gpl3; maintainers = [ maintainers.princemachiavelli ]; platforms = [ "x86_64-linux" ]; }; From 30508465d5aa11c174229c8fe053093ade417adc Mon Sep 17 00:00:00 2001 From: Hayden Curfman Date: Tue, 12 Jul 2022 18:49:00 -0400 Subject: [PATCH 018/104] warpd: init at 1.3.2 --- pkgs/applications/misc/warpd/default.nix | 61 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/misc/warpd/default.nix diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/applications/misc/warpd/default.nix new file mode 100644 index 000000000000..e296eec1b345 --- /dev/null +++ b/pkgs/applications/misc/warpd/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, git +, libXi +, libXinerama +, libXft +, libXfixes +, libXtst +, libX11 +, libXext +, waylandSupport ? false, cairo, libxkbcommon, wayland +}: + +stdenv.mkDerivation rec { + pname = "warpd"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "rvaiya"; + repo = "warpd"; + rev = "v${version}"; + sha256 = "AR/uLgNX1VLPEcfUd8cnplMiaoEJlUxQ55Fst62RnbI="; + leaveDotGit = true; + }; + + nativeBuildInputs = [ git ]; + + buildInputs = [ + libXi + libXinerama + libXft + libXfixes + libXtst + libX11 + libXext + ] ++ lib.optionals waylandSupport [ + cairo + libxkbcommon + wayland + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-m644' '-Dm644' \ + --replace '-m755' '-Dm755' \ + --replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \ + --replace 'bin/warpd $(DESTDIR)' 'bin/warpd -t $(DESTDIR)' + ''; + + meta = with lib; { + description = "A modal keyboard driven interface for mouse manipulation."; + homepage = "https://github.com/rvaiya/warpd"; + changelog = "https://github.com/rvaiya/warpd/blob/${src.rev}/CHANGELOG.md"; + maintainers = with maintainers; [ hhydraa ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45039c4cf52d..f5e42b08f924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30984,6 +30984,8 @@ with pkgs; warp = callPackage ../applications/networking/warp { }; + warpd = callPackage ../applications/misc/warpd { }; + w3m = callPackage ../applications/networking/browsers/w3m { }; # Should always be the version with the most features From bfdb0b8abeb4e06fc216c8aa4c6f9e30d02b7e22 Mon Sep 17 00:00:00 2001 From: Hayden Curfman Date: Fri, 15 Jul 2022 19:14:49 -0400 Subject: [PATCH 019/104] maintainers: add hhydraa --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6d9da62e2ddf..67f60c8ec1df 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5107,6 +5107,12 @@ githubId = 3656888; name = "hhm"; }; + hhydraa = { + email = "hcurfman@keemail.me"; + github = "hhydraa"; + githubId = 58676303; + name = "hhydraa"; + }; higebu = { name = "Yuya Kusakabe"; email = "yuya.kusakabe@gmail.com"; From 717ca91ade6b0f7f9eb93405786228f9d546c2a4 Mon Sep 17 00:00:00 2001 From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com> Date: Sun, 17 Jul 2022 09:01:25 +0900 Subject: [PATCH 020/104] spdlog: enable static build through arguments --- pkgs/development/libraries/spdlog/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 5a21af12e33c..9567a6ae170e 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }: +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 +, staticBuild ? stdenv.hostPlatform.isStatic +}: let generic = { version, sha256 }: @@ -18,8 +20,8 @@ let propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" + "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" + "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON" From e445ccc5aa25bb9bd154b426974c504b13ba5d1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 18:00:20 +0000 Subject: [PATCH 021/104] python310Packages.google-cloud-videointelligence: 2.7.1 -> 2.8.0 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 383780ec8a4c..449d0edfd6f6 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.7.1"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UqPwa3OogA2MLm0eCwl2fWSz5Pu6wc6SfiDIF/y8k9I="; + sha256 = "sha256-d5sEMQxHUTrCmGJehsFHBPK79YhpnscTGk9ilKpwrUQ="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; From 875acd1c2b2deb460fddc0afaae93cdb07041f07 Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 19 Jul 2022 14:16:15 +0200 Subject: [PATCH 022/104] nixos/qt5: convert option docs to MD changing a varlist to an md list changes the rendering slightly. --- nixos/modules/config/qt5.nix | 75 +++++++++--------------------------- 1 file changed, 19 insertions(+), 56 deletions(-) diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix index 0cda1ca9c3ec..9e19774b582f 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt5.nix @@ -45,41 +45,17 @@ in ["lxqt" "lxqt-qtplugin"] ["libsForQt5" "plasma-integration"] ]; - description = '' - Selects the platform theme to use for Qt5 applications. - The options are - - - gtk - Use GTK theme with - qtstyleplugins - - - - gnome - Use GNOME theme with - qgnomeplatform - - - - lxqt - Use LXQt style set using the - lxqt-config-appearance - application. - - - - qt5ct - Use Qt style set using the - qt5ct - application. - - - - kde - Use Qt settings from Plasma. - - + description = lib.mdDoc '' + Selects the platform theme to use for Qt5 applications. + + The options are + - `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) + - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform) + - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config) + application. + - `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/) + application. + - `kde`: Use Qt settings from Plasma. ''; }; @@ -97,27 +73,14 @@ in "adwaita-qt" ["libsForQt5" "qtstyleplugins"] ]; - description = '' - Selects the style to use for Qt5 applications. - The options are - - - adwaita - adwaita-dark - Use Adwaita Qt style with - adwaita - - - - cleanlooks - gtk2 - motif - plastique - Use styles from - qtstyleplugins - - - + description = lib.mdDoc '' + Selects the style to use for Qt5 applications. + + The options are + - `adwaita`, `adwaita-dark`: Use Adwaita Qt style with + [adwaita](https://github.com/FedoraQt/adwaita-qt) + - `cleanlooks`, `gtk2`, `motif`, `plastique`: Use styles from + [qtstyleplugins](https://github.com/qt/qtstyleplugins) ''; }; }; From 3fdde458259a25526e9ab2a7bd4840e4a6f4400a Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 19 Jul 2022 14:36:08 +0200 Subject: [PATCH 023/104] nixos/oci-containers: convert option docs to MD no changes to the manpages, no rendering changes to the html manual --- .../modules/virtualisation/oci-containers.nix | 103 +++++++----------- 1 file changed, 40 insertions(+), 63 deletions(-) diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index fa5fe9973044..81cdf1dd72b4 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -14,18 +14,18 @@ let image = mkOption { type = with types; str; - description = "OCI image to run."; + description = lib.mdDoc "OCI image to run."; example = "library/hello-world"; }; imageFile = mkOption { type = with types; nullOr package; default = null; - description = '' + description = lib.mdDoc '' Path to an image file to load before running the image. This can be used to bypass pulling the image from the registry. - The image attribute must match the name and + The `image` attribute must match the name and tag of the image contained in this file, as they will be used to run the container with that image. If they do not match, the image will be pulled from the registry as usual. @@ -38,20 +38,20 @@ let username = mkOption { type = with types; nullOr str; default = null; - description = "Username for login."; + description = lib.mdDoc "Username for login."; }; passwordFile = mkOption { type = with types; nullOr str; default = null; - description = "Path to file containing password."; + description = lib.mdDoc "Path to file containing password."; example = "/etc/nixos/dockerhub-password.txt"; }; registry = mkOption { type = with types; nullOr str; default = null; - description = "Registry where to login to."; + description = lib.mdDoc "Registry where to login to."; example = "https://docker.pkg.github.com"; }; @@ -60,7 +60,7 @@ let cmd = mkOption { type = with types; listOf str; default = []; - description = "Commandline arguments to pass to the image's entrypoint."; + description = lib.mdDoc "Commandline arguments to pass to the image's entrypoint."; example = literalExpression '' ["--port=9000"] ''; @@ -68,7 +68,7 @@ let entrypoint = mkOption { type = with types; nullOr str; - description = "Override the default entrypoint of the image."; + description = lib.mdDoc "Override the default entrypoint of the image."; default = null; example = "/bin/my-app"; }; @@ -76,7 +76,7 @@ let environment = mkOption { type = with types; attrsOf str; default = {}; - description = "Environment variables to set for this container."; + description = lib.mdDoc "Environment variables to set for this container."; example = literalExpression '' { DATABASE_HOST = "db.example.com"; @@ -88,7 +88,7 @@ let environmentFiles = mkOption { type = with types; listOf path; default = []; - description = "Environment files for this container."; + description = lib.mdDoc "Environment files for this container."; example = literalExpression '' [ /path/to/.env @@ -100,15 +100,15 @@ let log-driver = mkOption { type = types.str; default = "journald"; - description = '' + description = lib.mdDoc '' Logging driver for the container. The default of - "journald" means that the container's logs will be + `"journald"` means that the container's logs will be handled as part of the systemd unit. For more details and a full list of logging drivers, refer to respective backends documentation. For Docker: - Docker engine documentation + [Docker engine documentation](https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver) For Podman: Refer to the docker-run(1) man page. @@ -118,49 +118,27 @@ let ports = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Network ports to publish from the container to the outer host. Valid formats: + - `::` + - `::` + - `:` + - `` - - - - <ip>:<hostPort>:<containerPort> - - - - - <ip>::<containerPort> - - - - - <hostPort>:<containerPort> - - - - - <containerPort> - - - - - Both hostPort and - containerPort can be specified as a range of + Both `hostPort` and `containerPort` can be specified as a range of ports. When specifying ranges for both, the number of container ports in the range must match the number of host ports in the - range. Example: 1234-1236:1234-1236/tcp + range. Example: `1234-1236:1234-1236/tcp` - When specifying a range for hostPort only, the - containerPort must not be a - range. In this case, the container port is published somewhere - within the specified hostPort range. Example: - 1234-1236:1234/tcp + When specifying a range for `hostPort` only, the `containerPort` + must *not* be a range. In this case, the container port is published + somewhere within the specified `hostPort` range. + Example: `1234-1236:1234/tcp` Refer to the - - Docker engine documentation for full details. + [Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details. ''; example = literalExpression '' [ @@ -172,7 +150,7 @@ let user = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Override the username or UID (and optionally groupname or GID) used in the container. ''; @@ -182,16 +160,15 @@ let volumes = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' List of volumes to attach to this container. - Note that this is a list of "src:dst" strings to - allow for src to refer to - /nix/store paths, which would be difficult with an - attribute set. There are also a variety of mount options available - as a third field; please refer to the - - docker engine documentation for details. + Note that this is a list of `"src:dst"` strings to + allow for `src` to refer to `/nix/store` paths, which + would be difficult with an attribute set. There are + also a variety of mount options available as a third + field; please refer to the + [docker engine documentation](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) for details. ''; example = literalExpression '' [ @@ -204,17 +181,17 @@ let workdir = mkOption { type = with types; nullOr str; default = null; - description = "Override the default working directory for the container."; + description = lib.mdDoc "Override the default working directory for the container."; example = "/var/lib/hello_world"; }; dependsOn = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Define which other containers this one depends on. They will be added to both After and Requires for the unit. - Use the same name as the attribute under virtualisation.oci-containers.containers. + Use the same name as the attribute under `virtualisation.oci-containers.containers`. ''; example = literalExpression '' virtualisation.oci-containers.containers = { @@ -229,7 +206,7 @@ let extraOptions = mkOption { type = with types; listOf str; default = []; - description = "Extra options for ${defaultBackend} run."; + description = lib.mdDoc "Extra options for {command}`${defaultBackend} run`."; example = literalExpression '' ["--network=host"] ''; @@ -238,7 +215,7 @@ let autoStart = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' When enabled, the container is automatically started on boot. If this option is set to false, the container has to be started on-demand via its service. ''; @@ -339,13 +316,13 @@ in { backend = mkOption { type = types.enum [ "podman" "docker" ]; default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker"; - description = "The underlying Docker implementation to use."; + description = lib.mdDoc "The underlying Docker implementation to use."; }; containers = mkOption { default = {}; type = types.attrsOf (types.submodule containerOptions); - description = "OCI (Docker) containers to run as systemd services."; + description = lib.mdDoc "OCI (Docker) containers to run as systemd services."; }; }; From 7388711363b43ef97959020a0bd6195bc90b3630 Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 19 Jul 2022 15:05:45 +0200 Subject: [PATCH 024/104] nixos/resolved: convert option docs to MD --- nixos/modules/system/boot/resolved.nix | 59 ++++++-------------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 3a38201ff60d..0ab2a875975d 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -15,7 +15,7 @@ in services.resolved.enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the systemd DNS resolver daemon. ''; }; @@ -24,7 +24,7 @@ in default = [ ]; example = [ "8.8.8.8" "2001:4860:4860::8844" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' A list of IPv4 and IPv6 addresses to use as the fallback DNS servers. If this option is empty, a compiled-in list of DNS servers is used instead. ''; @@ -35,7 +35,7 @@ in defaultText = literalExpression "config.networking.search"; example = [ "example.com" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' A list of domains. These domains are used as search suffixes when resolving single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified @@ -43,7 +43,7 @@ in For compatibility reasons, if this setting is not specified, the search domains listed in - /etc/resolv.conf are used instead, if + {file}`/etc/resolv.conf` are used instead, if that file exists and any domains are configured in it. ''; }; @@ -52,32 +52,14 @@ in default = "true"; example = "false"; type = types.enum [ "true" "resolve" "false" ]; - description = '' + description = lib.mdDoc '' Controls Link-Local Multicast Name Resolution support (RFC 4795) on the local host. If set to - - - - "true" - - Enables full LLMNR responder and resolver support. - - - - "false" - - Disables both. - - - - "resolve" - - Only resolution support is enabled, but responding is disabled. - - - + - `"true"`: Enables full LLMNR responder and resolver support. + - `"false"`: Disables both. + - `"resolve"`: Only resolution support is enabled, but responding is disabled. ''; }; @@ -85,21 +67,14 @@ in default = "allow-downgrade"; example = "true"; type = types.enum [ "true" "allow-downgrade" "false" ]; - description = '' + description = lib.mdDoc '' If set to - - - "true" - + - `"true"`: all DNS lookups are DNSSEC-validated locally (excluding LLMNR and Multicast DNS). Note that this mode requires a DNS server that supports DNSSEC. If the DNS server does not properly support DNSSEC all validations will fail. - - - - "allow-downgrade" - + - `"allow-downgrade"`: DNSSEC validation is attempted, but if the server does not support DNSSEC properly, DNSSEC mode is automatically disabled. Note that this mode makes DNSSEC validation @@ -107,22 +82,14 @@ in be able to trigger a downgrade to non-DNSSEC mode by synthesizing a DNS response that suggests DNSSEC was not supported. - - - - "false" - - DNS lookups are not DNSSEC validated. - - - + - `"false"`: DNS lookups are not DNSSEC validated. ''; }; services.resolved.extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra config to append to resolved.conf. ''; }; From ffd3da44f346f8b7fa2c07761459389904098b1c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 19 Jul 2022 19:26:08 -0400 Subject: [PATCH 025/104] defaultGemConfig.grpc: Fix build on v1.48.0+ Upstream commit 0a5d9828c1f6b32e8462a00029b1ba2a720c867b changed how the extension build script detects an Apple toolchain; adjust accordingly by forcing it to be false. Keep both fixes so this is more compatible. --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 6f9da13f5034..5a6d885159a5 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -321,8 +321,12 @@ in substituteInPlace Makefile \ --replace '-Wno-invalid-source-encoding' "" '' + lib.optionalString stdenv.isDarwin '' + # For < v1.48.0 substituteInPlace src/ruby/ext/grpc/extconf.rb \ --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" "" + # For >= v1.48.0 + substituteInPlace src/ruby/ext/grpc/extconf.rb \ + --replace 'apple_toolchain = ' 'apple_toolchain = false && ' ''; }; From 17585ec0dc5a608857852a7fbc522f0a99817dba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Jul 2022 00:58:51 +0000 Subject: [PATCH 026/104] barman: 3.0.0 -> 3.0.1 --- pkgs/tools/misc/barman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 4ad66a98ad5a..36fd90273f29 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -4,13 +4,13 @@ }: python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; - rev = "release/${version}"; - sha256 = "sha256-WLKtra1kNxvm4iO3NEhMNCSioHL9I8GIgkbtu95IyTQ="; + rev = "refs/tags/release/${version}"; + sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow="; }; checkInputs = with python3Packages; [ From 714182c27ef985ffb59631fa70359ac7497b86a0 Mon Sep 17 00:00:00 2001 From: annaaurora Date: Wed, 20 Jul 2022 03:04:49 +0200 Subject: [PATCH 027/104] didu: init at 2.5.2 --- pkgs/tools/misc/didu/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/didu/default.nix diff --git a/pkgs/tools/misc/didu/default.nix b/pkgs/tools/misc/didu/default.nix new file mode 100644 index 000000000000..8a29cdb2d346 --- /dev/null +++ b/pkgs/tools/misc/didu/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitea }: + +rustPlatform.buildRustPackage rec { + pname = "didu"; + version = "2.5.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = pname; + rev = "v${version}"; + sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0="; + }; + + cargoSha256 = "O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA="; + + meta = with lib; { + description = "Duration conversion between units"; + homepage = "https://codeberg.org/annaaurora/didu"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9445d0f3093..5dea2860e0a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -516,6 +516,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + didu = callPackage ../tools/misc/didu { }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; From 3e10c3cfa7a5c77947e656c5b0bcec5971a833c2 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 20 Jul 2022 01:37:29 +0300 Subject: [PATCH 028/104] citrix_workspace: 22.05.0 -> 22.07.0 --- .../networking/remote/citrix-workspace/sources.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 5e1b831f73b1..9f4fa9ce751a 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -87,6 +87,17 @@ let x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1"; x64suffix = "16"; x86suffix = "16"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest2.html"; + }; + + "22.07.0" = { + major = "22"; + minor = "7"; + patch = "0"; + x64hash = "a17e4478ad3eac4b0cbc9fb7be0dba2758393ba2d3b6a82b3074ff053586c5f5"; + x86hash = "f08d9c83a1af7873cbb864b26ec24d731fdc2e5045adee982eeef4083982c5bc"; + x64suffix = "20"; + x86suffix = "20"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 847a1ad4dc0e..d4a985643997 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4871,8 +4871,6 @@ with pkgs; circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_22_05_0; - cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) @@ -4883,7 +4881,9 @@ with pkgs; citrix_workspace_21_09_0 citrix_workspace_21_12_0 citrix_workspace_22_05_0 + citrix_workspace_22_07_0 ; + citrix_workspace = citrix_workspace_22_07_0; cmigemo = callPackage ../tools/text/cmigemo { }; From d97a0394dcecf7813de1e8359d6a987ce0af73b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Jul 2022 21:34:47 +0000 Subject: [PATCH 029/104] python310Packages.pyaudio: 0.2.11 -> 0.2.12 --- pkgs/development/python-modules/pyaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index e937b8759f69..82f2b685d268 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "PyAudio"; - version = "0.2.11"; + version = "0.2.12"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74"; + sha256 = "sha256-Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54="; }; buildInputs = [ pkgs.portaudio ]; From 2c9c33f1360ad1c9fbafd5d2f0bf55e583d01d1f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 21 Jul 2022 11:45:55 +0300 Subject: [PATCH 030/104] =?UTF-8?q?mprime:=2029.8b7=20=E2=86=92=2030.8b15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/mprime/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 3189e41de8d4..159159ce902a 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, curl, hwloc, gmp }: +{ stdenv, lib, fetchurl, unzip, boost, curl, hwloc, gmp }: let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { pname = "mprime"; - version = "29.8b7"; + version = "30.8b15"; src = fetchurl { url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; - sha256 = "0x5dk2dcppfnq17n79297lmn6p56rd66cbwrh1ds4l8r4hmwsjaj"; + hash = "sha256-CNYorZStHV0aESGX9LfLZ4oD5PFR2UOFLN1MiLaKw58="; }; postPatch = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - buildInputs = [ curl hwloc gmp ]; + buildInputs = [ boost curl hwloc gmp ]; enableParallelBuilding = true; From 42d07984ea86513ca79a6d09909e26687a2032cd Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Thu, 21 Jul 2022 16:47:55 +0200 Subject: [PATCH 031/104] dagger: 0.2.20->0.2.25 Signed-off-by: Mark Sagi-Kazar --- .../tools/continuous-integration/dagger/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 86e4525212af..10b83a533b69 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "dagger"; - version = "0.2.20"; + version = "0.2.25"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-TlysP5xf8LJoB9MU/sdQIM6yMfsaI8SP+drRlfG+tQ4="; + sha256 = "sha256-O2Y1F0IjsCfOvTZdOeuvRj5t7UXO9A8sUOgj/1TwuFw="; }; - vendorSha256 = "sha256-pE6g5z4rOQlqmI9LZQXoI6fRmSTXDv5H8Y+pNXVIcOU="; + vendorSha256 = "sha256-zoa17vU2049FJj+Ns3AV01XEMMWzzJ9HSpKp1Hl6CCU="; subPackages = [ "cmd/dagger" ]; - ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Revision=${version}" ]; + ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Version=${version}" ]; meta = with lib; { description = "A portable devkit for CICD pipelines"; From 0a44f5469566e1fcfb3334f3726ae1310f617f83 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 19 Jul 2022 13:28:45 -0700 Subject: [PATCH 032/104] ipxe: fix cross-compilation Tested x86_64 -> arm64 cross compilation, and testing booting via ipxe on an arm64 device. --- pkgs/tools/misc/ipxe/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index dacc3416c93e..03efc1b664c5 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, unstableGitUpdater +{ stdenv, lib, fetchFromGitHub, unstableGitUpdater, buildPackages , gnu-efi, mtools, openssl, perl, xorriso, xz , syslinux ? null , embedScript ? null @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { version = "unstable-2022-04-06"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + strictDeps = true; src = fetchFromGitHub { owner = "ipxe"; @@ -51,6 +54,7 @@ stdenv.mkDerivation rec { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + "CROSS=${stdenv.cc.targetPrefix}" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; From 331c54c75a5cc8a795893c1f31524520a9dadb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 22 Jul 2022 14:47:48 +0200 Subject: [PATCH 033/104] fly: 7.8.1 -> 7.8.2 --- .../tools/continuous-integration/fly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 85eb3cfb6408..1ecd394268cd 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.8.1"; + version = "7.8.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-A37XTLL6BcltKofriqai8RX+VQ4jcFRHriP4sUZ5g2c="; + sha256 = "sha256-Lgsn5k3ITJnRnOXXZjfjlEEG+OvTZjFq+LB3Us3DH8k="; }; - vendorSha256 = "sha256-aYu5K6pK6Q0Fmagr91i6nc3t55nUjn5vasIO+kUXWrs="; + vendorSha256 = "sha256-91N6AOxXFOI6AM28avlInseAeZkqE9IfybJAX31tPDg="; subPackages = [ "fly" ]; From ee7dc5f5f62fb88b42f4a58eae5e36aafe43ddc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 22 Jul 2022 15:11:13 +0200 Subject: [PATCH 034/104] intel-media-driver: 22.4.3 -> 22.5.0 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index a386f4d878bc..8d429daee686 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.4.3"; + version = "22.5.0"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-NcbtgJjDAHRv7Qs6fPRwScMBPLXci6e2oLxm8DC2nnw="; + sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA="; }; patches = [ From 76ce833f804c4bb87511b1c35b9d4f8f77861480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 22 Jul 2022 15:20:22 +0200 Subject: [PATCH 035/104] wsl-open: 2.1.1 -> 2.2.1 --- pkgs/tools/misc/wsl-open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wsl-open/default.nix b/pkgs/tools/misc/wsl-open/default.nix index 2b5808e3be90..e89ef91b4f9e 100644 --- a/pkgs/tools/misc/wsl-open/default.nix +++ b/pkgs/tools/misc/wsl-open/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wsl-open"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "4U6U57"; repo = "wsl-open"; rev = "v${version}"; - sha256 = "1mwak846zh47p3pp4q5f54cw8d9qk61zn43q81j2pkcm35mv9lzg"; + sha256 = "sha256-amqkDXdgIqGjRZMkltwco0UAI++G0RY/MxLXwtlxogE="; }; nativeBuildInputs = [ installShellFiles ]; From 940e9e002ee800664d0ceaacc3192d9be0cb3ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 19 Jul 2022 16:24:02 -0300 Subject: [PATCH 036/104] colloid-icon-theme: init at 2022-04-22 --- .../data/icons/colloid-icon-theme/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/data/icons/colloid-icon-theme/default.nix diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix new file mode 100644 index 000000000000..c1ae9e416e43 --- /dev/null +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gtk3 +, hicolor-icon-theme +, jdupes +, schemeVariants ? [] +, colorVariants ? [] # default is blue +}: + +let + pname = "colloid-icon-theme"; + +in +lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" ] schemeVariants +lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-04-22"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-0lUdsTjIfZ76Mm327jE1uudxtKVQbt17fsel6c2RdVM="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install almost 400 000 small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + name= ./install.sh \ + ${lib.optionalString (schemeVariants != []) ("--scheme " + builtins.toString schemeVariants)} \ + ${lib.optionalString (colorVariants != []) ("--theme " + builtins.toString colorVariants)} \ + --dest $out/share/icons + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "Colloid icon theme"; + homepage = "https://github.com/vinceliuice/colloid-icon-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9998918bdb0..f00f8b61a7c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24658,6 +24658,8 @@ with pkgs; colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { }; + colloid-icon-theme = callPackage ../data/icons/colloid-icon-theme { }; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-mono = callPackage ../data/fonts/comic-mono { }; From c06b43dfefbb6a69cfcf46ca4d8161f267ce4acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 19 Jul 2022 17:13:07 -0300 Subject: [PATCH 037/104] colloid-kde: init at unstable-2022-07-13 --- pkgs/data/themes/colloid-kde/default.nix | 46 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/data/themes/colloid-kde/default.nix diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix new file mode 100644 index 000000000000..ebfc339ead51 --- /dev/null +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +}: + +stdenvNoCC.mkDerivation rec { + pname = "colloid-kde"; + version = "unstable-2022-07-13"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "eaf6844e997aa60c755af7ea560ffba798e72ff5"; + hash = "sha256-FNTG5aVvTWHqNVVR23LFG/ykPtXRD7oH5C6eyWaqc60="; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/latte + + name= HOME="$TMPDIR" \ + ./install.sh --dest $out/share/themes + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "A clean and concise theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Colloid-kde-theme"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9445d0f3093..8821bbd43252 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24643,6 +24643,8 @@ with pkgs; comfortaa = callPackage ../data/fonts/comfortaa {}; + colloid-kde = callPackage ../data/themes/colloid-kde {}; + comic-mono = callPackage ../data/fonts/comic-mono { }; comic-neue = callPackage ../data/fonts/comic-neue { }; From ac5294fe01a119db689668be0fdf4c1aff65b4de Mon Sep 17 00:00:00 2001 From: yuu Date: Fri, 22 Jul 2022 12:27:00 -0300 Subject: [PATCH 038/104] python310Packages.reqif: python3 -> python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jonas Heinrich Co-authored-by: Sandro Jäckel Co-authored-by: Martin Weinelt --- pkgs/development/python-modules/reqif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index 3f8376f659ef..ace3052e5a9c 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, python3 +, python , pythonOlder , fetchFromGitHub , poetry-core @@ -26,7 +26,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace ./tests/unit/conftest.py --replace \ "os.path.abspath(os.path.join(__file__, \"../../../../reqif\"))" \ - "\"${placeholder "out"}/${python3.sitePackages}/reqif\"" + "\"${placeholder "out"}/${python.sitePackages}/reqif\"" substituteInPlace pyproject.toml --replace "^" ">=" substituteInPlace requirements.txt --replace "==" ">=" ''; From a4e05bdc8a3742bcf85dde8eb04aae80a105636d Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Fri, 22 Jul 2022 18:57:01 +0300 Subject: [PATCH 039/104] jellyfin-ffmpeg: 5.0.1-7 -> 5.0.1-8 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 0f07c472c307..e2c692c84057 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,13 +8,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.0.1-7"; + version = "5.0.1-8"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-jMd7tEEfiHqTp4q8c6EvbjL0KyJ6ucj4ZNrKOJLJ1Mc="; + sha256 = "sha256-zr1WuTkOBAVk7JkpDT52rfGGOaXEqiPFIGmJUDPhI/w="; }; postPatch = '' From 5444bc1f9a31649ee54d3a63929d2410106b7eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Fri, 22 Jul 2022 18:34:14 +0200 Subject: [PATCH 040/104] scala-cli: 0.1.9 -> 0.1.10 --- .../tools/build-managers/scala-cli/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 77bc912c47de..849c6b29b4b2 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,17 +1,17 @@ { - "version": "0.1.9", + "version": "0.1.10", "assets": { "aarch64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "10lirk7h0ir2k20rf0xl72642axdhik8g66lcbyn689jybj6vks6" + "sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "10lirk7h0ir2k20rf0xl72642axdhik8g66lcbyn689jybj6vks6" + "sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "11h471rcds0b396r6nqadzmny5dvmz8rxh1kwcj4bldss2mdcckz" + "sha256": "0wjqrkmhk1pjf02c44nffbcgsdq5x9sswjwjfvcs33qpvc712f30" } } } From 91e80ce0f4b0d0a096f1731abfe0884e42bcebac Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:39:58 +0200 Subject: [PATCH 041/104] vscode-extensions.eamodio.gitlens: 12.1.1 -> 12.1.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 551d898cdf56..1e935993d232 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -783,8 +783,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.1.1"; - sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj"; + version = "12.1.2"; + sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From ad3599c8066067e15ccc801bc9f064e7fbfaa311 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:43:29 +0200 Subject: [PATCH 042/104] vscode-extensions.jock.svg: 1.4.17 -> 1.4.19 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1e935993d232..e49a7a94e716 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1379,8 +1379,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.17"; - sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI="; + version = "1.4.19"; + sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq"; }; meta = with lib; { license = licenses.mit; From 35327dd5e7132ce4b0c2a9b4ee0aa496e42e8832 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:44:40 +0200 Subject: [PATCH 043/104] vscode-extensions.ms-azuretools.vscode-docker: 1.22.0 -> 1.22.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e49a7a94e716..d80d1f2b8c6e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1648,8 +1648,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.0"; - sha256 = "sha256-+cY9uLQ4oIk7V/4uCNc6BdIAQCXvPPGeqd0apbDjDos="; + version = "1.22.1"; + sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52"; }; meta = { license = lib.licenses.mit; From 356b04671f92c40339be621e063976d882900f2f Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:45:18 +0200 Subject: [PATCH 044/104] vscode-extensions.redhat.vscode-yaml: 1.7.0 -> 1.9.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d80d1f2b8c6e..c22e92870504 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1859,8 +1859,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.7.0"; - sha256 = "1bbjpaypp0mq5akww5f0pkpq01j0xhhvkfr44f4lb2rdhr5nmnvc"; + version = "1.9.1"; + sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w"; }; meta = { license = lib.licenses.mit; From 920fa3031d62d1fde3970efbc8f8d039ec1bc1ce Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:45:52 +0200 Subject: [PATCH 045/104] vscode-extensions.pkief.material-icon-theme: 4.16.0 -> 4.19.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c22e92870504..57cc9b89a7ad 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1915,8 +1915,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.16.0"; - sha256 = "sha256-AOHvWoVB26caNgEEnKBhw5Z/tRtaTSeVLkO6Rlc/kqo="; + version = "4.19.0"; + sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4"; }; meta = { license = lib.licenses.mit; From 9027613f4ae4d20a189336543df886965a67a398 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:46:26 +0200 Subject: [PATCH 046/104] vscode-extensions.streetsidesoftware.code-spell-checker: 2.2.5 -> 2.3.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 57cc9b89a7ad..ae78faf900d4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2248,8 +2248,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.2.5"; - sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0"; + version = "2.3.1"; + sha256 = "0pm9i3zw4aa4qrcqnzb9bz166rl7p6nwb81m9rqzisdc85mx4s3x"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From 3f4624cf20e79446b93a71267b62321da0b35490 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:46:57 +0200 Subject: [PATCH 047/104] vscode-extensions.wix.vscode-import-cost: 2.15.0 -> 3.3.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ae78faf900d4..a21c27467af9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2540,8 +2540,8 @@ let mktplcRef = { name = "vscode-import-cost"; publisher = "wix"; - version = "2.15.0"; - sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc"; + version = "3.3.0"; + sha256 = "0wl8vl8n0avd6nbfmis0lnlqlyh4yp3cca6kvjzgw5xxdc5bl38r"; }; meta = with lib; { license = licenses.mit; From eef8ecf0ab967ac31ad5e453e400a1ddc41f5af2 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:56:22 +0200 Subject: [PATCH 048/104] spicetify-cli: 2.10.2 -> 2.11.1 --- pkgs/applications/misc/spicetify-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 4e540accce23..ab6d61f7dd26 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.10.2"; + version = "2.11.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chaCz4+RXPUP/MZymxA0h1ATuWYRgru3JMELiWPEBcE="; + sha256 = "sha256-NX3qbnnbV2mLxBQCjfl7xNicyir6usi2uYGw6Yij/ho="; }; vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; From 59de06d0933a8fa74c5641041f1ce1308e632751 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Jul 2022 23:34:54 +0200 Subject: [PATCH 049/104] nixos/tests/signal-desktop: Fix the sqlite3 part of the test (regressed) Due to recent changes (likely a sqlite3 update) the sqlite3 meta-command did suddenly succeed while sqlite3 is still unable to read the still encrypted database. It just prints the following output and doesn't seem to try to open/read the DB (which would fail): ``` main: /home/alice/.config/Signal/sql/db.sqlite r/w ``` We can simply fix this "regression" by instructing sqlite3 to list the tables in the database (which fails because it cannot read the encrypted DB): ``` machine: must fail: su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables' machine # [ 47.036720] su[1178]: Successful su for alice by root machine # [ 47.041049] su[1178]: pam_unix(su:session): session opened for user alice(uid=1000) by (uid=0) machine # Error: file is not a database machine # [ 47.116070] su[1178]: pam_unix(su:session): session closed for user alice (finished: must fail: su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables', in 0.12 seconds) ``` Fix #181463. --- nixos/tests/signal-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index fbe9cdf84d05..5e2b648c7cf5 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -60,7 +60,7 @@ in { ) # Only SQLCipher should be able to read the encrypted DB: machine.fail( - "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .databases'" + "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'" ) print(machine.succeed( "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'" From 5f564536bb640b24c9e7aa39ac75cf1d20aacd7a Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 13 Jul 2022 05:16:05 -0400 Subject: [PATCH 050/104] zcash: 5.0.0 -> 5.1.0 --- .../blockchains/zcash/default.nix | 39 ++++++++++--------- .../zcash/patches/fix-missing-header.patch | 10 +++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/blockchains/zcash/patches/fix-missing-header.patch diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 5a72462b1425..20520037a60c 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,19 +1,17 @@ -{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook -, makeWrapper, cargo, pkg-config, curl, coreutils, boost179, db62, hexdump -, libsodium, libevent, testers, utf8cpp, util-linux, withDaemon ? true -, withMining ? true, withUtils ? true, withWallet ? true, withZmq ? true, zcash -, zeromq +{ autoreconfHook, boost179, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub +, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform, pkg-config +, stdenv, testers, utf8cpp, util-linux, zcash, zeromq }: -rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { +rustPlatform.buildRustPackage.override { inherit stdenv; } rec { pname = "zcash"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "sha256-5PlqFs2njqNeZgmNz0VKMWcRY5lPaF9oTsoh/uLEWi8="; + sha256 = "sha256-tU6DuWpe8Vlx0qIilAKWuO7WFp1ucbxtvOxoWLA0gdc="; }; prePatch = lib.optionalString stdenv.isAarch64 '' @@ -22,12 +20,15 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { --replace "linker = \"aarch64-linux-gnu-gcc\"" "" ''; - cargoSha256 = "sha256-eRRRjUbOieRC88wf+f1jAYvqGFmogBEla67NnImicEc="; + patches = [ + ./patches/fix-missing-header.patch + ]; - nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; - buildInputs = [ boost179 libevent libsodium utf8cpp ] - ++ lib.optional withWallet db62 - ++ lib.optional withZmq zeromq; + cargoSha256 = "sha256-ZWmkveDEENdXRirGmnUWSjtPNJvX0Jpgfxhzk44F7Q0="; + + nativeBuildInputs = [ autoreconfHook cargo cxx-rs hexdump makeWrapper pkg-config ]; + + buildInputs = [ boost179 db62 libevent libsodium utf8cpp zeromq ]; # Use the stdenv default phases (./configure; make) instead of the # ones from buildRustPackage. @@ -42,15 +43,16 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") ''; + CXXFLAGS = [ + "-I${lib.getDev utf8cpp}/include/utf8cpp" + "-I${lib.getDev cxx-rs}/include" + ]; + configureFlags = [ "--disable-tests" "--with-boost-libdir=${lib.getLib boost179}/lib" - "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" - ] ++ lib.optional (!withWallet) "--disable-wallet" - ++ lib.optional (!withDaemon) "--without-daemon" - ++ lib.optional (!withUtils) "--without-utils" - ++ lib.optional (!withMining) "--disable-mining"; + ]; enableParallelBuilding = true; @@ -73,6 +75,5 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { homepage = "https://z.cash/"; maintainers = with maintainers; [ rht tkerber centromere ]; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/blockchains/zcash/patches/fix-missing-header.patch b/pkgs/applications/blockchains/zcash/patches/fix-missing-header.patch new file mode 100644 index 000000000000..6850d78ef12b --- /dev/null +++ b/pkgs/applications/blockchains/zcash/patches/fix-missing-header.patch @@ -0,0 +1,10 @@ +--- a/src/uint256.h 2022-07-20 10:07:39.191319302 +0000 ++++ b/src/uint256.h 2022-07-20 10:07:11.809632293 +0000 +@@ -7,6 +7,7 @@ + #ifndef BITCOIN_UINT256_H + #define BITCOIN_UINT256_H + ++#include + #include + #include + #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 480c5ab77043..f3511c612244 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31939,7 +31939,9 @@ with pkgs; boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { }; + zcash = callPackage ../applications/blockchains/zcash { + stdenv = if stdenv.isDarwin then stdenv else llvmPackages_13.stdenv; + }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; From 418eded8c3149571142578880dffaaa1e4f7186d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 01:08:19 +0000 Subject: [PATCH 051/104] brave: 1.41.99 -> 1.41.100 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 8af5e984c026..2f291266a5ff 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.41.99"; + version = "1.41.100"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-SGh2yp6sYtamIZc5YvBwkoAQxYw0Y9KZyVLI/EGS0dg="; + sha256 = "sha256-r5mMI7iLJ+q4dvt/IDcFlHz56sygYXsG8bb29UVxmTI="; }; dontConfigure = true; From 7a6e1aa612a9217fb6ec23a54103ecf2e7fdc72a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 02:13:35 +0000 Subject: [PATCH 052/104] eget: 1.1.0 -> 1.2.0 --- pkgs/tools/misc/eget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/eget/default.nix b/pkgs/tools/misc/eget/default.nix index f9337c580edd..86a0feb2bcce 100644 --- a/pkgs/tools/misc/eget/default.nix +++ b/pkgs/tools/misc/eget/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "eget"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+sl98pOc3YSy7LnEWsoPQwUtmY/pgMKOX73glzu+3MM="; + sha256 = "sha256-b1KQjYs9chx724HSSHhaMTQQBzTXx+ssrxNButJE6L0="; }; vendorSha256 = "sha256-axJqi41Fj+MJnaLzSOnSws9/c/0dSkUAtaWkVXNmFxI="; From c748802922909f902da2b89bf8a2a004218fd0ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 053/104] postgresqlPackages.pgroonga: 2.3.6 -> 2.3.7 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 6d34900deebf..5d69e312f5bf 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/GimaiFuMEuw4u9if3Z//1KPT78rvaJ+jNjbG3ugkLA="; + sha256 = "sha256-EodqpYF3wJJdgzHZHqmY0tsrF2YnGirnQWCWaDZ9v8E="; }; nativeBuildInputs = [ pkg-config ]; From 3a66ca46a0f6143b5aa5c29bfef316c0f0eb480c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 054/104] terracognita: 0.7.4 -> 0.7.6 --- pkgs/development/tools/misc/terracognita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index b3fd7a54ec0b..0ca36d896dec 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.7.4"; + version = "0.7.6"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg="; + sha256 = "sha256-9t3W/mHXXl8Sw/2iQ5D3U66LiO+/mQ56K+ihJCO4au4="; }; - vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8="; + vendorSha256 = "sha256-JkgkBxeUUQBb+VQzhovH5MnVwdxplKMVCGs4CX/fZlY="; doCheck = false; From 8aebac5ecad3f1a68b9f1968345ca7eaf2c0122d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 055/104] watchexec: 1.19.0 -> 1.20.4 --- pkgs/tools/misc/watchexec/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index d54e906f347e..6fa707b521f3 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, Foundation, installShellFiles, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Cocoa, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.19.0"; + version = "1.20.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "cli-v${version}"; - sha256 = "sha256-Zqu6Qor7kHSeOFyHjcrl6RhB8gL9pljHt7hEd6/0Kss="; + sha256 = "sha256-se3iqz+qjwf71wvHQhCWYryEdUc+kY0Q0ZTg4i1ayNI="; }; - cargoSha256 = "sha256-XwgoYaqgDkNggzi2TL/JPfh8LSFSzSWOVMbkmhXX73I="; + cargoSha256 = "sha256-YM+Zm3wFp3Lsx5LmyjGwZywV/SZjriL6JMDO1l0tNf4="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa AppKit ]; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; checkFlags = [ "--skip=help" "--skip=help_short" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f08816c0ba8..01e779306d1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11672,7 +11672,7 @@ with pkgs; wander = callPackage ../tools/admin/wander { }; watchexec = callPackage ../tools/misc/watchexec { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + inherit (darwin.apple_sdk.frameworks) Cocoa AppKit; }; watchlog = callPackage ../tools/misc/watchlog { }; From 54b1758da4100eb58f3fd0db155d2ac2eafae263 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 056/104] ytcc: 2.5.5 -> 2.6.0 https://github.com/woefe/ytcc/releases/tag/v2.6.0 --- pkgs/tools/networking/ytcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 028c50a352c0..ccd6009a6aa0 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "sha256-DjyVcjU2dVku5ademm6DygMnzWHB7iMqPfU56BBjAwU="; + sha256 = "sha256-NTG7CtmlJzrhgr/JRSQ1jjSpJEm+PlF67PlEbPNihFE="; }; nativeBuildInputs = [ gettext installShellFiles ]; From 953bc968a9b345b35d45471c1a21aa682f6c01f2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 057/104] cloud-nuke: 0.12.2 -> 0.16.1 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 666ddd647f36..06f8c9331ec9 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.12.2"; + version = "0.16.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZBhuRv5IF2VmbvGtXLzVnY3eSso+TSCS05UvCbjtSZ0="; + sha256 = "sha256-11oi67826JALCebxwbbX0pJ2XyK7+2hUpsNfYKZ2Bng="; }; - vendorSha256 = "sha256-N4oyyWY/ANuRFxnfBBAGwacofaYR5/ZH867W/2sm+Gk="; + vendorSha256 = "sha256-DhFwTh7Bm2mPwXFBiYFylYKqWWcSm5/Cv2tXOJsPqm4="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; From cd4f98d03fe7718a7f6af93dd99270dff1553fa9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 058/104] lxd: 5.3 -> 5.4 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 1484f97b9346..99515ce997e5 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { pname = "lxd"; - version = "5.3"; + version = "5.4"; goPackagePath = "github.com/lxc/lxd"; @@ -20,7 +20,7 @@ buildGoPackage rec { "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - sha256 = "sha256-DRdKCfp0nL3lg5O/Wm7vX2grO/DBuyhHRi85XI5laZU="; + sha256 = "sha256-4jS2fFB30F4i+VjjJWvZHyYkUFRZk9Cq8bTOK9uZOTo="; }; postPatch = '' From 74d7b7810ed25386902fabed3193bc52e32f8ac1 Mon Sep 17 00:00:00 2001 From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com> Date: Sat, 16 Jul 2022 22:49:45 +0900 Subject: [PATCH 059/104] cpm: download from GitHub releases instead of GitHub source code --- pkgs/development/tools/cpm/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm/default.nix index cb707cb7b782..cc8788805118 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm/default.nix @@ -1,28 +1,25 @@ { lib , stdenvNoCC -, fetchFromGitHub +, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "cpm"; version = "0.35.1"; - src = fetchFromGitHub { - owner = "cpm-cmake"; - repo = "CPM.cmake"; - rev = "v${version}"; - hash = "sha256-Oon/5iwkUUASsUDvde69iEwLe8/CAzwYKYsyzH5K+V0="; + src = fetchurl { + url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; + sha256 = "sha256-CMge+NpJRU+G+c+s0tb2EN8UG6E8FE90lIvcULggYXY="; }; + dontUnpack = true; dontConfigure = true; - dontBuild = true; installPhase = '' runHook preInstall - mkdir -p ${placeholder "out"}/share/cpm/ - cp ./cmake/CPM.cmake ${placeholder "out"}/share/cpm/ + install -Dm644 $src $out/share/cpm/CPM.cmake runHook postInstall ''; From 29107c388ab49aea062d272fba2ca4bf9b44e3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 23 Jul 2022 20:17:46 +1000 Subject: [PATCH 060/104] rbspy: fix compilation with rust 1.62 --- pkgs/development/tools/rbspy/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index fbd97882428f..4e7135233baa 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -1,4 +1,11 @@ -{ stdenv, rustPlatform, fetchFromGitHub, lib, ruby, which}: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchpatch +, ruby +, which +}: rustPlatform.buildRustPackage rec { pname = "rbspy"; version = "0.12.1"; @@ -13,6 +20,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo="; doCheck = true; + patches = [ + # Backport rust 1.62 support. Should be removed in the next rbspy release. + (fetchpatch { + name = "rust-1.62.patch"; + url = "https://github.com/rbspy/rbspy/commit/f5a8eecfbf2ad0b3ff9105115988478fb760d54d.patch"; + sha256 = "sha256-+04rvEXU7/lx5IQkk3Bhe+KLN8PwxZ0j4nH5ySnS154="; + }) + ]; + # Tests in initialize.rs rely on specific PIDs being queried and attaching # tracing to forked processes, which don't work well with the isolated build. preCheck = '' From d078ac5c8abb68a1f1f4ae7a5f79a9ee2025cd79 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sat, 23 Jul 2022 13:18:51 +0200 Subject: [PATCH 061/104] dagger: add myself as maintainer Signed-off-by: Mark Sagi-Kazar --- .../development/tools/continuous-integration/dagger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 10b83a533b69..6c43d24bd18a 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { description = "A portable devkit for CICD pipelines"; homepage = "https://dagger.io"; license = licenses.asl20; - maintainers = with maintainers; [ jfroche ]; + maintainers = with maintainers; [ jfroche sagikazarmark ]; }; } From 071f18d7cd7d05a29c6d4ec105cdfecee6d5dbe5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 23 Jul 2022 13:51:48 +0200 Subject: [PATCH 062/104] pt2-clone: 1.49 -> 1.50 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 70c6dd12ed84..c51d50fdc42b 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.49"; + version = "1.50"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-mE7mcaQCJlMzFTec9/faTyIZ7aoA4ygn60wS5QgVF7k="; + sha256 = "sha256-IZakhYVtVXmcKwUMl/v1w6Huu5XWQfaBCatTN4hQAbM="; }; nativeBuildInputs = [ cmake ]; From dd107ca580b590ccd25d6961c93a34cc71425799 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 23 Jul 2022 13:37:52 +0100 Subject: [PATCH 063/104] lua5_4: add patch for CVE-2022-33099 --- pkgs/development/interpreters/lua-5/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index a160ee039f3a..97e444ded903 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -17,6 +17,13 @@ rec { extraPrefix = "src/"; excludes = [ "src/testes/*" ]; }) + (fetchpatch { + name = "CVE-2022-33099.patch"; + url = "https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf.patch"; + sha256 = "sha256-qj1Dq1ojVoknALSa67jhgH3G3Kk4GtJP6ROFElVF+D0="; + stripLen = 1; + extraPrefix = "src/"; + }) ]; }; From 3fd4bfbee719ad38d96048e0cb7fc311c698c806 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 23 Jul 2022 15:45:44 +0200 Subject: [PATCH 064/104] faircamp: unstable-2022-03-20 -> unstable-2022-07-22 --- pkgs/applications/misc/faircamp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index ef82703ac4cf..2113d53595da 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-03-20"; + version = "unstable-2022-07-22"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "863cecb468a58a774bd2d1d93f99f3c8ecd8205c"; - sha256 = "sha256-JodIo601BYesbiHarnBk4/GuFR/bpCswxQbaysRP+CI="; + rev = "4803b6e0b59c1fc9922d1e498743a0171d7f324d"; + sha256 = "sha256-VliBGYZPoX65JURlBaVMCMB5DuE/gqr27KcEzAVRFxc="; }; - cargoHash = "sha256-XqsUUc+s01t4KHtktbNhm52r0NeLbcBg5DVw3Xn0oZk="; + cargoHash = "sha256-fs7CXw6CS+TtMxLtDaQiYY6fiBFl4RCttymQJDAm6dg="; nativeBuildInputs = [ makeWrapper From 34c3eb5f328b7ddbcdca25c8f5ca930177721d96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Jul 2022 18:17:46 +0200 Subject: [PATCH 065/104] naabu: 2.0.7 -> 2.0.8 --- pkgs/tools/security/naabu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index a93e8082a0c7..600e2000bc3f 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "sha256-pfaK2Hj6iHk8njEMEbeSHGIKTn5O3IF83At14iDNI34="; + sha256 = "sha256-W0GFSshnVmejq0XHZHFZRHB+RVSsUsHLRqGtyxo/BmQ="; }; - vendorSha256 = "sha256-eco1e1A0cDk1Yc0KP9tc3Kf4E+z1av7EDHynVhoHhMk="; + vendorSha256 = "sha256-+VtQz4objH5Z6IIuQj63E7L9nMWxb5mWK2H/MF0+FxE="; buildInputs = [ libpcap From 8ccaffe21a33506bf3d7ca817cdd57ed101bf036 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 3 Jul 2022 15:34:02 +0200 Subject: [PATCH 066/104] python3Packages.reorder-python-imports: 3.1.0 -> 3.8.1 Signed-off-by: Florian Brandes --- .../python-modules/reorder-python-imports/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index 1bb3475168c1..795a3168c82f 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -4,21 +4,25 @@ , pytestCheckHook , pythonOlder , aspy-refactor-imports +, classify-imports }: buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.1.0"; + version = "3.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; rev = "v${version}"; - hash = "sha256-Ge+VQjK24TqWLMQS19DBX+FFHF3irogK21orlENJx50="; + hash = "sha256-CLC9dfNSYqEBZB2fP34jpA/4cxm0HZzjo/e7Yn8XPFc="; }; - propagatedBuildInputs = [ aspy-refactor-imports ]; + propagatedBuildInputs = [ + aspy-refactor-imports + classify-imports + ]; pythonImportsCheck = [ "reorder_python_imports" From dd2709275ce5175db2a278ee53f5e360c6850b50 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 23 Jul 2022 15:18:39 -0400 Subject: [PATCH 067/104] fish-irssi: unstable-2013-04-13 -> unstable-2021-04-16 --- .../networking/irc/irssi/fish/default.nix | 30 +++++++---------- .../irc/irssi/fish/irssi-include-dir.patch | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index c275f904660b..b26b2cb1daf4 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,34 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, openssl, irssi }: stdenv.mkDerivation rec { pname = "fish-irssi"; - version = "unstable-2013-04-13"; + version = "unstable-2021-04-16"; src = fetchFromGitHub { owner = "falsovsky"; repo = "FiSH-irssi"; - rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6"; - sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp"; + rev = "fcc484f09ce6941ba2e499605270593ddd13b81a"; + hash = "sha256-KIPnz17a0CFfoPO2dZz90j+wG/dR4pv5d0iZMRf7Vkc="; }; - preConfigure = '' - cp -a "${irssi.src}" "./${irssi.name}" - configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}" + patches = [ ./irssi-include-dir.patch ]; - ./regen.sh - ''; + nativeBuildInputs = [ cmake pkg-config ]; - installPhase = '' - mkdir -p $out/lib/irssi/modules - cp src/.libs/libfish.so $out/lib/irssi/modules - ''; + buildInputs = [ glib openssl ]; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ gmp libtool openssl glib ]; + cmakeFlags = [ "-DIRSSI_INCLUDE_PATH:PATH=${irssi}/include" ]; - meta = { + meta = with lib; { homepage = "https://github.com/falsovsky/FiSH-irssi"; - license = lib.licenses.unfree; # I can't find any mention of license - maintainers = with lib.maintainers; [viric]; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch b/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch new file mode 100644 index 000000000000..0a51ec327bdc --- /dev/null +++ b/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 601b92b..b440f83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,27 +36,10 @@ if(OPENSSL_FOUND) + MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}") + ENDIF() + +-# Sets a variable that the user can set with +-# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes . +-SET(IRSSI_INCLUDE_DIR "" CACHE PATH "Path to irssi include files") +- +-# Tries to find the irssi include files in the most common places, +-# and in the user defined directory +-FIND_PATH(IRSSI_INCLUDE_PATH +- NAMES irssi-config.h src/common.h +- PATHS /usr/include/irssi /usr/local/include/irssi ${IRSSI_INCLUDE_DIR} +-) +- +-# Bail out if the required irssi files werent found +-IF(NOT IRSSI_INCLUDE_PATH) +- MESSAGE(SEND_ERROR "Could not detect the irssi include files. Please run:\n# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes .") +- RETURN() +-ENDIF() +- + MESSAGE(STATUS "irssi includes were found on ${IRSSI_INCLUDE_PATH}") + + # Add the weirdo irssi includes directories +-INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/src ${IRSSI_INCLUDE_PATH}/src/fe-common/core ${IRSSI_INCLUDE_PATH}/src/core) ++INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/irssi ${IRSSI_INCLUDE_PATH}/irssi/src ${IRSSI_INCLUDE_PATH}/irssi/src/fe-common/core ${IRSSI_INCLUDE_PATH}/irssi/src/core) + + MESSAGE(STATUS "The module will be installed by default to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/irssi/modules") + MESSAGE(STATUS "You can change it with 'cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .'") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f08816c0ba8..46942ec7aa32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28032,7 +28032,7 @@ with pkgs; irssi = callPackage ../applications/networking/irc/irssi { }; - irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; + fish-irssi = callPackage ../applications/networking/irc/irssi/fish { }; kirc = callPackage ../applications/networking/irc/kirc { }; From a2b8a94988c69dfee49da6fcafd800a82785fbc8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 23 Jul 2022 13:55:49 -0700 Subject: [PATCH 068/104] browsh: 1.6.4 -> 1.8.0 --- .../networking/browsers/browsh/default.nix | 43 +-- .../networking/browsers/browsh/deps.nix | 264 ------------------ 2 files changed, 14 insertions(+), 293 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/browsh/deps.nix diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index e106eb7ff664..60e8631249fd 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,60 +1,45 @@ -{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: let - version = "1.6.4"; + version = "1.8.0"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { - url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "1shf1s9s525wns5vrsc4ns21zjxm1si43lx6v0q8ma6vd5x5445l"; + url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}.xpi"; + sha256 = "sha256-12xWbf4ngYHWLKV9yyxyi0Ny/zHSj2o7Icats+Ef+pA="; }; -in buildGoPackage rec { +in + +buildGoModule rec { inherit version; pname = "browsh"; - goPackagePath = "browsh"; + sourceRoot = "source/interfacer"; - # further go package dependencies are defined in deps.nix, see line below. src = fetchFromGitHub { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; - sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0"; + sha256 = "sha256-/tH1w6qi+rimsqtk8Y8AYljU3X4vbmoDtV07piWSBdw="; }; - nativeBuildInputs = [ go-bindata ]; + vendorSha256 = "sha256-eCvV3UuM/JtCgMqvwvqWF3bpOmPSos5Pfhu6ETaS58c="; - # embed the web extension in a go file and place it where it's supposed to - # be. See - # https://github.com/browsh-org/browsh/blob/v1.5.0/interfacer/contrib/xpi2bin.sh preBuild = '' - xpiprefix="$(mktemp -d)" - cp "${webext}" "$xpiprefix/browsh.xpi" - go-bindata \ - -prefix "$xpiprefix" \ - -pkg browsh \ - -o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \ - "$xpiprefix/browsh.xpi" - - sed \ - -e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \ - -i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go" + cp "${webext}" src/browsh/browsh.xpi ''; - postBuild = '' - mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh" - ''; - - goDeps = ./deps.nix; + # Tests require network access + doCheck = false; meta = with lib; { description = "A fully-modern text-based browser, rendering to TTY and browsers"; homepage = "https://www.brow.sh/"; - maintainers = [ maintainers.kalbasit ]; + maintainers = with maintainers; [ kalbasit siraben ]; license = lib.licenses.lgpl21; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix deleted file mode 100644 index 12154af752da..000000000000 --- a/pkgs/applications/networking/browsers/browsh/deps.nix +++ /dev/null @@ -1,264 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "dd0439581c7657cb652dfe5c71d7d48baf39541d"; - sha256 = "0rhrjlw220hnymzfccm0yir3pc9dpj7h3gwzhzq2cbsb3hhsqvyy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "b5d0c1ac570211e469f43ff88c0c6aa4b56cc99a"; - sha256 = "0g2zfbgyk3djlk0qpmrgcyy0ba9ad932yswpaacswi21qyf9gwag"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "a30252cb686a21eb2d0b98132633053ec2f7f1e5"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "30298f24079860c4dee452fdef6519b362a4a026"; - sha256 = "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1"; - sha256 = "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "eea6ad008b96acdaa524f5b409513bf062b500ad"; - sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "90e289841c1ed79b7a598a7cd9959750cb5e89e2"; - sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "728039f679cbcd4f6a54e080d2219a4c4928c546"; - sha256 = "1v76s3vds0i9dxaha4ikd6xjm7vqqfk6sy9l6jc2lsvmj99d5sy6"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/shibukawa/configdir"; - fetch = { - type = "git"; - url = "https://github.com/shibukawa/configdir"; - rev = "e180dbdc8da04c4fa04272e875ce64949f38bd3e"; - sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "588a75ec4f32903aa5e39a2619ba6a4631e28424"; - sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1"; - sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "b5bf975e5823809fb22c7644d008757f78a4259e"; - sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19"; - }; - } - { - goPackagePath = "github.com/ulule/limiter"; - fetch = { - type = "git"; - url = "https://github.com/ulule/limiter"; - rev = "38b2a440be905c8be884fd5e114dc893a64e5d81"; - sha256 = "0sbbfz9k3m2hf45cx7y7xshsr3rac495lks9ciwmnrzsnxfdh3l5"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; - sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; - sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-tomb/tomb"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] From 1acad56b03fe76bbfe328eb0edf16a3308a90f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Jul 2022 00:42:22 +0000 Subject: [PATCH 069/104] python310Packages.pyswitchbot: 0.14.1 -> 0.15.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 961ef5f246a8..e66489bbc2e9 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.14.1"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-/p5rmoxSl4Y3X1N3E3BSwPUGV8MCxI0sxv1i9w3fJiY="; + hash = "sha256-x1uRUr9mU510X2rSGBYBheB9rqsGBFr3SLnWcXiIBfk="; }; propagatedBuildInputs = [ From 0d5b71d7904e6f96277ab32d4fdcabe2cdb6250f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 15 Jul 2022 09:33:52 -0300 Subject: [PATCH 070/104] libsForQt5.qtstyleplugin-kvantum: add xdg dirs support --- .../libraries/qtstyleplugin-kvantum/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index d7bbabf5e688..3fd891a90510 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem , libX11, libXext, qttools, wrapQtAppsHook , gitUpdater }: @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { sourceRoot = "source/Kvantum"; + patches = [ + (fetchpatch { + # add xdg dirs support + url = "https://github.com/tsujan/Kvantum/commit/01989083f9ee75a013c2654e760efd0a1dea4a68.patch"; + hash = "sha256-HPx+p4Iek/Me78olty1fA0dUNceK7bwOlTYIcQu8ycc="; + stripLen = 1; + }) + ]; + postPatch = '' # Fix plugin dir substituteInPlace style/style.pro \ From 780ac585679123f1b029d5e443fc57df75316cc4 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Sat, 23 Jul 2022 18:56:11 -0700 Subject: [PATCH 071/104] maintainers: add Crafter --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cde1edad6a50..50faa9ce29fd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2649,6 +2649,12 @@ fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; }]; }; + Crafter = { + email = "crafter@crafter.rocks"; + github = "Craftzman7"; + githubId = 70068692; + name = "Crafter"; + }; craigem = { email = "craige@mcwhirter.io"; github = "craigem"; From 1a7f6b407040ff521a958d8ff7872ddee0dfeb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 24 Jul 2022 03:45:16 +0200 Subject: [PATCH 072/104] nixos/hedgedoc: do not require to set searchAttributes when ldap login is used --- nixos/modules/services/web-apps/hedgedoc.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 909b51750d85..fdd12896f0ef 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -843,7 +843,8 @@ in ''; }; searchAttributes = mkOption { - type = types.listOf types.str; + type = types.nullOr (types.listOf types.str); + default = null; example = [ "displayName" "mail" ]; description = '' LDAP attributes to search with. From 98f180b0e33328d7a30991bd99d295dd9348c82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 24 Jul 2022 04:03:24 +0200 Subject: [PATCH 073/104] nixos/hedgedoc: set good default for ldap.tlsca --- nixos/modules/services/web-apps/hedgedoc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index fdd12896f0ef..f0e4f753eb70 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -867,6 +867,7 @@ in }; tlsca = mkOption { type = types.str; + default = "/etc/ssl/certs/ca-certificates.crt"; example = "server-cert.pem,root.pem"; description = '' Root CA for LDAP TLS in PEM format. From 60a93661cab3fc9632ad57a464511a68063a2606 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Sat, 23 Jul 2022 18:56:33 -0700 Subject: [PATCH 074/104] railway: init at 1.8.3 --- pkgs/development/tools/railway/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/railway/default.nix diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix new file mode 100644 index 000000000000..e93cf7b57dc6 --- /dev/null +++ b/pkgs/development/tools/railway/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "railway"; + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "railwayapp"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-PAKg/8Ljcrz92M4sdKXZBe9Qa0NYwWnghzjxsCO8nhU="; + }; + + ldflags = [ "-s" "-w" ]; + + vendorSha256 = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + + postInstall = '' + mv $out/bin/cli $out/bin/railway + ''; + + meta = with lib; { + description = "Railway CLI"; + homepage = "https://railway.app"; + license = licenses.mit; + maintainers = with maintainers; [ Crafter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 480c5ab77043..e066e40835a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10010,6 +10010,8 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; + railway = callPackage ../development/tools/railway { }; + quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; From cdd0cde3051ccf87967085cd5c55e2be62c15dec Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 23 Jul 2022 22:22:20 -0400 Subject: [PATCH 075/104] python3Packages.grpcio: add patch to fix armv6l build Add a patch to fix the libatomic check, which was broken for platforms that actually require libatomic (pretty much only armv6l). The patch has been submitted upstream. --- pkgs/development/python-modules/grpcio/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index dadb9b527620..0ad6cabd9515 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , buildPythonPackage +, fetchpatch , grpc , six , protobuf @@ -17,6 +18,15 @@ buildPythonPackage rec { inherit (grpc) src version; pname = "grpcio"; + patches = [ + # Fix build on armv6l + # https://github.com/grpc/grpc/pull/30401 + (fetchpatch { + url = "https://github.com/grpc/grpc/commit/65dc9f3edeee4c2d0e9b30d5a3ee63175437bea3.patch"; + hash = "sha256-pS4FsCcSjmjSs3J5Y96UonkxqPwfpkyhrEM0t6HaMd0="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cython pkg-config ]; From c6b7abc361569ec886b4a89c8b85aace13c2cb76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Jul 2022 02:41:35 +0000 Subject: [PATCH 076/104] git-machete: 3.11.2 -> 3.11.3 --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index d0fabf46b65c..bfa1e578fda9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alSok5/qcAOBUTNlGjeVSEbT4xW+HzPWj59njfXpG6w="; + sha256 = "sha256-3DIRHvl6r/NhTEQiGqgY59xSI4Y67xRcETgyVv1DIVA="; }; nativeBuildInputs = [ installShellFiles ]; From d3515dd4a78f041a84c275e7caf9bbb13e9f8922 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 30 Apr 2022 11:53:45 +0000 Subject: [PATCH 077/104] coccinelle: 1.1.0 -> 1.1.1 --- .../tools/misc/coccinelle/default.nix | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 2d9aa55ed050..66424e439684 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,21 +1,53 @@ -{ fetchurl, lib, stdenv, python3, ncurses, ocamlPackages, pkg-config }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, ocamlPackages +, pkg-config +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "coccinelle"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchurl { - url = "https://coccinelle.gitlabpages.inria.fr/website/distrib/${pname}-${version}.tar.gz"; - sha256 = "0k0x4qnxzj8fymkp6y9irggcah070hj7hxq8l6ddj8ccpmjbhnsb"; + src = fetchFromGitHub { + repo = pname; + rev = version; + owner = "coccinelle"; + hash = "sha256-rS9Ktp/YcXF0xUtT4XZtH5F9huvde0vRztY7vGtyuqY="; }; - buildInputs = with ocamlPackages; [ - ocaml findlib menhir - ocaml_pcre parmap stdcompat - python3 ncurses pkg-config + patches = [ + # Fix data path lookup. + # https://github.com/coccinelle/coccinelle/pull/270 + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/540888ff426e0b1f7907b63ce26e712d1fc172cc.patch"; + sha256 = "sha256-W8RNIWDAC3lQ5bG+gD50r7x919JIcZRpt3QSOSMWpW4="; + }) ]; - doCheck = false; + nativeBuildInputs = with ocamlPackages; [ + autoreconfHook + pkg-config + ocaml + findlib + menhir + ]; + + buildInputs = with ocamlPackages; [ + ocaml_pcre + parmap + pyml + stdcompat + ]; + + strictDeps = true; + + postPatch = '' + # Ensure dependencies from Nixpkgs are picked up. + rm -rf bundles/ + ''; meta = { description = "Program to apply semantic patches to C code"; @@ -33,8 +65,8 @@ stdenv.mkDerivation rec { and others) for finding and fixing bugs in systems code. ''; - homepage = "http://coccinelle.lip6.fr/"; - license = lib.licenses.gpl2; + homepage = "https://coccinelle.gitlabpages.inria.fr/website/"; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; From 46cf1b978133b993eacf30a3c564df29044df0e5 Mon Sep 17 00:00:00 2001 From: Kamil Date: Sun, 24 Jul 2022 06:20:15 +0300 Subject: [PATCH 078/104] tbb: Fix build for aarch64-darwin (#182367) --- pkgs/development/libraries/tbb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 1d739810e9e6..4617614b25ee 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; }) + + # Fixes build for aarch64-darwin + (fetchurl { + name = "aarch64-darwin.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; + sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; + }) ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ From 329c52b41633ede32cb005f1e02a4c2f21442008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 24 Jul 2022 13:36:45 +1000 Subject: [PATCH 079/104] parsedmarc: expose as an application --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebe82b7dd8db..f2c9502dacd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35145,6 +35145,8 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; + parsedmarc = with python3Packages; toPythonApplication parsedmarc; + pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin4 = callPackage ../tools/admin/pgadmin { }; From 422acf32d0e88e2c5e4ab2ae8732b48e7f3e54fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 24 Jul 2022 08:23:49 +0200 Subject: [PATCH 080/104] libsolv: replace lzma alias with actual xz attribute --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 67797100aa9a..7267b7d99b2f 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config -, zlib, lzma, bzip2, zchunk, zstd +, zlib, xz, bzip2, zchunk, zstd , expat, rpm, db }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ zlib lzma bzip2 zchunk zstd expat rpm db ]; + buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ]; meta = with lib; { description = "A free package dependency solver"; From 47f09a22851fde43c3b690d220449b0dac2935a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 24 Jul 2022 03:57:29 +0000 Subject: [PATCH 081/104] terraform-providers: update 2022-07-24 --- .../terraform-providers/providers.json | 194 +++++++++--------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cd8cf81c903d..e714ad4afd73 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,10 +3,10 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v2.3.0", - "sha256": "sha256-V4LvMVWuKsGMVo/P8r79ICy3SrsVmCOMl75yRIixqAQ=", + "rev": "v2.4.0", + "sha256": "sha256-jP9C2RF0lTzQ2HB21WPAZ1aONcQijiYxfi7miltT7W0=", "vendorSha256": null, - "version": "2.3.0" + "version": "2.4.0" }, "acme": { "owner": "vancluever", @@ -49,10 +49,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.176.0", - "sha256": "sha256-YMcB1CdnXdYHBUdghFP/4BHCtWfOSzPXMD+VZp49VY0=", - "vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=", - "version": "1.176.0" + "rev": "v1.177.0", + "sha256": "sha256-Fm0ECJ/pszClIlzqRcW8jKwU+PfejL8D8ln/5GxWHH8=", + "vendorSha256": "sha256-pia256CKguRY+Acedq6QJmgBpiIGwxgn6tchFB6qjwQ=", + "version": "1.177.0" }, "ansible": { "owner": "nbering", @@ -76,37 +76,37 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.33.0", - "sha256": "sha256-yAt2uBrkHS6TalHArSikRxTo8s0g/PoNoPBS/d/iWzY=", - "vendorSha256": "sha256-HJtG2sCQpY9rTSwHj2PjSiF8236VLufF9B9TyubGD/Q=", - "version": "0.33.0" + "rev": "v0.34.0", + "sha256": "sha256-wjqJf3MgLL5NAXp0Nf9VWg8D8jEKvyXoLCMq9yyyFGM=", + "vendorSha256": "sha256-5OIMhuzM/jTXNeZpMG3BOOUTmJyoLrbOjR2O7ixDDlM=", + "version": "0.34.0" }, "avi": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/avi", "repo": "terraform-provider-avi", - "rev": "v21.1.4", - "sha256": "sha256-6H56TRA3I0CQ9/d8JdP5JNL0u3lpS8YhCvdSM5bxYp8=", - "vendorSha256": "sha256-b0MwGmgugZdmVk7ZVBSCivDQ4n+tLABymH/igo/S1Wc=", - "version": "21.1.4" + "rev": "v22.1.1", + "sha256": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=", + "vendorSha256": "sha256-otOArethLfanpp3KjQCutrlOxkcpr+6YHn5xWl31feE=", + "version": "22.1.1" }, "aviatrix": { "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.22.1", - "sha256": "sha256-jvk6j/JZvRSq1ywlkJdCXGFrJccjViCVAIe+z4SjiUk=", + "rev": "v2.22.2", + "sha256": "sha256-3IzIeixm63r42s/Bs8EMemxK0u0TSCWgTuPw3FoBSws=", "vendorSha256": null, - "version": "2.22.1" + "version": "2.22.2" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.22.0", - "sha256": "sha256-F+YzXIKkF/eGUY3l8MjeP+8GqS37e1N9b+fmNCkdeMM=", - "vendorSha256": "sha256-kz0bPsfLCekRj/ZGCBT+eFRMRkV+Dc69RkyBbFaztd0=", - "version": "4.22.0" + "rev": "v4.23.0", + "sha256": "sha256-cl58lC2oAT+8kISm59E1zRq9pZk+xaQxVxnDge/9jFk=", + "vendorSha256": "sha256-ew6s5QbGOibhCyhbhEjCCVA6d7BrhH7UPovizv/U85Y=", + "version": "4.23.0" }, "azuread": { "owner": "hashicorp", @@ -121,10 +121,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.14.0", - "sha256": "sha256-/lE+PuljWG57d3tSiNo0ED4Cj2fJbyDsWNqdYcl1vS4=", + "rev": "v3.15.0", + "sha256": "sha256-U6AVVbX1IuYIASuC7W9ZLpXjT/aOBrg+H7mbVwJfZMc=", "vendorSha256": null, - "version": "3.14.0" + "version": "3.15.0" }, "azurestack": { "owner": "hashicorp", @@ -377,10 +377,10 @@ "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.38.0", - "sha256": "sha256-TVJlfce5bF5Z64FOPKqb0ac+NtjzeHsid+Q7vWIINuk=", + "rev": "v0.39.1", + "sha256": "sha256-dsTKh/Fx0PEka/vOy/AJ3CAcE2lpY7x62ms0sTIPwOw=", "vendorSha256": null, - "version": "0.38.0" + "version": "0.39.1" }, "external": { "owner": "hashicorp", @@ -395,19 +395,19 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.2.0", - "sha256": "sha256-x5Rl4JW59kuAoX0pSpCpto3dcvyEhvZlocg8fv2R6Jw=", + "rev": "v2.2.1", + "sha256": "sha256-Ls5yTkwnvBjvGyJZ9Hr+BE6jFuwoTfl/iFVf3WsduF8=", "vendorSha256": null, - "version": "2.2.0" + "version": "2.2.1" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.31.0", - "sha256": "sha256-Vu6XRRtN+04Hg1OhZ42QaqFiVbov0Zg5v6Rbyeyz410=", + "rev": "v1.31.1", + "sha256": "sha256-QB3O9Ez+hFgBE1yYi1kqtC3WW//Ueg/Ij4p2WbQz/AE=", "vendorSha256": "sha256-P2/yK6aLNdmC8g5dMKK0hpAdj76KtewzVVHQsVgr3J4=", - "version": "1.31.0" + "version": "1.31.1" }, "fortios": { "owner": "fortinetdev", @@ -431,10 +431,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.27.0", - "sha256": "sha256-cQMkBhXvD5sO9obHGH64GcDg6v5X5qs9QHwjyBNkRww=", + "rev": "v4.27.1", + "sha256": "sha256-Pu8I+tAcrEN8ZtBv/gH1VguO1GVk3tnqeJ50cLh7/HQ=", "vendorSha256": null, - "version": "4.27.0" + "version": "4.27.1" }, "gitlab": { "owner": "gitlabhq", @@ -450,20 +450,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.28.0", - "sha256": "sha256-Dy0T5/G8vzaE688o/lb4H3ccE0mGnTRDQHIxcvs1C9k=", - "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.28.0" + "rev": "v4.29.0", + "sha256": "sha256-4qWqL/A/Q9tOokhQc8HMgqNVnLjfLkMKM8JfSZSMuj8=", + "vendorSha256": "sha256-slZpug9kyO3BNARwBUgZLRj0QWkUAKzb9eSVhth9zhY=", + "version": "4.29.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.28.0", - "sha256": "sha256-faYPwFcusDVM1TM5I9sgpUBER8TB2ltaTryyDvLQz9g=", - "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.28.0" + "rev": "v4.29.0", + "sha256": "sha256-bBpJ+iG/wTXUQCVIPyEyyZG41Qeot8unGF0qQj2Pco8=", + "vendorSha256": "sha256-slZpug9kyO3BNARwBUgZLRj0QWkUAKzb9eSVhth9zhY=", + "version": "4.29.0" }, "googleworkspace": { "owner": "hashicorp", @@ -487,19 +487,19 @@ "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.14.3", - "sha256": "sha256-OGVIZ6q8qq4XkkWxjX5BQCJE9qubJ5Xnt2DrD23JGB8=", + "rev": "v1.15.0", + "sha256": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=", "vendorSha256": null, - "version": "1.14.3" + "version": "1.15.0" }, "hcloud": { "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.34.3", - "sha256": "sha256-3p7pdpBxrbKZx6di39GQb2DOS2ZtN4uVmIb2OU0Zs+c=", + "rev": "v1.35.0", + "sha256": "sha256-64WfmC0QZRYP3L9Lf3bT5Cy5qOAlCpNt6ME/xe8U6MA=", "vendorSha256": "sha256-3JFdsuJlDW6xTgSgn7hkIWfH9Iqr35t8op4yVXYIFpg=", - "version": "1.34.3" + "version": "1.35.0" }, "helm": { "owner": "hashicorp", @@ -514,10 +514,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.0", - "sha256": "sha256-MMX8zaM3J2GxMXUX0YNX03V8uQzb67cIUF432tjm3Mw=", + "rev": "v5.1.1", + "sha256": "sha256-lXMxIxXgjW2hD4wJQBnc19WFym4zJSKq3dUeUbIqiOQ=", "vendorSha256": null, - "version": "5.1.0" + "version": "5.1.1" }, "hetznerdns": { "owner": "timohirt", @@ -676,10 +676,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.28.0", - "sha256": "sha256-FkfyyG+DcfsTQY319zmg5iiCgAW8Eu2PxWF35vd51Ng=", - "vendorSha256": "sha256-fWD1Qf6vFe/MH2K2yFufCFBcVuos7FD31ShOA9GvsWw=", - "version": "1.28.0" + "rev": "v1.28.1", + "sha256": "sha256-w7PvzcgyzrkxQ+I8Bjw5C3MqMmiJS5neuGipC+H+mEM=", + "vendorSha256": "sha256-c0NtM3TkkSjrwQ9fj0XiH0BYnSsE8uzirkTv2QHzPOg=", + "version": "1.28.1" }, "linuxbox": { "owner": "numtide", @@ -794,10 +794,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.48.2", - "sha256": "sha256-iLgc9nkeQIElVvu7+Pw5yZyzsx3VovCKOoJMIPigBGo=", - "vendorSha256": "sha256-ch+xeSTIu1zkbPN/zq3BKywNLt6ip1HxYCvSmU+0+mI=", - "version": "2.48.2" + "rev": "v2.49.1", + "sha256": "sha256-+jjMdBj8yEJBA9etiRo3qu+/KfpOe3Gb2DqCR8YPzPI=", + "vendorSha256": "sha256-iIArzW/r57OCtq/lNaFCvQrrGJ8WPHo4md+JrHdMyGs=", + "version": "2.49.1" }, "nomad": { "owner": "hashicorp", @@ -849,10 +849,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.84.0", - "sha256": "sha256-fLWA7SPoCzO2TZkxnUw5K07OCAQYd+X5BMnHeIdAEdA=", + "rev": "v4.85.0", + "sha256": "sha256-Idqd8l2vxgWyV7uze66mP2/+KKaPQug8FXfyDb8d1Vg=", "vendorSha256": null, - "version": "4.84.0" + "version": "4.85.0" }, "okta": { "owner": "okta", @@ -894,19 +894,19 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.30.0", - "sha256": "sha256-goXQlsOw/nE4d+9VXfqr1yhf/DEOtlVdIS2QJ2s4+8M=", + "rev": "v1.30.1", + "sha256": "sha256-FIxW/bxs/w4j/YyYIYLQHH3Nh4TUWNb2pGqC6zjBiww=", "vendorSha256": "sha256-0QKYpjA9iv8dSOZ5mIqJ/hpQxlgd+5Y/txBDa0Gsqqc=", - "version": "1.30.0" + "version": "1.30.1" }, "opsgenie": { "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.10", - "sha256": "sha256-nA3AXwvVFBnyVK8qeUN0AUzISpAYzVdLtyBQNbUxuM8=", + "rev": "v0.6.11", + "sha256": "sha256-R+IKAI86DhQ2E74VpswqG75p7PRzSV77at2+dAyI5RI=", "vendorSha256": null, - "version": "0.6.10" + "version": "0.6.11" }, "ovh": { "owner": "ovh", @@ -1011,10 +1011,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.2", - "sha256": "sha256-uSJga2M+9unC8eJkUjhuCQbTTGXEYGky4MJyVL0ZfiQ=", - "vendorSha256": "sha256-DOL38q5463aOMijP6AbBuE7jI7hvLYLm8yCBxrr6DoA=", - "version": "2.2.2" + "rev": "v2.2.3", + "sha256": "sha256-XiGc6MU0TrpaZL0SRKez2IUFM7MZIu8tGMFIUQJzbv4=", + "vendorSha256": "sha256-pDDk4cGCZEotOfL1OLEVJVQ35lI/fdNh2NNjAkIHTZ0=", + "version": "2.2.3" }, "secret": { "owner": "numtide", @@ -1038,10 +1038,10 @@ "owner": "jianyuan", "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.9.2", - "sha256": "sha256-/Am4v+s7l3hDCbvIV34aG9C+dMEtPS6qB97FywcZcho=", - "vendorSha256": "sha256-A8VxxoMYd8Z4DRFmBLh/uSzjWxIyLQGtV4kGbuDfv8I=", - "version": "0.9.2" + "rev": "v0.9.3", + "sha256": "sha256-FTwJ0H5k5zeglgjur3O6b4GybWAmVF4K7QmNMlvHnlY=", + "vendorSha256": "sha256-lmnZLgCTpKGhk+rUWwL2GQoBAXlU006Sk1GZrcEvhD4=", + "version": "0.9.3" }, "shell": { "owner": "scottwinkler", @@ -1056,10 +1056,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.13.1", - "sha256": "sha256-OtWJgLObTaWCGOjxN8nlkmfW+D6EMS0esht/OkJaioM=", - "vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=", - "version": "6.13.1" + "rev": "v6.14.0", + "sha256": "sha256-29yN8n/m/1kSl9xRlf5dae9KOL16FvfZJuM1fLqWPd4=", + "vendorSha256": "sha256-I9fWw6wJiytEuiT8gQVSTKuQggXCMENn4RBxPsenZOY=", + "version": "6.14.0" }, "skytap": { "owner": "skytap", @@ -1074,10 +1074,10 @@ "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.39.0", - "sha256": "sha256-I15vLcZtVPs/37vRuJk5qiiWxNXY561gpWkOLw4ZN6w=", + "rev": "v0.40.0", + "sha256": "sha256-xouzlgI7MkFfela0ZgaX318YhgBLN5/qN+yqZ7rxVGQ=", "vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=", - "version": "0.39.0" + "version": "0.40.0" }, "sops": { "owner": "carlpett", @@ -1128,10 +1128,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.76.0", - "sha256": "sha256-Qfe2j6y2qn1GVtsv9+Sy7r9tmPMuAkkNNsOqno2nCx8=", + "rev": "v1.76.2", + "sha256": "sha256-dtymdUggjQk3v8FWWBktMe2kPoeEn3FBsXSZ12JneRw=", "vendorSha256": null, - "version": "1.76.0" + "version": "1.76.2" }, "tfe": { "owner": "hashicorp", @@ -1164,10 +1164,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", - "rev": "v3.4.0", - "sha256": "sha256-14sKHnmUfDbXceH+bfSPuA1TKo6Q6kkazYwHC15D4vY=", - "vendorSha256": "sha256-o7QvF6Z/HCyb/EBr0m90B63AVKqxteQEBXe+OuovnYg=", - "version": "3.4.0" + "rev": "v4.0.0", + "sha256": "sha256-owOYnn4tIvdCxCZLaAhq9UwcgDIwyrISVTxWjC6oRM8=", + "vendorSha256": "sha256-Uk20wDu2qIs9Ez/H6NyHMS7i34Il0ReuDzC3MnKdHSk=", + "version": "4.0.0" }, "triton": { "deleteVendor": true, @@ -1201,10 +1201,10 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.27", - "sha256": "sha256-FE2G0EOjI4D9HzH05eiwTHc4ZN+5NfcJXYoMUZN+OWM=", - "vendorSha256": "sha256-/ZxmvsKTteAvl9NoCyxSQk4llDsGZmZTZxEIPlqXvY0=", - "version": "0.17.27" + "rev": "0.17.28", + "sha256": "sha256-8Ep4eYpFSJtIA7twOpUI5ns4/lqSnM07MflQJLnC8eU=", + "vendorSha256": "sha256-6ELd3Cxc460TY+XY1AcDQamYg76hWad6bO9BzTEWleU=", + "version": "0.17.28" }, "vault": { "owner": "hashicorp", From 969f5256830f1397a7894e36add77681240306c5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 14 Jun 2022 18:07:24 +0200 Subject: [PATCH 082/104] qremotecontrol-server: 2.4.1 -> 2.4.2 --- .../misc/qremotecontrol-server/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 4e752a0e2841..301b217c5fca 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv -, fetchurl +{ lib +, stdenv +, fetchgit , qmake4Hook , qt4 , xorg @@ -7,11 +8,13 @@ stdenv.mkDerivation rec { pname = "qremotecontrol-server"; - version = "2.4.1"; + version = "2.4.2"; - src = fetchurl { - url = "mirror://sourceforge/project/qrc/${version}/qremotecontrol-${version}.tar.bz2"; - sha256 = "07hzc9959a56b49jgmcv8ry8b9sppklvqs9kns3qjj3v9d22nbrp"; + # There is no 2.4.2 release tarball, but there is a git tag + src = fetchgit { + url = "https://git.code.sf.net/p/qrc/gitcode"; + rev = version; + sha256 = "sha256-i3X575SbrWV8kWWHAhXvKl5aSKFZm0VyrJOiL7eYrCo="; }; nativeBuildInputs = [ qmake4Hook ]; From a102efba924d87452e507bb304be81fb0b7f8ee2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 14 Jun 2022 18:20:03 +0200 Subject: [PATCH 083/104] qremotecontrol-server: 2.4.2 -> unstable-2014-11-05, use Qt5 Qt4 is going to be removed: #174634 --- ...01-fix-qt5-build-include-QDataStream.patch | 26 ++++++++++++++++ .../misc/qremotecontrol-server/default.nix | 31 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch diff --git a/pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch b/pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch new file mode 100644 index 000000000000..0d6c9f15f3db --- /dev/null +++ b/pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch @@ -0,0 +1,26 @@ +From 922d3dd36ac72b29ea21c4c728a922b43b19400e Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta +Date: Tue, 14 Jun 2022 17:55:43 +0200 +Subject: [PATCH] Another Qt5 fix + +--- + qtsingleapplication/qtlocalpeer.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp +index 4a84036..e6ccc72 100644 +--- a/qtsingleapplication/qtlocalpeer.cpp ++++ b/qtsingleapplication/qtlocalpeer.cpp +@@ -41,6 +41,9 @@ + + #include "qtlocalpeer.h" + #include ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) ++#include ++#endif + #include + + #if defined(Q_OS_WIN) +-- +2.36.0 + diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 301b217c5fca..748acdd4cfed 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -1,24 +1,35 @@ { lib , stdenv , fetchgit -, qmake4Hook -, qt4 +, qmake +, wrapQtAppsHook +, qtbase , xorg }: stdenv.mkDerivation rec { pname = "qremotecontrol-server"; - version = "2.4.2"; + version = "unstable-2014-11-05"; # basically 2.4.2 + qt5 - # There is no 2.4.2 release tarball, but there is a git tag src = fetchgit { url = "https://git.code.sf.net/p/qrc/gitcode"; - rev = version; - sha256 = "sha256-i3X575SbrWV8kWWHAhXvKl5aSKFZm0VyrJOiL7eYrCo="; + rev = "8f1c55eac10ac8af974c3c20157d90ef57f7308a"; + sha256 = "sha256-AfFScec5/emG/f+yc5Zn37USIEWzGP/sBifE6Kx8d0E="; }; - nativeBuildInputs = [ qmake4Hook ]; - buildInputs = [ qt4 xorg.libXtst ]; + patches = [ + ./0001-fix-qt5-build-include-QDataStream.patch + ]; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + xorg.libXtst + ]; postPatch = '' substituteInPlace QRemoteControl-Server.pro \ @@ -29,8 +40,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; - homepage = "https://qremote.org/"; - downloadPage = "https://qremote.org/download.php#Download"; + homepage = "https://sourceforge.net/projects/qrc/"; description = "Remote control your desktop from your mobile"; longDescription = '' With QRemoteControl installed on your desktop you can easily control @@ -46,4 +56,3 @@ stdenv.mkDerivation rec { ''; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 325540d5baa7..e9b196f8890b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22962,7 +22962,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; - qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; + qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; From f6c3d27a13103e8a58e7a256e535bfad3c1508e2 Mon Sep 17 00:00:00 2001 From: kraem Date: Thu, 21 Jul 2022 20:35:52 +0200 Subject: [PATCH 084/104] facetimehd: unstable-2020-04-16 -> 0.5.18 --- pkgs/os-specific/linux/facetimehd/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 28abc20ea3f3..3bb656e8cb09 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "facetimehd-${version}-${kernel.version}"; - version = "unstable-2020-04-16"; + version = "0.5.18"; # Note: When updating this revision: # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { # still works. src = fetchFromGitHub { owner = "patjak"; - repo = "bcwc_pcie"; - rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; - sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx"; + repo = "facetimehd"; + rev = version; + sha256 = "sha256-UO8t2zrfdJlu4uzhhyWOuHIjJNVezIq3nUPGZeW/KJU="; }; preConfigure = '' @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ womfoo grahamc kraem ]; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = kernel.kernelAtLeast "5.18"; }; } From 51c9f4c338b3618fe5791465aa41d686270c59ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Jul 2022 08:16:19 +0000 Subject: [PATCH 085/104] jc: 1.20.2 -> 1.20.3 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index ebbca4763a88..5c030e4cdfc6 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.20.2"; + version = "1.20.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZhDk6JxgRASSezRkQ5KnRHKhQBykeZUpGCLW5zzLBSM="; + sha256 = "sha256-1HrXPqUeWtMkPD+wr5nKO9HLZQIqzCzs5j2pp/WNFGc="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; From 17e93b090e5c1470b2c45617c48f85b41df7e224 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 24 Jul 2022 10:27:48 +0200 Subject: [PATCH 086/104] services.murmur: add openFirewall option --- nixos/modules/services/networking/murmur.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 06ec04dbbf16..84b9936aa623 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -59,6 +59,14 @@ in description = "If enabled, start the Murmur Mumble server."; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the Murmur Mumble server. + ''; + }; + autobanAttempts = mkOption { type = types.int; default = 10; @@ -291,6 +299,11 @@ in gid = config.ids.gids.murmur; }; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + allowedUDPPorts = [ cfg.port ]; + }; + systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; From fadb0b83412e3a5c886160a67987527b1437fb0e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 24 Jul 2022 11:10:06 +0200 Subject: [PATCH 087/104] =?UTF-8?q?smplayer:=2022.2.0=20=E2=86=92=2022.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index eecb3a6b9749..9ed563a69038 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "22.2.0"; + version = "22.7.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8="; + hash = "sha256-vU+M5aCCGSA+IwJXTLMYvno/Qei+5Hwck3Q/Ah7N09s="; }; nativeBuildInputs = [ From 42542b2e49e12bfc604f3fbb04c4f5b1ee7863ef Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 24 Jul 2022 11:25:10 +0200 Subject: [PATCH 088/104] lldpd: 1.0.13 -> 1.0.14 --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 29ca9961546a..f4830ad408ac 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.13"; + version = "1.0.14"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-1jmCf9iidyDRv9lLxS7KJK9j3cw8nS2mB4h3iInYRwE="; + sha256 = "sha256-p0gZIU8Ral28QHo9SQyqAbpAGiSVF6yCajdAWcEtEug="; }; configureFlags = [ From 8e9bab032d8e6c4c84ea4c39a1e24c5fa7bd62d0 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sun, 24 Jul 2022 18:03:43 +0800 Subject: [PATCH 089/104] bitcoin-unlimited: 1.9.2.0 -> 1.10.0.0 --- .../blockchains/bitcoin-unlimited/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index fe7acb0bbe1d..d019c3f02d6d 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; - version = "1.9.2.0"; + version = "1.10.0.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "bitcoinunlimited"; - repo = "bitcoinunlimited"; + repo = "BCHUnlimited"; rev = "BCHunlimited${version}"; - sha256 = "sha256-qUf/GWZHpI57ATTlvRhjDtAjRa8a4uvUb0G9Xcf0j7w="; + sha256 = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] From c55fac773bf0c5885feab6616def3780d46d68aa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 17 Jul 2022 13:53:33 +0200 Subject: [PATCH 090/104] =?UTF-8?q?ocamlPackages.qcheck:=200.18=20?= =?UTF-8?q?=E2=86=92=200.19.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/qcheck/alcotest.nix | 2 +- pkgs/development/ocaml-modules/qcheck/core.nix | 6 ++---- pkgs/development/ocaml-modules/qcheck/default.nix | 2 +- pkgs/development/ocaml-modules/qcheck/ounit.nix | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/pkgs/development/ocaml-modules/qcheck/alcotest.nix index aebe6bd95a85..4f1baec1e556 100644 --- a/pkgs/development/ocaml-modules/qcheck/alcotest.nix +++ b/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-alcotest"; - inherit (qcheck-core) version useDune2 src; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core alcotest ]; diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index efa3f11967ec..6a2bba1acd2c 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,9 +2,7 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.18"; - - useDune2 = true; + version = "0.19.1"; minimalOCamlVersion = "4.08"; @@ -12,7 +10,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = "v${version}"; - sha256 = "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x"; + sha256 = "sha256-AZ1Ww6CWt3X1bXXcofMe14rTlMTC9hmohcKdZLUKEvE="; }; meta = { diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index dc73f42a13b0..2a0e6c0ae40c 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck"; - inherit (qcheck-ounit) version useDune2 src; + inherit (qcheck-ounit) version src; propagatedBuildInputs = [ qcheck-ounit ]; diff --git a/pkgs/development/ocaml-modules/qcheck/ounit.nix b/pkgs/development/ocaml-modules/qcheck/ounit.nix index 62b082f48fb2..06897987a954 100644 --- a/pkgs/development/ocaml-modules/qcheck/ounit.nix +++ b/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-ounit"; - inherit (qcheck-core) version useDune2 src; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core ounit ]; From 997c1258bc25589fe4c87b6099bbd3fbf62fc8cf Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sun, 24 Jul 2022 18:34:33 +0800 Subject: [PATCH 091/104] miniscript: unstable-2020-12-01 -> unstable-2022-07-19 --- pkgs/applications/blockchains/miniscript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index 0520101c4cc7..5d8e887209a4 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "miniscript"; - version = "unstable-2020-12-01"; + version = "unstable-2022-07-19"; src = fetchFromGitHub { owner = "sipa"; repo = pname; - rev = "02682a398a35b410571b10cde7f39837141ddad6"; - sha256 = "079jz4g88cfzfm9a6ykby9haxwcs033c1288mgr8cl2hw4qd2sjl"; + rev = "ca675488c4aa9605f6ae70c0e68a148a6fb277b4"; + sha256 = "sha256-kzLIJ0os6UnC0RPEybfw6wGrZpgmRCgj3zifmZjieoU="; }; installPhase = '' From 8d14baf37d73b31e32b89e5286f8d8542484a4ad Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 24 Jul 2022 18:49:15 +0800 Subject: [PATCH 092/104] boringtun: 0.5.1 -> 0.5.2 --- pkgs/tools/networking/boringtun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 4e20b2f46387..8d3f17268bc1 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "boringtun"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "boringtun-cli-${version}"; - sha256 = "sha256-s7Nl95VShBMD4Zid2LeRPftSx5R2G+4tHBXgrC1I7vU="; + sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04="; }; - cargoSha256 = "sha256-308zydrhOZS5h16DEp9ctrhtB2bv9Tmwutgj5+uc4Lw="; + cargoSha256 = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; From 2484f57981183660cda0202bfd0531fa233020d4 Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Sat, 23 Jul 2022 21:37:49 +0200 Subject: [PATCH 093/104] qc71_laptop: init at unstable-2022-06-01 --- .../os-specific/linux/qc71_laptop/default.nix | 34 +++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/os-specific/linux/qc71_laptop/default.nix diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix new file mode 100644 index 000000000000..92818ccfb096 --- /dev/null +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "qc71_laptop"; + version = "unstable-2022-06-01"; + + src = fetchFromGitHub { + owner = "pobrn"; + repo = "qc71_laptop"; + rev = "28106e0602807d78d1f5fa220ab6148dd6477c1c"; + hash = "sha256-3bhw2HbEVuxPfGMt/eE2nCuMLHzYHRY3nRWPzZxKHro="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "VERSION=${version}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + runHook preInstall + install -D qc71_laptop.ko -t $out/lib/modules/${kernel.modDirVersion}/extra + runHook postInstall + ''; + + meta = with lib; { + description = "Linux driver for QC71 laptop"; + homepage = "https://github.com/pobrn/qc71_laptop/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ aacebedo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fc8ebc60823f..fe258c7f49ac 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -497,6 +497,8 @@ in { can-isotp = callPackage ../os-specific/linux/can-isotp { }; + qc71_laptop = callPackage ../os-specific/linux/qc71_laptop { }; + } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; }); From b1d98133c0974f939922cc68726fec8d087ab439 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sat, 23 Jul 2022 14:16:22 +0200 Subject: [PATCH 094/104] benthos: init at 4.3.0 Signed-off-by: Mark Sagi-Kazar --- pkgs/development/tools/benthos/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/benthos/default.nix diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix new file mode 100644 index 000000000000..8884a8ae8977 --- /dev/null +++ b/pkgs/development/tools/benthos/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "benthos"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "benthosdev"; + repo = "benthos"; + rev = "v${version}"; + sha256 = "sha256-tRB9eTeyEyPkiR/sph76CMbPjJUNoDzfYuHmtFAzY7E="; + }; + + vendorSha256 = "sha256-nnaBQ7ADdAdo/+RQzXJHBBpXgTmxny0O/ij+eWsS5YM="; + + doCheck = false; + + subPackages = [ + "cmd/benthos" + ]; + + ldflags = [ "-s" "-w" "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" ]; + + meta = with lib; { + description = "Fancy stream processing made operationally mundane"; + homepage = "https://www.benthos.dev"; + license = licenses.mit; + maintainers = with maintainers; [ sagikazarmark ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f08816c0ba8..9e338421e207 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -276,6 +276,8 @@ with pkgs; bakelite = callPackage ../tools/backup/bakelite { }; + benthos = callPackage ../development/tools/benthos {}; + beyond-identity = callPackage ../tools/security/beyond-identity {}; bingo = callPackage ../development/tools/bingo {}; From 370228834d94bc6cbb61a527bb58a93acd298182 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 24 Jul 2022 15:18:28 +0200 Subject: [PATCH 095/104] qownnotes: 22.7.1 -> 22.7.6 --- 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 7c6159bf741b..1bc67bbec3a6 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.7.1"; + version = "22.7.6"; 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 = "9431a3315a533799525217e5ba03757b3c39e8259bf307c81330304f043b8b77"; + sha256 = "d2f0b6f62714495dd14387535ab34c0cf94d1679c5db4a257ef87bb855b7771b"; }; nativeBuildInputs = [ qmake qttools ]; From 764a14817a44b29fd2bf91c65e35e0fc6967dc18 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 24 Jul 2022 15:22:18 +0200 Subject: [PATCH 096/104] qownnotes: Remove dtzWill as maintainer --- pkgs/applications/office/qownnotes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 1bc67bbec3a6..e729c486a9f5 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { longDescription = "QOwnNotes is a plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration."; homepage = "https://www.qownnotes.org/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ dtzWill totoroot ]; + maintainers = with maintainers; [ totoroot ]; platforms = platforms.linux; }; } From df10a2d05568a75f36709995f06f90d86204015c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Jul 2022 14:08:11 +0000 Subject: [PATCH 097/104] python310Packages.fakeredis: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 02f0d4927951..49f2eaed0c60 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.8.1"; + version = "1.8.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-gmQuQIlpE4PdgZ1J5aucSQkJpfrh1qTJNLfyI+cMCJU="; + hash = "sha256-T8A6vU1m7nlHpTMC62IpgsQGh3ksuBp1ty4GkjN+2T8="; }; nativeBuildInputs = [ From 20e9eb6606928bdf73bf88c468723d7ce2210e9e Mon Sep 17 00:00:00 2001 From: Austin Platt Date: Sun, 24 Jul 2022 11:56:53 +0100 Subject: [PATCH 098/104] maintainers: add onthestairs --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 11891e5b8f37..0cd85c5f6c31 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9605,6 +9605,12 @@ githubId = 757752; name = "Jonas Heinrich"; }; + onthestairs = { + email = "austinplatt@gmail.com"; + github = "onthestairs"; + githubId = 915970; + name = "Austin Platt"; + }; ony = { name = "Mykola Orliuk"; email = "virkony@gmail.com"; From 6795d5c3e81fef18bbf4f4b11de32f7eec139fb2 Mon Sep 17 00:00:00 2001 From: Austin Platt Date: Sun, 24 Jul 2022 11:57:20 +0100 Subject: [PATCH 099/104] cw: init at 4.1.1 --- pkgs/tools/admin/cw/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/admin/cw/default.nix diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/tools/admin/cw/default.nix new file mode 100644 index 000000000000..413fad40dcc3 --- /dev/null +++ b/pkgs/tools/admin/cw/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib, stdenv }: + +buildGoModule rec { + pname = "cw"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "lucagrulla"; + repo = "cw"; + rev = "v${version}"; + sha256 = "sha256-JsWwvVEr7kSjUy0S6wVcn24Xyo4OHr5/uqmnjw6v+RI="; + }; + + vendorSha256 = "sha256-8L4q0IAvmNk5GCAC5agNfWFtokIkddO1Dec4m6/sWfg="; + + meta = with lib; { + description = "The best way to tail AWS CloudWatch Logs from your terminal"; + homepage = "https://github.com/lucagrulla/cw"; + license = licenses.asl20; + maintainers = with maintainers; [ onthestairs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c48078a0a5db..5895964435c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2093,6 +2093,8 @@ with pkgs; crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; }; + cw = callPackage ../tools/admin/cw { }; + ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; From 1e079ca5ce554a8d54e5ef714f4d06870c47f627 Mon Sep 17 00:00:00 2001 From: Jian Lin <75130626+jian-lin@users.noreply.github.com> Date: Sun, 24 Jul 2022 23:40:27 +0800 Subject: [PATCH 100/104] kanata: init at 1.0.5 (#182358) Co-authored-by: Azat Bahawi Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 10 ++++++++ pkgs/tools/system/kanata/default.nix | 35 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/tools/system/kanata/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0cd85c5f6c31..aa0fb9d1e22d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7437,6 +7437,16 @@ githubId = 667272; name = "Lincoln Lee"; }; + linj = { + name = "Lin Jian"; + email = "me@linj.tech"; + matrix = "@me:linj.tech"; + github = "jian-lin"; + githubId = 75130626; + keys = [{ + fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; + }]; + }; linquize = { email = "linquize@yahoo.com.hk"; github = "linquize"; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix new file mode 100644 index 000000000000..e3a377163e3e --- /dev/null +++ b/pkgs/tools/system/kanata/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub +, lib +, libevdev +, pkg-config +, rustPlatform +, withCmd ? false +}: + +rustPlatform.buildRustPackage rec { + pname = "kanata"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "jtroo"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-sL9hP+222i8y0sK3ZEx66yXBTgZp5ewoPUlZS4XnphY="; + }; + + cargoHash = "sha256-uhN1UdwtU0C0/lpxUYoCcMLABFTPNO5wKsIGOBnFpzw="; + + buildFeatures = lib.optional withCmd "cmd"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libevdev ]; + + meta = with lib; { + description = "A cross-platform advanced keyboard customization tool"; + homepage = "https://github.com/jtroo/kanata"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ linj ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea1f578f461c..7386cc47be3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1227,6 +1227,8 @@ with pkgs; httm = callPackage ../tools/filesystems/httm { }; + kanata = callPackage ../tools/system/kanata { }; + ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; kubevirt = callPackage ../tools/virtualization/kubevirt { }; From 83322150b0f91f9a555d4b91a912a4854355b16f Mon Sep 17 00:00:00 2001 From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com> Date: Sun, 24 Jul 2022 01:07:27 -0500 Subject: [PATCH 101/104] maintainers: add ProducerMatt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aa0fb9d1e22d..a51210390853 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10341,6 +10341,12 @@ } ]; }; + ProducerMatt = { + name = "Matthew Pherigo"; + email = "ProducerMatt42@gmail.com"; + github = "ProducerMatt"; + githubId = 58014742; + }; Profpatsch = { email = "mail@profpatsch.de"; github = "Profpatsch"; From bf182e4decd7214ea735f06ad86d60f465d75b8c Mon Sep 17 00:00:00 2001 From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com> Date: Sun, 24 Jul 2022 01:07:08 -0500 Subject: [PATCH 102/104] tere: init at 1.1.0 A failing test was keeping it from building. I [confirmed with the dev](https://github.com/mgunyho/tere/issues/44) it's known and ignored so I commented it out with a patch. This app isn't that useful until some [shell hooks have been added.](https://github.com/mgunyho/tere#setup) So I hope to add a config option to home-manager such as: ```nix programs.tere = { enabled = true; useBashIntegration = true; useFishIntegration = true; }; ``` --- pkgs/tools/misc/tere/brokentest.patch | 19 +++++++++++++++++++ pkgs/tools/misc/tere/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/tools/misc/tere/brokentest.patch create mode 100644 pkgs/tools/misc/tere/default.nix diff --git a/pkgs/tools/misc/tere/brokentest.patch b/pkgs/tools/misc/tere/brokentest.patch new file mode 100644 index 000000000000..f5b9eb741ea0 --- /dev/null +++ b/pkgs/tools/misc/tere/brokentest.patch @@ -0,0 +1,19 @@ +diff --git a/src/app_state.rs b/src/app_state.rs +index e44acb6..713642a 100644 +--- a/src/app_state.rs ++++ b/src/app_state.rs +@@ -1272,7 +1272,7 @@ mod tests { + assert_eq!(s.cursor_pos, 1); + assert_eq!(s.scroll_pos, 2); + } +- ++ /* + #[test] + fn test_advance_search_with_filter_search_and_scrolling2() { + let mut s = create_test_state_with_buf( +@@ -1302,4 +1302,5 @@ mod tests { + assert_eq!(s.cursor_pos, 1); + assert_eq!(s.scroll_pos, 0); + } ++ */ + } diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix new file mode 100644 index 000000000000..e1dac5a6bf2a --- /dev/null +++ b/pkgs/tools/misc/tere/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "tere"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "mgunyho"; + repo = "tere"; + rev = "v${version}"; + sha256 = "BD7onBkFyo/JAw/neqL9N9nBYSxoMrmaG6egeznV9Xs="; + }; + + cargoSha256 = "gAq9ULQ2YFPmn4IsHaYrC0L7NqbPUWqXSb45ZjlMXEs="; + + # This test confirmed not working. + # https://github.com/mgunyho/tere/issues/44 + cargoPatches = [ ./brokentest.patch ]; + + meta = with lib; { + description = "A faster alternative to cd + ls"; + homepage = "https://github.com/mgunyho/tere"; + license = licenses.eupl12; + maintainers = with maintainers; [ ProducerMatt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df78a2be376e..4b46e3945855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1275,6 +1275,8 @@ with pkgs; tauon = callPackage ../applications/audio/tauon { }; + tere = callPackage ../tools/misc/tere { }; + termusic = callPackage ../applications/audio/termusic { }; tfk8s = callPackage ../tools/misc/tfk8s { }; From b29670fbf8f31633204fa7dc865601686db3b5a6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 23 Jul 2022 08:01:23 +1000 Subject: [PATCH 103/104] ffmpeg_5: 5.0.1 -> 5.1 https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/90810bb37cf7076074acf5a9c5a24feaaaf87bc9:/Changelog#l9 --- pkgs/development/libraries/ffmpeg/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index b5dff5a282e2..faec9f125d25 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "5.0.1"; + version = "5.1"; branch = version; - sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; + sha256 = "sha256-MrVvsBzpDUUpWK4l6RyVZKv0ntVFPBJ77CPGPlMKqPo="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) From 3510c633c8d3e0560056e3be6cf3d0cde48c6fc8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 24 Jul 2022 21:09:16 +1000 Subject: [PATCH 104/104] ffmpeg_5-full: fix build --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 0270855ae53d..bea4692396ae 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -258,6 +258,10 @@ stdenv.mkDerivation rec { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + '' + + # ffmpeg 5.1 https://trac.ffmpeg.org/ticket/9841 + '' + substituteInPlace tests/Makefile --replace 'include $(SRC_PATH)/tests/fate/imf.mak' "" ''; configurePlatforms = [];