From 3e231f033c5bd36ea23abaa7879c2d4a739995a4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 4 Dec 2021 11:04:09 +0100 Subject: [PATCH 01/19] elfio: init at 3.9 --- pkgs/development/libraries/elfio/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/elfio/default.nix diff --git a/pkgs/development/libraries/elfio/default.nix b/pkgs/development/libraries/elfio/default.nix new file mode 100644 index 000000000000..98e9ee3f59ed --- /dev/null +++ b/pkgs/development/libraries/elfio/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +}: + +stdenv.mkDerivation rec { + pname = "elfio"; + version = "3.9"; + + src = fetchFromGitHub { + owner = "serge1"; + repo = "elfio"; + rev = "Release_${version}"; + sha256 = "sha256-5O9KnHZXzepp3O1PGenJarrHElWLHgyBvvDig1Hkmo4="; + }; + + nativeBuildInputs = [ cmake ]; + + checkInputs = [ boost ]; + + cmakeFlags = [ "-DELFIO_BUILD_TESTS=ON" ]; + + doCheck = true; + + meta = with lib; { + description = "Header-only C++ library for reading and generating files in the ELF binary format"; + homepage = "https://github.com/serge1/ELFIO"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a226e7cc346..dd37102e157d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16093,6 +16093,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + elfio = callPackage ../development/libraries/elfio { }; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; From 86d00441b0e59e9d915b4ffd675e2a68642aa3da Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 4 Dec 2021 11:14:03 +0100 Subject: [PATCH 02/19] termcolor: init at 2.0.0 --- .../libraries/termcolor/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/termcolor/default.nix diff --git a/pkgs/development/libraries/termcolor/default.nix b/pkgs/development/libraries/termcolor/default.nix new file mode 100644 index 000000000000..3d9458341211 --- /dev/null +++ b/pkgs/development/libraries/termcolor/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "termcolor"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "ikalnytskyi"; + repo = "termcolor"; + rev = "v${version}"; + sha256 = "sha256-W0hB+lFJ2sm7DsbOzITOtjJuntSM55BfwUunOOS4RcA="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DTERMCOLOR_TESTS=ON" ]; + + doCheck = true; + + checkPhase = '' + runHook preCheck + ./test_termcolor + runHook postCheck + ''; + + meta = with lib; { + description = "Header-only C++ library for printing colored messages"; + homepage = "https://github.com/ikalnytskyi/termcolor"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd37102e157d..0653b93b25d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9984,6 +9984,8 @@ with pkgs; telescope = callPackage ../applications/networking/browsers/telescope { }; + termcolor = callPackage ../development/libraries/termcolor { }; + termscp = callPackage ../tools/networking/termscp { inherit (darwin.apple_sdk.frameworks) Foundation Security; }; From c549f68b7dcfb44bd386954df779c3ffb4397408 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 4 Dec 2021 11:11:21 +0100 Subject: [PATCH 03/19] libtree: init at 2.0.0 --- .../tools/misc/libtree/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/tools/misc/libtree/default.nix diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/development/tools/misc/libtree/default.nix new file mode 100644 index 000000000000..f852b7ea7adf --- /dev/null +++ b/pkgs/development/tools/misc/libtree/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, binutils +, chrpath +, cmake +, cxxopts +, elfio +, termcolor +, gtest +}: + +stdenv.mkDerivation rec { + pname = "libtree"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "haampie"; + repo = "libtree"; + rev = "v${version}"; + sha256 = "sha256-j54fUwMkX4x4MwL8gMraguK9GqQRBjCC+W6ojFnQdHQ="; + }; + + patches = [ + # add missing include + # https://github.com/haampie/libtree/pull/42 + (fetchpatch { + url = "https://github.com/haampie/libtree/commit/219643ff6edcae42c9546b8ba38cfec9d19b034e.patch"; + sha256 = "sha256-vdFmmBdBiOT3QBcwd3SuiolcaFTFAb88kU1KN8229K0="; + }) + ]; + + postPatch = '' + substituteInPlace src/main.cpp \ + --replace "std::string strip = \"strip\";" "std::string strip = \"${binutils}/bin/strip\";" \ + --replace "std::string chrpath = \"chrpath\";" "std::string chrpath = \"${chrpath}/bin/chrpath\";" + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ cxxopts elfio termcolor ]; + + doCheck = true; + + checkInputs = [ gtest ]; + + cmakeFlags = [ "-DLIBTREE_BUILD_TESTS=ON" ]; + + meta = with lib; { + description = "Tree ldd with an option to bundle dependencies into a single folder"; + homepage = "https://github.com/haampie/libtree"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ prusnak rardiol ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0653b93b25d8..c95890bc6334 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7312,6 +7312,8 @@ with pkgs; libtins = callPackage ../development/libraries/libtins { }; + libtree = callPackage ../development/tools/misc/libtree { }; + libshout = callPackage ../development/libraries/libshout { }; libqb = callPackage ../development/libraries/libqb { }; From bfedf022ca554e9f577d04a3d8eaf157d1d7806e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 10:19:29 +0000 Subject: [PATCH 04/19] libcyaml: 1.2.1 -> 1.3.0 --- pkgs/development/libraries/libcyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index 26ac159646f1..517fe4fcfc1a 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "sha256-u5yLrAXaavALNArj6yw+v5Yn4eqXWTHmUxHe+pVCbXM="; + sha256 = "sha256-8Dd6LQovPx+y2957zY8blA0ls10ekGvTCeKmLyHZnOI="; }; buildInputs = [ libyaml ]; From 4a520797b917c7391317af1c95fc538f6e706264 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 11:41:37 +0000 Subject: [PATCH 05/19] libtorrent-rasterbar: 2.0.4 -> 2.0.5 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index c822d9dd12f6..5d718fb859ec 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.4"; + version = "2.0.5"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-D+Euv71pquqyKGPvk76IwYKvVj+/oNtJfiLleiafthQ="; + sha256 = "sha256-wTyeGTxihnjTGBsVa0Yq2M/cxhWhZ9KLHVy10ya2gc4="; fetchSubmodules = true; }; From da866f83d3e00098f533f9ee0a9bb2c8e423333d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 13:09:36 +0000 Subject: [PATCH 06/19] matterircd: 0.24.2 -> 0.25.0 --- pkgs/servers/mattermost/matterircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index fa10d140e4b6..07c0b30d737a 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "sha256-SatnrRKYCngBZJwRNMad9Vt2xd7FktH79t3TB83cwhg="; + sha256 = "sha256-AuY6tAZ1WlUkiKcbDcXBDh2OdKwWllx2xJxPCbqQguM="; }; goPackagePath = "github.com/42wim/matterircd"; From 1f41365cdacf9d101e4b2a54b7f74ad637ce3f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 7 Dec 2021 12:44:08 +0100 Subject: [PATCH 07/19] nixos/switch-to-configuration: Restart systemd when system.conf is changed --- nixos/modules/system/activation/switch-to-configuration.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 9bf7a5c0d427..d3e9a97c2120 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -351,8 +351,14 @@ foreach my $device (keys %$prevSwaps) { # Should we have systemd re-exec itself? my $prevSystemd = abs_path("/proc/1/exe") // "/unknown"; +my $prevSystemdSystemConfig = abs_path("/etc/systemd/system.conf") // "/unknown"; my $newSystemd = abs_path("@systemd@/lib/systemd/systemd") or die; +my $newSystemdSystemConfig = abs_path("$out/etc/systemd/system.conf") // "/unknown"; + my $restartSystemd = $prevSystemd ne $newSystemd; +if ($prevSystemdSystemConfig ne $newSystemdSystemConfig) { + $restartSystemd = 1; +} sub filterUnits { From d5d755562ec31cca4b1ad190a033db4fd5c37ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Dec 2021 10:07:24 -0800 Subject: [PATCH 08/19] python3Packages.ocrmypdf: 13.0.0 -> 13.1.0 https://github.com/jbarlow83/OCRmyPDF/blob/v13.1.0/docs/release_notes.rst --- pkgs/development/python-modules/ocrmypdf/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 368f872bca31..1fd1b8d696d1 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, cffi , coloredlogs , fetchFromGitHub , ghostscript @@ -17,7 +16,6 @@ , pytestCheckHook , pythonOlder , reportlab -, setuptools , setuptools-scm , setuptools-scm-git-archive , stdenv @@ -29,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.0.0"; + version = "13.1.0"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -41,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-W5RFCWKDIRrsgHZL8uSOQWvEltLbqYAweZkgIZZrSIo="; + sha256 = "sha256-K8amHifxaR/tRiQODWVZcOd5nL5zzjd8C7h5whl/HoQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -63,7 +61,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - cffi coloredlogs img2pdf pdfminer @@ -71,7 +68,6 @@ buildPythonPackage rec { pillow pluggy reportlab - setuptools tqdm ] ++ (lib.optionals (pythonOlder "3.8") [ importlib-metadata From 9630fb4ef3da72a71a1b32941ba385c81870baf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 23:03:15 +0000 Subject: [PATCH 09/19] ostree: 2021.4 -> 2021.6 --- pkgs/tools/misc/ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 82851e8aad97..b5b23ee6a2ad 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2021.4"; + version = "2021.6"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-21zgGhYGrzRm7HcjZwD1OmPOIOSYSlSdDquj9mo9k2E="; + sha256 = "sha256-6AYxyxNj1HNP6dDJH2mmi+OEgWbW4EgdsZzkSpy09TE="; }; patches = [ From 2a455ce212e64e1bc3620b12ab75b8f74ed4826f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 8 Dec 2021 00:09:04 -0300 Subject: [PATCH 10/19] sm64ex: unstable-2020-10-09 -> unstable-2021-11-30 --- pkgs/games/sm64ex/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index 9bf6b513843d..c6df2099d3ce 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "sm64ex"; - version = "unstable-2020-10-09"; + version = "unstable-2021-11-30"; src = fetchFromGitHub { owner = "sm64pc"; repo = "sm64ex"; - rev = "57c203465b2b3eee03dcb796ed1fad07d8283a2c"; - sha256 = "0k6a3r9f4spa7y2v1lyqs9lwa05lw8xgywllb7w828nal8y33cs6"; + rev = "db9a6345baa5acb41f9d77c480510442cab26025"; + sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; }; nativeBuildInputs = [ python3 pkg-config ]; @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex ''; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://github.com/sm64pc/sm64ex"; description = "Super Mario 64 port based off of decompilation"; From 05d89586446f54d5e1493beb2b5dbb301af796b3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 8 Dec 2021 04:20:00 +0000 Subject: [PATCH 11/19] libcyaml: enable on darwin --- pkgs/development/libraries/libcyaml/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index 517fe4fcfc1a..4b8d85b5b55b 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/tlsa/libcyaml"; description = "C library for reading and writing YAML"; + changelog = "https://github.com/tlsa/libcyaml/raw/v${version}/CHANGES.md"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 5907a6bba30f02944b7e8d19dd43b5a06240594d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 12:12:27 +0000 Subject: [PATCH 12/19] pngquant: 2.16.0 -> 2.17.0 --- pkgs/tools/graphics/pngquant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index dd145d48fc1b..267f2ae217c1 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pngquant"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "kornelski"; repo = "pngquant"; rev = version; - sha256 = "0ny6h3fwf6gvzkqkc3zb5mrkqxm6s7xzb6bvzn6vlamklncqgl78"; + sha256 = "sha256-D2KNn6AJ4eIHeb/2Oo1Wf0djMCXTtVGrua0D6z7+9V4="; fetchSubmodules = true; }; From 2c0cfa60e6850e9c050fe74cf731f7b05bf493a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 13:13:04 +0000 Subject: [PATCH 13/19] cinnamon.pix: 2.6.5 -> 2.8.0 --- pkgs/desktops/cinnamon/pix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index c97824db1a72..4a30d434c04a 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "2.6.5"; + version = "2.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "qBF5lc7ZNwuTr6x4c4pJA6a7oXqOYsYA1lpTmQkylT0="; + sha256 = "sha256-m508pkbiSVuIaEx7EznOd5QTkpM66TBbpM5HRkjKRQA="; }; nativeBuildInputs = [ From 62ec13c277ebab8a4dcb2280bb779967c7d8cb7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 17:00:13 +0000 Subject: [PATCH 14/19] python38Packages.casbin: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 8b8329ab7d70..ed78e73db71f 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "sha256-kUM4Oc4T3PSFAprUx6eY/aJpDM8RiHjPtAxMKjfHj6s="; + sha256 = "1qraxp0nij5412pvz9lvysb38px551arl29q06pd0z6rg1d8gdkx"; }; propagatedBuildInputs = [ From 8821c9a315d965b866f5f6bab4f82e021360317b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 20:09:30 +0000 Subject: [PATCH 15/19] python38Packages.django-sites: 0.10 -> 0.11 --- pkgs/development/python-modules/django-sites/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 468f7e738038..126e309ec0c4 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-sites"; - version = "0.10"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3"; + sha256 = "1cbee714fdf2bfbe92e4f5055de4e6c41b64ebb32e1f96b1016c0748210928b8"; }; # LICENSE file appears to be missing from pypi package, but expected by the installer # https://github.com/niwinz/django-sites/issues/11 From d3a9827a8174ad190d4a562bc97c9dd64c65c46f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 20:43:34 +0000 Subject: [PATCH 16/19] numix-icon-theme-circle: 21.04.14 -> 21.11.29 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 7fe16f016cc9..d7a7a0c8614c 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "21.04.14"; + version = "21.11.29"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "1z8c0179r8g0y9zh4383brsfhkcyfy79dc8hw94p9zjn5a66547w"; + sha256 = "sha256-0hGxgmNNYvNT1QQpA7SdOdN1VM8Iix+kZZFcO2R1V/Y="; }; nativeBuildInputs = [ gtk3 ]; From 75b60b30dbcb3428dd8211c4b02b86a8df2449bb Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Wed, 8 Dec 2021 16:44:58 -0500 Subject: [PATCH 17/19] nemo: add gvfs dependency to display Trash The Trash and network locations do not work otherwise. Note that `gvfsd` needs to run in order to interact with the trash (`trash:///`). --- pkgs/desktops/cinnamon/nemo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 8baadab496e2..9a0e054fd81e 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -11,6 +11,7 @@ , libxml2 , gtk3 , libnotify +, gvfs , cinnamon-desktop , xapps , libexif @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { xapps libexif exempi + gvfs gobject-introspection libgsf ]; @@ -73,3 +75,4 @@ stdenv.mkDerivation rec { maintainers = teams.cinnamon.members; }; } + From c86e33f3fb3537f5d5e6e896cbf2e62c2fda6c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 16:15:08 +0000 Subject: [PATCH 18/19] parallel: 20210722 -> 20211122 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 519d928c6952..94a921bc1360 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20210722"; + version = "20211122"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "0jaa5137sjw2szvmnnslkqv1n3gg2rkkgr71j7hpp5a3q15hjf9j"; + sha256 = "sha256-SLJWMixWpMsaeBj+CJT93lddqw4PklxqIolRe2vYli4="; }; outputs = [ "out" "man" "doc" ]; From 13b5f9319a10719118d21b96717122d020de0390 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Wed, 8 Dec 2021 23:16:26 +0100 Subject: [PATCH 19/19] amfora: 1.8.0 -> 1.9.0 --- pkgs/applications/networking/browsers/amfora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index 04871239eda4..109f7ef1a708 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "sha256-q83fKs27vkrUs3+AoKZ2342llj6u3bvbLsdnT9DnVUs="; + sha256 = "sha256-Vj5aFSpyC7X9e9A9r4FAI6a0U8dx8uj7bpAFrQjLSzo="; }; - vendorSha256 = "sha256-0blHwZwOcgC4LcmZSJPRvyQzArCsaMGgIw+cesO+qOo="; + vendorSha256 = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0="; postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop