From a624615754cc1adeeaa7f2b2943f69efb2725be0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:14:33 +1300 Subject: [PATCH 01/11] root: Ignore default JetBrains IDEA module configuration --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 1a41704c9be3..6b13e043a92c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ __pycache__ # generated by pkgs/common-updater/update-script.nix update-git-commits.txt + +# JetBrains IDEA module declaration file +/nixpkgs.iml From 652e492d29f74e2988ec42a71a66c60f47285ac7 Mon Sep 17 00:00:00 2001 From: Alberto Date: Fri, 3 Dec 2021 18:36:50 +0100 Subject: [PATCH 02/11] koreader: 2021.10.1 -> 2021.11 --- pkgs/applications/misc/koreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 3d11162241eb..471f3f04297e 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.10.1"; + version = "2021.11"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-UpDwexBfjlne/uNMTtNjIyZb3TDMYFeDvtwtTFARovw="; + sha256 = "sha256-5DNC0MlLB+2JBV2TADSvO40rPlvsPehfv+YE/45P2MA="; }; sourceRoot = "."; From 60422ba2ead07583dba311e9597f07789fe061d6 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 3 Dec 2021 19:59:38 +0200 Subject: [PATCH 03/11] nixos/test-driver: add 10ms delay to send_key attempt to fix https://github.com/NixOS/nixpkgs/issues/147294 --- nixos/lib/test-driver/test-driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 2cdf4fc2732e..90c9e9be45cd 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -916,6 +916,7 @@ class Machine: def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) + time.sleep(0.01) def start(self) -> None: if self.booted: From cd4005ff32fa438078bb1850ad018291b0a09e4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 3 Dec 2021 11:15:18 -0800 Subject: [PATCH 04/11] _0x0: remove Upstream no longer exists --- pkgs/tools/misc/0x0/default.nix | 31 ------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/tools/misc/0x0/default.nix diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix deleted file mode 100644 index 0b9c6f7c3bbb..000000000000 --- a/pkgs/tools/misc/0x0/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: - -stdenv.mkDerivation { - pname = "0x0"; - version = "2018-06-24"; - - src = fetchFromGitLab { - owner = "somasis"; - repo = "scripts"; - rev = "70422c83b2ac5856559b0ddaf6e2dc3dbef40dee"; - sha256 = "1qpylyxrisy3p2lyirfarfj5yzrdjgsgxwf8gqwljpcjn207hr72"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - install -Dm755 0x0 $out/bin/0x0 - - patchShebangs $out/bin/0x0 - wrapProgram $out/bin/0x0 \ - --prefix PATH : '${lib.makeBinPath [ curl xsel ]}' - ''; - - meta = with lib; { - description = "A client for 0x0.st"; - homepage = "https://gitlab.com/somasis/scripts/"; - maintainers = [ maintainers.ar1a ]; - license = licenses.unlicense; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c78e21192391..946326d1979d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; PPSSPP = ppsspp; # added 2017-10-01 QmidiNet = qmidinet; # added 2016-05-22 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c6608c6aab..a2072b231eff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -793,8 +793,6 @@ with pkgs; ### TOOLS - _0x0 = callPackage ../tools/misc/0x0 { }; - _3llo = callPackage ../tools/misc/3llo { }; _3mux = callPackage ../tools/misc/3mux { }; From 4034242a8ab9e15da5db91a2d5928d0868c38bcc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 3 Dec 2021 11:21:23 -0800 Subject: [PATCH 05/11] amdgpu-pro: fix homepage --- pkgs/os-specific/linux/amdgpu-pro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 736f5ca6bc9d..0f65d1c0c484 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -173,7 +173,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "AMDGPU-PRO drivers"; - homepage = "http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; + homepage = "https://www.amd.com/en/support"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; From 719beec27a0bee55b6ee78987aedeadf1d08026d Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 3 Dec 2021 20:50:42 +0100 Subject: [PATCH 06/11] electrum-ltc: 3.3.8.1 -> 4.0.9.3 rewritten based on the electrum derivation --- pkgs/applications/misc/electrum/ltc.nix | 175 ++++++++++++++++++++---- 1 file changed, 146 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index bd015afdc572..a070bc321b74 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -1,63 +1,180 @@ { lib +, stdenv , fetchurl -, python3Packages +, fetchFromGitHub , wrapQtAppsHook +, python3 +, zbar +, secp256k1 +, enableQt ? true +# for updater.nix +, writeScript +, common-updater-scripts +, bash +, coreutils +, curl +, gnugrep +, gnupg +, gnused +, nix }: -python3Packages.buildPythonApplication rec { +let + version = "4.0.9.3"; + + libsecp256k1_name = + if stdenv.isLinux then "libsecp256k1.so.0" + else if stdenv.isDarwin then "libsecp256k1.0.dylib" + else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; + + libzbar_name = + if stdenv.isLinux then "libzbar.so.0" + else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; + + # Not provided in official source releases, which are what upstream signs. + tests = fetchFromGitHub { + owner = "pooler"; + repo = "electrum-ltc"; + rev = version; + sha256 = "sha256-oZjQnrnj8nCaQjrIz8bWNt6Ib8Wu2ZMXHEPfCCy2fjk="; + + extraPostFetch = '' + mv $out ./all + mv ./all/electrum_ltc/tests $out + ''; + }; + + py = python3.override { + packageOverrides = self: super: { + + aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { + version = "0.18.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; + }; + }); + }; + }; + +in + +python3.pkgs.buildPythonApplication { pname = "electrum-ltc"; - version = "3.3.8.1"; + inherit version; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; + sha256 = "sha256-+oox0BGqkvj0OGOKJF8tUoKdsZFeffNb6rTF8E8mo08="; }; - nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; + postUnpack = '' + # can't symlink, tests get confused + cp -ar ${tests} $sourceRoot/electrum_ltc/tests + ''; - propagatedBuildInputs = with python3Packages; [ - pyaes - ecdsa - pbkdf2 - requests - qrcode - py_scrypt - pyqt5 - protobuf + prePatch = '' + substituteInPlace contrib/requirements/requirements.txt \ + --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + ''; + + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + + propagatedBuildInputs = with py.pkgs; [ + aiohttp + aiohttp-socks + aiorpcx + attrs + bitstring + cryptography dnspython jsonrpclib-pelix + matplotlib + pbkdf2 + protobuf + py_scrypt pysocks - trezor + qrcode + requests + tlslite-ng + # plugins btchip + ckcc-protocol + keepkey + trezor + ] ++ lib.optionals enableQt [ + pyqt5 + qdarkstyle ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc5 icons.qrc -o gui/qt/icons_rc.py - # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' gui/qt/icons_rc.py + substituteInPlace ./electrum_ltc/ecc_fast.py \ + --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} + '' + (if enableQt then '' + substituteInPlace ./electrum_ltc/qrscanner.py \ + --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + '' else '' + sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt + ''); + + postInstall = lib.optionalString stdenv.isLinux '' + # Despite setting usr_share above, these files are installed under + # $out/nix ... + mv $out/${python3.sitePackages}/nix/store"/"*/share $out + rm -rf $out/${python3.sitePackages}/nix + + substituteInPlace $out/share/applications/electrum-ltc.desktop \ + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-ltc %u"' \ + "Exec=$out/bin/electrum-ltc %u" \ + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-ltc --testnet %u"' \ + "Exec=$out/bin/electrum-ltc --testnet %u" + ''; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") + postFixup = lib.optionalString enableQt '' + wrapQtApp $out/bin/electrum-ltc ''; - checkPhase = '' + checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + + pytestFlagsArray = [ "electrum_ltc/tests" ]; + + disabledTests = [ + "test_loop" # test tries to bind 127.0.0.1 causing permission error + "test_is_ip_address" # fails spuriously https://github.com/spesmilo/electrum/issues/7307 + ]; + + postCheck = '' $out/bin/electrum-ltc help >/dev/null ''; + passthru.updateScript = import ./update.nix { + inherit lib; + inherit + writeScript + common-updater-scripts + bash + coreutils + curl + gnupg + gnugrep + gnused + nix + ; + }; + meta = with lib; { - description = "Litecoin thin client"; + description = "Lightweight Litecoin Client"; longDescription = '' - Electrum-LTC is a simple, but powerful Litecoin wallet. A twelve-word - security passphrase (or “seed”) leaves intruders stranded and your peace - of mind intact. Keep it on paper, or in your head... and never worry - about losing your litecoins to theft or hardware failure. No waiting, no - lengthy blockchain downloads and no syncing to the network. + Electrum-LTC is a simple, but powerful Litecoin wallet. A unique secret + phrase (or “seed”) leaves intruders stranded and your peace of mind + intact. Keep it on paper, or in your head... and never worry about losing + your litecoins to theft or hardware failure. ''; homepage = "https://electrum-ltc.org/"; license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = platforms.all; + maintainers = with maintainers; [ lourkeur ]; }; } From 9118fde4b08fb822861b2922007628c6d59f2286 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 4 Dec 2021 00:19:23 +0100 Subject: [PATCH 07/11] scrypt: fix build on aarch64-darwin util-linux alternative for darwin does not contain `rev` anyway and somehow the tests pass even when it is missing --- pkgs/tools/security/scrypt/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 89ff50e0a8a0..5a3ab9cb68b4 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, openssl, util-linux, getconf }: +{ lib +, stdenv +, fetchurl +, openssl +, getconf +, util-linux +}: stdenv.mkDerivation rec { pname = "scrypt"; @@ -27,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - checkInputs = [ util-linux ]; + checkInputs = lib.optionals stdenv.isLinux [ util-linux ]; meta = with lib; { description = "Encryption utility"; From de5ab3881e4868dcfa9f75723bd035ce99cb0751 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 3 Dec 2021 16:09:50 -0800 Subject: [PATCH 08/11] flashrom: build with default gcc Fetch upstream patch to fix build with gcc 10 --- pkgs/tools/misc/flashrom/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 4c227cbe3f96..dc42510998cd 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,6 +1,6 @@ { fetchurl , fetchpatch -, gcc9Stdenv +, stdenv , installShellFiles , lib , libftdi1 @@ -11,7 +11,7 @@ , jlinkSupport ? false }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "flashrom"; version = "1.2"; @@ -31,6 +31,11 @@ gcc9Stdenv.mkDerivation rec { url = "https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d.patch"; sha256 = "sha256-fXYDXgT/ik+qtxxFEyJ7/axtycbwLkEg0UD+hzsYEwg="; }) + # fix build with gcc 10 + (fetchpatch { + url = "https://github.com/flashrom/flashrom/commit/3a0c1966e4c66f91e6e8551e906b6db38002acb4.patch"; + sha256 = "sha256-UfXLefMS20VUc7hk4IXECFbDWEbBnHMGSzOYemTfvjI="; + }) ]; postPatch = '' @@ -51,6 +56,6 @@ gcc9Stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; platforms = platforms.all; - broken = gcc9Stdenv.isDarwin; # requires DirectHW + broken = stdenv.isDarwin; # requires DirectHW }; } From 0d8cbc4fd4c8ca52440a1f51a1cc0b11de8ed7ed Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Fri, 3 Dec 2021 18:14:55 -0800 Subject: [PATCH 09/11] rmapi: 0.0.17 -> 0.0.18 (#148531) --- pkgs/applications/misc/remarkable/rmapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 8482f85d927a..6a4beec6a5ec 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-KFoaZ0OAqwJm4tEUaEAGJ+70nHJUbxg0kvhm71mQB6E="; + sha256 = "sha256-Yrq21eiyNem9P219FxuQMHpagKQDaNsASwi2REaDAgk="; }; vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; From f01e91259921d0e3308d9586f4180c5b927ca12e Mon Sep 17 00:00:00 2001 From: deltadelta Date: Mon, 22 Nov 2021 20:06:18 +0100 Subject: [PATCH 10/11] scaleway-cli: 1.20 -> 2.4.0 Use buildGoModule instead of buildGoPackage because newer version is a module. --- pkgs/tools/admin/scaleway-cli/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 2a8f0d1f1148..2576208e8d22 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,18 +1,21 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "scaleway-cli"; - version = "1.20"; - - goPackagePath = "github.com/scaleway/scaleway-cli"; + version = "2.4.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "14likzp3hl04nq9nmpmh9m5zqjyspy5cyk20dkh03c1nhkd4vcnx"; + sha256 = "yYzcziEKPSiMvw9LWd60MkHmYFAvN7Qza6Z117NOOv0="; }; + vendorSha256 = "0V9sHi/E095txnfF8YFW5O7o0e1H3sdn3tw5LqB92tI="; + + # some tests require network access to scaleway's API, failing when sandboxed + doCheck = false; + meta = with lib; { description = "Interact with Scaleway API from the command line"; homepage = "https://github.com/scaleway/scaleway-cli"; From bb9bd465b625bfc971908c5d3d84ce517e1c0691 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Dec 2021 12:51:38 +1000 Subject: [PATCH 11/11] go_1_17: 1.17.3 -> 1.17.4 --- pkgs/development/compilers/go/1.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 94d6413a54b9..69322ce6e194 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-cFxkJR5bJdXVXt4QOcaqIr6kCnqTHRTDcDOYU2Q8PfA="; + sha256 = "sha256-S+82mTge8J4HVihQQYdBZWXXEGYP7GWwV+3xzrGH/Es="; }; # perl is used for testing go vet