From 3d5d225ba19fb22a89407b370e2d81b46643f6f6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 17 Nov 2021 22:02:58 +0100 Subject: [PATCH 01/25] crd2pulumi: init at 1.0.10 --- pkgs/development/tools/crd2pulumi/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/crd2pulumi/default.nix diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix new file mode 100644 index 000000000000..574228fa4cf0 --- /dev/null +++ b/pkgs/development/tools/crd2pulumi/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "crd2pulumi"; + version = "1.0.10"; + + src = fetchFromGitHub { + owner = "pulumi"; + repo = "crd2pulumi"; + rev = "v${version}"; + sha256 = "1xzr63brzqysvhm3fqj246c7s84kchpcm6wad3mvxcxjcab6xd1f"; + }; + + vendorSha256 = "0xi5va2fy4nrxp3qgyzcw20a2089sbz8h1hvqx2ryxijr61wd93d"; + + ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ]; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Generate typed CustomResources from a Kubernetes CustomResourceDefinition"; + homepage = "https://github.com/pulumi/crd2pulumi"; + license = licenses.asl20; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c6b850e8f57..17d289c9be22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4283,6 +4283,8 @@ with pkgs; crackxls = callPackage ../tools/security/crackxls { }; + crd2pulumi = callPackage ../development/tools/crd2pulumi { }; + create-cycle-app = nodePackages.create-cycle-app; createrepo_c = callPackage ../tools/package-management/createrepo_c { }; From 9d21602e75d7383cf2ee01fa657f423f205c7805 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:18:37 -0800 Subject: [PATCH 02/25] aws-c-common: 0.6.14 -> 0.6.17 --- pkgs/development/libraries/aws-c-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index c927ca53336a..e7a09a19ece5 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.14"; + version = "0.6.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk="; + sha256 = "sha256-+FzTEpotxco4+9gLVUL+rkCWoMjRCorKQ47JINHsnNA="; }; nativeBuildInputs = [ cmake ]; From ea80624cdc9e5d1718f4d53ade4abdb6aa7d2367 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:18:49 -0800 Subject: [PATCH 03/25] aws-c-http: 0.6.8 -> 0.6.10 --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index a57747260513..a25231ee8831 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.8"; + version = "0.6.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-JqFvKoWW/2UV0jcR50QlD+LEPwQ4qwPoaPpioAuwf90="; + sha256 = "sha256-R+teEKSQjSFYt3+XXvooAy4GJwN4yzEhJtiuknBZIgU="; }; nativeBuildInputs = [ From 2eb081deb2327d44c78d0ed5cc3c32b5010f0297 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:19:04 -0800 Subject: [PATCH 04/25] aws-crt-cpp: 0.17.0 -> 0.17.8 --- pkgs/development/libraries/aws-crt-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 68414931e413..5d4a44ccf159 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.0"; + version = "0.17.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52"; + sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo="; }; postPatch = '' From 592924102351bcc3133e7a244722ebd3a6e88562 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:31:45 -0800 Subject: [PATCH 05/25] s2n-tls: 1.0.17 -> 1.3.0 --- pkgs/development/libraries/s2n-tls/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 1ce6f2672104..35a37fbddb86 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,29 +1,20 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , openssl }: stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.0.17"; + version = "1.3.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4="; + sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU="; }; - patches = [ - # Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067) - (fetchpatch { - url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch"; - sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv"; - }) - ]; - nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev"]; From ec720845982d64209866288c55a749a56a150681 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:27:04 -0800 Subject: [PATCH 06/25] aws-c-auth: 0.6.5 -> 0.6.8 --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 7de352328100..ad1f3483cff0 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.5"; + version = "0.6.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-d3UdZucicp+Z0EjWNE5Xa/EMIGPk6GtQc7f0H8RBHA8="; + sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw="; }; nativeBuildInputs = [ From 181ee83bff05cf9ae056e703ca87c018f27713d7 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:27:14 -0800 Subject: [PATCH 07/25] aws-c-mqtt: 0.7.8 -> 0.7.9 --- pkgs/development/libraries/aws-c-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index 39a75c511622..f75b744c3a91 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"; + sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc="; }; nativeBuildInputs = [ From f09fff1e1f0d6a671f713006367474314dc5649f Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:29:31 -0800 Subject: [PATCH 08/25] aws-c-cal: 0.5.11 -> 0.5.12 --- pkgs/development/libraries/aws-c-cal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index d0bcfc901084..87d66e15355d 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc="; + sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc="; }; nativeBuildInputs = [ cmake ]; From 184f85323948abbcfa5e079bb3684a7ab7bf315d Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 16:30:30 -0800 Subject: [PATCH 09/25] aws-c-io: 0.10.12 -> 0.10.13 --- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 1ff28dccc9ef..2cfba1bd2046 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.12"; + version = "0.10.13"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8v38NN9qrgdrshMx3l2wLrl7l77HjsW2GPu8IwkclJQ="; + sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY="; }; nativeBuildInputs = [ cmake ]; From 33c8bc71868a04e0ce91ab5f7bbba85f8fef9bae Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Sat, 27 Nov 2021 11:02:44 -0300 Subject: [PATCH 10/25] polylith: 0.2.12-alpha -> 0.2.13-alpha --- pkgs/development/tools/misc/polylith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix index 4397fd11a27b..a8330895e7c1 100644 --- a/pkgs/development/tools/misc/polylith/default.nix +++ b/pkgs/development/tools/misc/polylith/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.2.12-alpha"; + version = "0.2.13-alpha"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "1zsasyrrssj7kmvgfr63fa5hslw9gnlbp9bh05g72bfgzi99n8kg"; + sha256 = "sha256-iLN92qurc8+D0pt7Hwag+TFGoeFl9DvEeS67sKmmoSI="; }; dontUnpack = true; From b930e3fe52657cb58ebbf4fcb91030151fbd4f14 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Mon, 1 Nov 2021 18:43:52 -0700 Subject: [PATCH 11/25] btrfs-snap: init at 1.7.3 --- pkgs/tools/filesystems/btrfs-snap/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/filesystems/btrfs-snap/default.nix diff --git a/pkgs/tools/filesystems/btrfs-snap/default.nix b/pkgs/tools/filesystems/btrfs-snap/default.nix new file mode 100644 index 000000000000..e43380e6792e --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-snap/default.nix @@ -0,0 +1,32 @@ +{ bash, btrfs-progs, coreutils, fetchFromGitHub, gnugrep, lib, makeWrapper, stdenvNoCC, util-linuxMinimal }: +stdenvNoCC.mkDerivation rec { + pname = "btrfs-snap"; + version = "1.7.3"; + src = fetchFromGitHub { + owner = "jf647"; + repo = pname; + rev = version; + sha256 = "sha256-SDzLjgNRuR9XpmcYCD9T10MLS+//+pWFGDiTAb8NiLQ="; + }; + buildInputs = [ bash ]; + nativeBuildInputs = [ makeWrapper ]; + dontConfigure = true; + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + cp btrfs-snap $out/bin/ + wrapProgram $out/bin/btrfs-snap --prefix PATH : ${lib.makeBinPath [ + btrfs-progs # btrfs + coreutils # cut, date, head, ls, mkdir, readlink, stat, tail, touch, test, [ + gnugrep # grep + util-linuxMinimal # logger, mount + ]} + ''; + meta = with lib; { + description = "btrfs-snap creates and maintains the history of snapshots of btrfs filesystems."; + homepage = "https://github.com/jf647/btrfs-snap"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ lionello ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf51b1df7af8..e594b0f83df9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2280,6 +2280,8 @@ with pkgs; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; + btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { }; + btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; btrbk = callPackage ../tools/backup/btrbk { From c192da17cc4d87460664d72c1a845647d4b6e46b Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 25 Nov 2021 18:10:51 +0200 Subject: [PATCH 12/25] nixUnstable: 2.5pre20211007 -> 2.5pre20211126 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f365348607aa..0a897d963084 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -256,13 +256,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.5${suffix}"; - suffix = "pre20211007_${lib.substring 0 7 src.rev}"; + suffix = "pre20211126_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "844dd901a7debe8b03ec93a7f717b6c4038dc572"; - sha256 = "sha256-fe1B4lXkS6/UfpO0rJHwLC06zhOPrdSh4s9PmQ1JgPo="; + rev = "55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0"; + sha256 = "sha256-jr85Z+0TA86mdsi3Y91wM3dFHWemmFHKdNwbx9rGz2U="; }; boehmgc = boehmgc_nixUnstable; From 95312f56b5846503c5629b87df413f386b46a2ef Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sat, 27 Nov 2021 22:01:02 -0800 Subject: [PATCH 13/25] umap-learn: fix build --- pkgs/development/python-modules/umap-learn/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index fcf96a715f15..df635d856d94 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -9,6 +9,7 @@ , pynndescent , tensorflow , pytestCheckHook +, Keras }: buildPythonPackage rec { @@ -34,6 +35,7 @@ buildPythonPackage rec { nose tensorflow pytestCheckHook + Keras ]; preCheck = '' From 1e3b8e3fd835832864d8038d9d6bb906372a764e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 28 Nov 2021 17:40:08 +0000 Subject: [PATCH 14/25] python3Packages.pywal: use $TMPDIR in tests darwin hydra can fail to access /tmp --- .../python-modules/pywal/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index ccc862f8aa47..2e09573d848c 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -9,24 +9,29 @@ buildPythonPackage rec { sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg"; }; - preCheck = '' - mkdir tmp - HOME=$PWD/tmp - ''; - patches = [ ./convert.patch ./feh.patch ]; - # Invalid syntax - disabled = !isPy3k; - postPatch = '' substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh" ''; + # Invalid syntax + disabled = !isPy3k; + + preCheck = '' + mkdir tmp + HOME=$PWD/tmp + + for f in tests/test_export.py tests/test_util.py ; do + substituteInPlace "$f" \ + --replace '/tmp/' "$TMPDIR/" + done + ''; + meta = with lib; { description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3"; homepage = "https://github.com/dylanaraps/pywal"; From 6f05bc3791cd7d27cdc376548df4ce05d9a4ce6d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 27 Nov 2021 16:05:34 -0300 Subject: [PATCH 15/25] libretro.pcsx2: init at unstable-2021-11-27 Thanks for @jnetod help. --- pkgs/misc/emulators/retroarch/cores.nix | 36 +++++++++++++++++++++++ pkgs/misc/emulators/retroarch/hashes.json | 7 +++++ pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 44 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c8a1b8983f32..44c43f0f3284 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -14,6 +14,7 @@ , hexdump , hidapi , icu +, libaio , libGL , libGLU , libevdev @@ -21,6 +22,7 @@ , libpcap , libpng , libvorbis +, libxml2 , libzip , makeWrapper , nasm @@ -36,6 +38,8 @@ , udev , which , xorg +, xxd +, xz , zlib }: @@ -669,6 +673,38 @@ in ''; }; + pcsx2 = mkLibRetroCore { + core = "pcsx2"; + version = "unstable-2021-11-27"; + description = "Port of PCSX2 to libretro"; + license = lib.licenses.gpl3Plus; + extraNativeBuildInputs = [ + cmake + gettext + pkg-config + ]; + extraBuildInputs = [ + libaio + libGL + libGLU + libpcap + libpng + libxml2 + xz + xxd + ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLIBRETRO=ON" + ]; + postPatch = '' + # remove ccache + substituteInPlace CMakeLists.txt --replace "ccache" "" + ''; + postBuild = "cd /build/source/build/pcsx2"; + }; + pcsx_rearmed = mkLibRetroCore { core = "pcsx_rearmed"; description = "Port of PCSX ReARMed with GNU lightning to libretro"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 9eab19b29ad1..3caf4ed9f7b8 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -377,6 +377,13 @@ "sha256": "rms+T8JOp/TJ/T5a5uLj8lu1LLz/GAsJZ7UbK42C9yU=", "fetchSubmodules": false }, + "pcsx2": { + "owner": "libretro", + "repo": "pcsx2", + "rev": "18e0685ed4f191796c8e923caf4f5e96a930057e", + "sha256": "V2eS741us2p+JC+ghmHjAtFeptB0UcBlwZuisZ8Co7M=", + "fetchSubmodules": false + }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 3c1ea2b755b1..831709d89e7c 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -64,6 +64,7 @@ CORES = { "o2em": {"repo": "libretro-o2em"}, "opera": {"repo": "opera-libretro"}, "parallel-n64": {"repo": "parallel-n64"}, + "pcsx2": {"repo": "pcsx2"}, "pcsx_rearmed": {"repo": "pcsx_rearmed"}, "picodrive": {"repo": "picodrive", "fetch_submodules": True}, "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True}, From 7ff536edd6a8fff222889229dce7d2673f0ab463 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 28 Nov 2021 14:18:22 -0300 Subject: [PATCH 16/25] libretro: remove "-DCMAKE_BUILD_TYPE=Release" --- pkgs/misc/emulators/retroarch/cores.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 44c43f0f3284..dd7f723d3c73 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -367,7 +367,6 @@ in ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); makefile = "Makefile"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLIBRETRO=ON" "-DLIBRETRO_STATIC=1" "-DENABLE_QT=OFF" @@ -695,7 +694,6 @@ in ]; makefile = "Makefile"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLIBRETRO=ON" ]; postPatch = '' @@ -846,7 +844,6 @@ in extraNativeBuildInputs = [ cmake ]; makefile = "Makefile"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_LIBRETRO_CORE=ON" ]; postPatch = "mkdir -p src/duckstation-libretro"; From 5c589d83edadc493b0c99a663f1433cf9c8f2b80 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 28 Nov 2021 14:50:21 -0300 Subject: [PATCH 17/25] libretro: fix core platforms --- pkgs/misc/emulators/retroarch/cores.nix | 9 +++++---- pkgs/misc/emulators/retroarch/default.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index dd7f723d3c73..b09af281166b 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -59,6 +59,7 @@ let , src ? null , broken ? false , version ? "unstable-2021-11-22" + , platforms ? retroarch.meta.platforms , ... }@args: lib.makeOverridable stdenv.mkDerivation ( @@ -109,10 +110,9 @@ let }; meta = with lib; { - inherit broken description license; + inherit broken description license platforms; homepage = "https://www.libretro.com/"; maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ]; - platforms = platforms.unix; }; }) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ] ); @@ -193,7 +193,7 @@ in description = "Port of Mednafen's Saturn core to libretro"; license = lib.licenses.gpl2Only; makefile = "Makefile"; - meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; beetle-snes = mkLibRetroCore { @@ -423,7 +423,7 @@ in extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; - meta.platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; fmsx = mkLibRetroCore { @@ -701,6 +701,7 @@ in substituteInPlace CMakeLists.txt --replace "ccache" "" ''; postBuild = "cd /build/source/build/pcsx2"; + platforms = lib.platforms.x86; }; pcsx_rearmed = mkLibRetroCore { diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 5a294277c80c..6bf5f219cd78 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://libretro.com"; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3Plus; - platforms = platforms.all; + platforms = platforms.unix; maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ]; # FIXME: exits with error on macOS: # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting From 37af67a84a6210c65ce7e61efcad9bf96e3dbc50 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 28 Nov 2021 20:09:52 +0100 Subject: [PATCH 18/25] rdma-core: 37.1 -> 38.0 --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b930e966a275..878f563631e9 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "37.1"; + version = "38.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "19s59id4m0zkkm4hqa36f2xnah4rs4z207kxzn4zdg2x1d06j9jg"; + sha256 = "1z9yrkqdknzidg4g1g5rqrs7i0325nmzzw0nf2ki1nzlfwqxy9qv"; }; nativeBuildInputs = [ cmake pkg-config pandoc docutils ]; From 32067bb1597fdbf762a4b55c81e7788a5c2149cd Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sun, 28 Nov 2021 11:17:24 -0800 Subject: [PATCH 19/25] neard: fix build --- pkgs/servers/neard/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 77c6f8839f71..9e9ccb9700ee 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python3Packages }: stdenv.mkDerivation rec { pname = "neard"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; - nativeBuildInputs = [ autoreconfHook pkg-config python2Packages.wrapPython ]; - buildInputs = [ systemd glib dbus libnl ] ++ (with python2Packages; [ python ]); - pythonPath = with python2Packages; [ pygobject2 dbus-python pygtk ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3Packages.wrapPython ]; + buildInputs = [ systemd glib dbus libnl ] ++ (with python3Packages; [ python ]); + pythonPath = with python3Packages; [ pygobject3 dbus-python ]; strictDeps = true; From d18a44ab6dff396fd3cdd439406933c3369cb2eb Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 28 Nov 2021 14:32:43 -0500 Subject: [PATCH 20/25] ttyper: 0.3.0 -> 0.3.1 --- pkgs/applications/misc/ttyper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix index c3001c3337cd..442c2a91682f 100644 --- a/pkgs/applications/misc/ttyper/default.nix +++ b/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9vcoK2mFEivTSZE3KoQRHUr3AfQ/aN5eWP//Jagw3gU="; + sha256 = "sha256-lluBxYZQWygX9aujNK251bDilNNErVNr4WDoyqSPTiQ="; }; - cargoSha256 = "sha256-VzO32b5oAoXR/Ei9up00XRM63I5kuG68TeX4KBCXIdo="; + cargoSha256 = "sha256-GQNNl8/Y/jHDBGJQ7LWNpgbOgWaV/3UAMgYLJFJmQ3Y="; meta = with lib; { description = "Terminal-based typing test"; From d26a0b8d9f520fc3d8c19fcb6efb877587270024 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 28 Nov 2021 14:38:33 -0500 Subject: [PATCH 21/25] cargo-sort: 1.0.5 -> 1.0.6 --- pkgs/development/tools/rust/cargo-sort/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix index 9ab6d7e2b03a..4c0d722f266d 100644 --- a/pkgs/development/tools/rust/cargo-sort/default.nix +++ b/pkgs/development/tools/rust/cargo-sort/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sort"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "devinr528"; repo = pname; rev = "v${version}"; - sha256 = "146aawikyjcxbj0dpnqia31xmplpwkl9w1gv7d9a5jvz8whvxrff"; + sha256 = "sha256-4BQdZsnK3Wv7A3I/yCrnPALac2/sSopRPVh/57vvmGw="; }; - cargoSha256 = "0xm37f285vmd674k5j72pcjg6zpmxlf46d9vppi9s3qaw0hsslpf"; + cargoSha256 = "sha256-JM9HdPEZA9c8NGeu9qRwj0jGUsMltsOUG6itNbXZ3Ts="; meta = with lib; { description = "A tool to check that your Cargo.toml dependencies are sorted alphabetically"; homepage = "https://github.com/devinr528/cargo-sort"; + changelog = "https://github.com/devinr528/cargo-sort/blob/v${version}/changelog.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; From cda6d383462cce9e5d6f1848480c3322c4dff92b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 28 Nov 2021 14:45:48 -0500 Subject: [PATCH 22/25] statix: 0.4.0 -> 0.4.1 --- pkgs/tools/nix/statix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index bb17d8df275d..d5fd2fd092b2 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "statix"; # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix # the version can be found in flake.nix of the source code - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "nerdypepper"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wqkhtAOO6pKLjUUnDbVFwzm6mbXhP/4iJU7ZKtDKrE8="; + sha256 = "sha256-xFdHC7LulhDBWsbCcWeH90sR4iUhzQrShiW69/KHk0U="; }; - cargoSha256 = "sha256-e20POz9ZvuT0S+YG+9x7hcudhXQpOR4rVSFJbz76OI0="; + cargoSha256 = "sha256-dzDgHROlwsqwQ6pk7lrwP0eV69595l0HvF7jHSe3N/g="; buildFeatures = lib.optional withJson "json"; From 1c8513dfe4af5220d7a6d3c259471b502d2be84e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 28 Nov 2021 15:09:30 -0500 Subject: [PATCH 23/25] difftastic: 0.11.0 -> 0.12.0 --- pkgs/tools/text/difftastic/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index f8ceec253a63..ee86bcd635e3 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-Arg1n5WFCNGHZay56BvLrPDAvvUKVurVNEKgTzHgIzI="; + sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU="; }; - cargoSha256 = "sha256-ArIyIAxVgGmI+MdkVBo0xihDdw3RlRiPLJOhPcC1KLw="; + cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4="; postPatch = '' pushd vendor @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 figsoda ]; + mainProgram = "difft"; }; } From 81fb8b76317c509098fbcccf4f7ca086603f2201 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 28 Nov 2021 15:19:30 -0500 Subject: [PATCH 24/25] pipe-rename: 1.4.0 -> 1.4.1 --- pkgs/tools/misc/pipe-rename/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix index 15468773e422..060f3a3e23c0 100644 --- a/pkgs/tools/misc/pipe-rename/default.nix +++ b/pkgs/tools/misc/pipe-rename/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "pipe-rename"; - version = "1.4.0"; + version = "1.4.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-AMBdDsn3jS2dXUnEDKZILUlLHS9FIECZhc3EjxLoOZU="; + sha256 = "sha256-3Jl/G1QqcChwkI5n1zQLBgGxT2CYdh3XdMHkF+V5SG4="; }; - cargoSha256 = "sha256-ulNyTRRFtHQ7+sRaKczLiDPIKG2TIcbbsD9x1di2ypw="; + cargoSha256 = "sha256-y5BsdkHrjJHNO66MQTbvA6kKx6tLP7jNk5UmAmslz14="; checkInputs = [ python3 ]; From 0a9dd29c98c6dd720bfb9e5e6d8a3b551fc71d94 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sun, 28 Nov 2021 11:04:05 -0800 Subject: [PATCH 25/25] netatalk: fix build --- pkgs/tools/filesystems/netatalk/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 258b25c3693c..e5e873b9ac56 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python +{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3 , db, libgcrypt, avahi, libiconv, pam, openssl, acl -, ed, libtirpc, libevent +, ed, libtirpc, libevent, fetchpatch }: stdenv.mkDerivation rec { @@ -15,9 +15,14 @@ stdenv.mkDerivation rec { patches = [ ./no-suid.patch ./omitLocalstatedirCreation.patch + (fetchpatch { + name = "make-afpstats-python3-compatible.patch"; + url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; + sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg="; + }) ]; - nativeBuildInputs = [ autoreconfHook pkg-config perl python python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; @@ -46,7 +51,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - buildPythonPath ${python.pkgs.dbus-python} + buildPythonPath ${python3.pkgs.dbus-python} patchPythonScript $out/bin/afpstats '';