From 82dc6d6354ca74c1a926ce63e0db23fb33be0d8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 11:11:31 +0000 Subject: [PATCH 01/21] 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 02/21] 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 03/21] 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 04/21] 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 05/21] 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 06/21] 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 07/21] 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 51be699b02483deb1340f43743f5fed9b92c667a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Jul 2022 08:03:01 +0000 Subject: [PATCH 08/21] 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 09/21] 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 10/21] 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 11/21] 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 12/21] 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 13/21] 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 14/21] 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 3e10c3cfa7a5c77947e656c5b0bcec5971a833c2 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 20 Jul 2022 01:37:29 +0300 Subject: [PATCH 15/21] 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 54b1758da4100eb58f3fd0db155d2ac2eafae263 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 16/21] 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 17/21] 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 18/21] 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 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 19/21] 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 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 20/21] 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 21/21] 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 = [];