From 41a2be8dc820dd4e6ae7358dc5674c61cc49325f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Apr 2022 03:03:41 +0000 Subject: [PATCH 01/13] gitRepo: 2.23 -> 2.24 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index eb87a20e3ebe..58b3fb1d20f1 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-YW6MBX/NGQXuFWvzISWKJZkvxWc0jasxmzy/Zh1TjY0="; + sha256 = "sha256-p5zAehhqOUlKay3/Oy8hbBo5nQRIyE7o4bnaX/TabYc="; }; # Fix 'NameError: name 'ssl' is not defined' From ae42928b2affa18825be5abacd361870122d0021 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Apr 2022 04:59:36 +0000 Subject: [PATCH 02/13] jitsi-meet: 1.0.5913 -> 1.0.6091 --- pkgs/servers/web-apps/jitsi-meet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 05f33bb47de9..e31327927fa9 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.5913"; + version = "1.0.6091"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "NQxGkwEqnrOrkB+Rtka1n1SDqcQqp7epmDBuXKR/qFQ="; + sha256 = "lYQGrH7D2xsRdwDC0yXB+tt4nOawEkq9A5tDIwl6pRk="; }; dontBuild = true; From 7e56a8b18fac820dbb17da99a510ed8a6c11d2ca Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Thu, 21 Apr 2022 10:13:10 -0500 Subject: [PATCH 03/13] zn_poly: 0.9.1 -> 0.9.2 --- .../libraries/science/math/zn_poly/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 38d5d91e0837..3ec97e4a288e 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -3,12 +3,12 @@ , fetchFromGitLab , fetchpatch , gmp -, python2 +, python3 , tune ? false # tune to hardware, impure }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; pname = "zn_poly"; # sage has picked up the maintenance (bug fixes and building, not development) @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "sagemath"; repo = "zn_poly"; rev = version; - sha256 = "0ra5vy585bqq7g3317iw6fp44iqgqvds3j0l1va6mswimypq4vxb"; + hash = "sha256-QBItcrrpOGj22/ShTDdfZjm63bGW2xY4c71R1q8abPE="; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - python2 # needed by ./configure to create the makefile + python3 # needed by ./configure to create the makefile ]; # name of library file ("libzn_poly.so") @@ -44,16 +44,6 @@ stdenv.mkDerivation rec { "--disable-tuning" ]; - patches = [ - # fix format-security by not passing variables directly to printf - # https://gitlab.com/sagemath/zn_poly/merge_requests/1 - (fetchpatch { - name = "format-security.patch"; - url = "https://gitlab.com/timokau/zn_poly/commit/1950900a80ec898d342b8bcafa148c8027649766.patch"; - sha256 = "1gks9chvsfpc6sg5h3nqqfia4cgvph7jmj9dw67k7dk7kv9y0rk1"; - }) - ]; - # `make install` fails to install some header files and the lib file. installPhase = '' mkdir -p "$out/include/zn_poly" From dcf8b95055b93bc8945dd6cb85eb9d8c50c221a7 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 17 Apr 2022 21:30:05 -0400 Subject: [PATCH 04/13] didyoumean: init at 1.1.0 --- pkgs/tools/misc/didyoumean/default.nix | 32 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/didyoumean/default.nix diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix new file mode 100644 index 000000000000..cd7b8270a1a9 --- /dev/null +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libxcb +# Darwin dependencies +, AppKit +}: + +rustPlatform.buildRustPackage rec { + pname = "didyoumean"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "hisbaan"; + repo = "didyoumean"; + rev = "v${version}"; + sha256 = "sha256-t2bmvz05vWIxQhC474q/9uky1kAQoFN8Z+qflw5Vj68="; + }; + + cargoSha256 = "sha256-4DbziI9enib4pm9/P4WEu15glIxtejaV2GCqbzuxxyw="; + + buildInputs = lib.optional stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + description = "A CLI spelling corrector for when you're unsure"; + homepage = "https://github.com/hisbaan/didyoumean"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab4..767785f1fbc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -433,6 +433,10 @@ with pkgs; devour = callPackage ../tools/X11/devour {}; + didyoumean = callPackage ../tools/misc/didyoumean { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; From 515b89802eea50d947d56b4b963f5b660f451ab0 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 16 Apr 2022 14:52:34 +0200 Subject: [PATCH 05/13] pythonPackages.wifi: init 0.3.5 --- .../python-modules/wifi/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/wifi/default.nix diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix new file mode 100644 index 000000000000..0b5a9444dbfd --- /dev/null +++ b/pkgs/development/python-modules/wifi/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pbkdf2 +, pytestCheckHook +, pythonOlder +, substituteAll +, wirelesstools +}: + +buildPythonPackage rec { + pname = "wifi"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "rockymeza"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-scg/DvApvyQZtzDgkHFJzf9gCRfJgBvZ64CG/c2Cx8E="; + }; + + disabled = pythonOlder "2.6"; + + postPatch = '' + substituteInPlace wifi/scan.py \ + --replace "/sbin/iwlist" "${wirelesstools}/bin/iwlist" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + propagatedBuildInputs = [ + pbkdf2 + ]; + + pythonImportsCheck = [ "wifi" ]; + + meta = with lib; { + description = "Provides a command line wrapper for iwlist and /etc/network/interfaces"; + homepage = "https://github.com/rockymeza/wifi"; + maintainers = with maintainers; [ rhoriguchi ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dafa9b58b09e..970c0653e9b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10781,6 +10781,8 @@ in { wiffi = callPackage ../development/python-modules/wiffi { }; + wifi = callPackage ../development/python-modules/wifi { }; + willow = callPackage ../development/python-modules/willow { }; winacl = callPackage ../development/python-modules/winacl { }; From 4590810a5dae05be8842f78bf8cbddcee0521f3c Mon Sep 17 00:00:00 2001 From: Tris Emmy Wilson Date: Sun, 28 Nov 2021 15:15:10 -0600 Subject: [PATCH 06/13] maintainers: add an-empty-string --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 78c3fcbbf995..c2788a7193bb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -675,6 +675,12 @@ githubId = 858965; name = "Andrew Morsillo"; }; + an-empty-string = { + name = "Tris Emmy Wilson"; + email = "tris@tris.fyi"; + github = "an-empty-string"; + githubId = 681716; + }; andehen = { email = "git@andehen.net"; github = "andehen"; From 9f227ab554aacf331b4c8bb2f6663fe3ad63e937 Mon Sep 17 00:00:00 2001 From: Tris Emmy Wilson Date: Sun, 28 Nov 2021 15:15:20 -0600 Subject: [PATCH 07/13] comic-mono: init at 2020-12-28 --- .../fonts/comic-mono/comic-mono-weight.conf | 14 ++++++++ pkgs/data/fonts/comic-mono/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 51 insertions(+) create mode 100644 pkgs/data/fonts/comic-mono/comic-mono-weight.conf create mode 100644 pkgs/data/fonts/comic-mono/default.nix diff --git a/pkgs/data/fonts/comic-mono/comic-mono-weight.conf b/pkgs/data/fonts/comic-mono/comic-mono-weight.conf new file mode 100644 index 000000000000..97cfa3d83fdf --- /dev/null +++ b/pkgs/data/fonts/comic-mono/comic-mono-weight.conf @@ -0,0 +1,14 @@ + + + + + + + + Comic Mono + + + book + + + diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/data/fonts/comic-mono/default.nix new file mode 100644 index 000000000000..0c915f21c132 --- /dev/null +++ b/pkgs/data/fonts/comic-mono/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchFromGitHub }: + +let + version = "2020-12-28"; +in fetchFromGitHub { + name = "comic-mono-font-${version}"; + + owner = "dtinth"; + repo = "comic-mono-font"; + rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + + postFetch = '' + mkdir -p $out/share/fonts + tar -z -f $downloadedFile --wildcards -x \*.ttf --one-top-level=$out/share/fonts + + mkdir -p $out/etc/fonts/conf.d + ln -s ${./comic-mono-weight.conf} $out/etc/fonts/conf.d/30-comic-mono.conf + ''; + + hash = "sha256-poMU+WfDZcsyWyFiiXKJ284X22CJlxQIzcJtApnIdAY="; + + meta = with lib; { + description = "A legible monospace font that looks like Comic Sans"; + longDescription = '' + A legible monospace font... the very typeface you’ve been trained to + recognize since childhood. This font is a fork of Shannon Miwa’s Comic + Shanns (version 1). + ''; + homepage = "https://dtinth.github.io/comic-mono-font/"; + + license = licenses.mit; + maintainers = with maintainers; [ an-empty-string totoroot ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab4..ff59b714b0b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23953,6 +23953,8 @@ with pkgs; comfortaa = callPackage ../data/fonts/comfortaa {}; + comic-mono = callPackage ../data/fonts/comic-mono { }; + comic-neue = callPackage ../data/fonts/comic-neue { }; comic-relief = callPackage ../data/fonts/comic-relief {}; From 69e661230508bf2c4b7b8dbb0518de6c951986ce Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 19:26:44 -0400 Subject: [PATCH 08/13] {jesec-,}rtorrent: don't use package sets --- .../p2p/jesec-rtorrent/default.nix} | 0 .../p2p/jesec-rtorrent/libtorrent.nix | 0 .../p2p/rakshasa-rtorrent/default.nix} | 0 .../p2p/rakshasa-rtorrent/libtorrent.nix | 0 .../networking/p2p/jesec-rtorrent/default.nix | 9 --------- .../p2p/rakshasa-rtorrent/default.nix | 9 --------- pkgs/top-level/all-packages.nix | 20 ++++++------------- 7 files changed, 6 insertions(+), 32 deletions(-) rename pkgs/{tools/networking/p2p/jesec-rtorrent/rtorrent.nix => applications/networking/p2p/jesec-rtorrent/default.nix} (100%) rename pkgs/{tools => applications}/networking/p2p/jesec-rtorrent/libtorrent.nix (100%) rename pkgs/{tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix => applications/networking/p2p/rakshasa-rtorrent/default.nix} (100%) rename pkgs/{tools => applications}/networking/p2p/rakshasa-rtorrent/libtorrent.nix (100%) delete mode 100644 pkgs/tools/networking/p2p/jesec-rtorrent/default.nix delete mode 100644 pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix similarity index 100% rename from pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix rename to pkgs/applications/networking/p2p/jesec-rtorrent/default.nix diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix similarity index 100% rename from pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix rename to pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix similarity index 100% rename from pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix rename to pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix similarity index 100% rename from pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix rename to pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix deleted file mode 100644 index 56fec5333fc7..000000000000 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib -, pkgs -, callPackage -}: - -rec { - libtorrent = callPackage ./libtorrent.nix { }; - rtorrent = callPackage ./rtorrent.nix { }; -} diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix deleted file mode 100644 index 56fec5333fc7..000000000000 --- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib -, pkgs -, callPackage -}: - -rec { - libtorrent = callPackage ./libtorrent.nix { }; - rtorrent = callPackage ./rtorrent.nix { }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab4..6d830daecdd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7926,21 +7926,13 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rakshasa-rtorrent = recurseIntoAttrs - (callPackage ../tools/networking/p2p/rakshasa-rtorrent { - callPackage = newScope pkgs.rakshasa-rtorrent; - }); + rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { + libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; + }; - rtorrent = rakshasa-rtorrent.rtorrent; - libtorrent = rakshasa-rtorrent.libtorrent; - - jesec-rtorrent = recurseIntoAttrs - (callPackage ../tools/networking/p2p/jesec-rtorrent { - callPackage = newScope pkgs.jesec-rtorrent; - }); - - rtorrent-jesec = jesec-rtorrent.rtorrent; - libtorrent-jesec = jesec-rtorrent.libtorrent; + jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { + libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; + }; libmpack = callPackage ../development/libraries/libmpack { }; From 6d5589346b4d21c068d9309fde31cb80880330b9 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 19:48:46 -0400 Subject: [PATCH 09/13] jesec-rtorrent: 0.9.8-r15 -> 0.9.8-r16 --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 4 ++-- .../applications/networking/p2p/jesec-rtorrent/libtorrent.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 7fe444228d37..0df07cd5510a 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "jesec-rtorrent"; - version = "0.9.8-r15"; + version = "0.9.8-r16"; src = fetchFromGitHub { owner = "jesec"; repo = "rtorrent"; rev = "v${version}"; - hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk="; + hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index d46e4a159399..fb7515e8671f 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "jesec-libtorrent"; - version = "0.13.8-r3"; + version = "0.13.8-r4"; src = fetchFromGitHub { owner = "jesec"; repo = "libtorrent"; rev = "v${version}"; - hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk="; + hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0="; }; nativeBuildInputs = [ From 73ff43b391531565a8542acbdee03693a51d1cc3 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 19:49:32 -0400 Subject: [PATCH 10/13] jesec-rtorrent: clean up formatting --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 2 +- pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 0df07cd5510a..a760a0f96c35 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO" ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"; - doCheck = true; + checkInputs = [ gtest ]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index fb7515e8671f..a08eb8f1293c 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -21,15 +21,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; doCheck = true; + preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD ''; + checkInputs = [ gtest ]; From b9e02e7495e1bb9d524b6e47aeef005e2da6bcaf Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 21 Apr 2022 20:37:19 -0400 Subject: [PATCH 11/13] jesec-libtorrent: disable checks --- pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index a08eb8f1293c..ac7e15b6a2e5 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { zlib ]; - doCheck = true; + # Disabled because a test is flaky; see https://github.com/jesec/libtorrent/issues/4. + # doCheck = true; preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD From 65048d7799932c808336c0fc0515b8ac184baabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 22 Apr 2022 04:17:53 +0200 Subject: [PATCH 12/13] python310Packages.seabreeze: remove pytest runner --- pkgs/development/python-modules/seabreeze/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 06802a8a2ce1..6f048144dfa1 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -4,7 +4,6 @@ , cython , git , pkgconfig -, pytest-runner , setuptools-scm , future , numpy @@ -31,11 +30,15 @@ buildPythonPackage rec { leaveDotGit = true; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + nativeBuildInputs = [ cython git pkgconfig - pytest-runner setuptools-scm ]; From eed65357919870061fba1fb6a70756041903f42b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 05:25:17 +0000 Subject: [PATCH 13/13] epiphany: 42.1 -> 42.2 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 649cc71cde0c..2dcd037fa500 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "aKzDxcYpF/G0ORaltGvsE29bMH8DqtpY23QMeLED8Dg="; + sha256 = "ksAs+IbRDSzP9d5ljhpCDqsx0gu1DnRtQw6VNbSFGS0="; }; patches = lib.optionals withPantheon [