From 782cb7aea0e6ca54582483ebc1cf965c0a897f48 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Thu, 22 Apr 2021 18:44:26 +0300 Subject: [PATCH 01/21] fix clangd wrapper * get libc-cflags and libcxx-cxxflags from the sibling clang derivation. * fix the order of those for C++ (libc-cflags use -idirafter for a reason). --- .../development/tools/clang-tools/default.nix | 12 ++++++------ pkgs/development/tools/clang-tools/wrapper | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 12 deletions(-) mode change 100644 => 100755 pkgs/development/tools/clang-tools/wrapper diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index 498310d4324f..ba829f2c41df 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, llvmPackages }: let - clang = llvmPackages.clang-unwrapped; + unwrapped = llvmPackages.clang-unwrapped; in stdenv.mkDerivation { pname = "clang-tools"; - version = lib.getVersion clang; + version = lib.getVersion unwrapped; dontUnpack = true; + clang = llvmPackages.clang; + inherit unwrapped; + installPhase = '' runHook preInstall mkdir -p $out/bin - export libc_includes="${lib.getDev stdenv.cc.libc}/include" - export libcpp_includes="${llvmPackages.libcxx}/include/c++/v1" - export clang=${clang} substituteAll ${./wrapper} $out/bin/clangd chmod +x $out/bin/clangd for tool in \ @@ -32,7 +32,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = clang.meta // { + meta = unwrapped.meta // { description = "Standalone command line tools for C++ development"; maintainers = with lib.maintainers; [ aherrmann ]; }; diff --git a/pkgs/development/tools/clang-tools/wrapper b/pkgs/development/tools/clang-tools/wrapper old mode 100644 new mode 100755 index 53c99a67f2d3..eebc152d11b1 --- a/pkgs/development/tools/clang-tools/wrapper +++ b/pkgs/development/tools/clang-tools/wrapper @@ -1,20 +1,27 @@ #!/bin/sh buildcpath() { - local path + local path after while (( $# )); do case $1 in -isystem) shift path=$path${path:+':'}$1 + ;; + -idirafter) + shift + after=$after${after:+':'}$1 + ;; esac shift done - echo $path + echo $path${after:+':'}$after } -export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE}) -export CPATH=${CPATH}${CPATH:+':'}@libc_includes@ -export CPLUS_INCLUDE_PATH=${CPATH}${CPATH:+':'}@libcpp_includes@ +export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libc-cflags)) +export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libcxx-cxxflags) \ + $(<@clang@/nix-support/libc-cflags)) -exec -a "$0" @clang@/bin/$(basename $0) "$@" +exec -a "$0" @unwrapped@/bin/$(basename $0) "$@" From 319732fcf209cf5229ef546a4ac353ccd3e50b88 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 4 May 2021 11:43:34 +0400 Subject: [PATCH 02/21] dbus-broker: 22 -> 28 --- pkgs/os-specific/linux/dbus-broker/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index bffc90260c18..c6f1c1d82504 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dbus-broker"; - version = "22"; + version = "28"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "0vxr73afix5wjxy8g4cckwhl242rrlazm52673iwmdyfz5nskj2x"; + sha256 = "1rsn74x6yhyl9w7jqgnzgzyhp9cln1602jyzpw5qvrkdk5b7zzgs"; fetchSubmodules = true; }; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus linuxHeaders systemd ]; + mesonFlags = [ "-D=system-console-users=gdm,sddm,lightdm" ]; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; From e703d8407af8dfce86784abe7888db7c084b6cf0 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Thu, 6 May 2021 10:56:54 +0200 Subject: [PATCH 03/21] wezterm: update to 2021-04-07 --- pkgs/applications/terminal-emulators/wezterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 8b1031bb5b2c..139581581c17 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -58,13 +58,13 @@ in rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20210407-nightly"; + version = "20210502-154244-3f7122cb"; src = fetchFromGitHub { owner = "wez"; repo = pname; - rev = "d2419fb99e567e3b260980694cc840a1a3b86922"; - sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE="; + rev = "3f7122cb3f9d2fd92fb836e2f4b2aa7b839b6c86"; + sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw="; fetchSubmodules = true; }; From 89cb6395b2ecda813c4c905d0c7421ea8342fc16 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Fri, 7 May 2021 01:19:52 +0200 Subject: [PATCH 04/21] Update pkgs/applications/terminal-emulators/wezterm/default.nix Co-authored-by: Sandro --- pkgs/applications/terminal-emulators/wezterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 139581581c17..d73f14154a4e 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "wez"; repo = pname; - rev = "3f7122cb3f9d2fd92fb836e2f4b2aa7b839b6c86"; + rev = version; sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw="; fetchSubmodules = true; }; From 4416eeb2b5dba2c74b27a369dd8d29bd60e4227b Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Fri, 7 May 2021 01:29:09 +0200 Subject: [PATCH 05/21] Update cargo sha256 --- pkgs/applications/terminal-emulators/wezterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 139581581c17..3a60a0ab6745 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { echo ${version} > .tag ''; - cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg="; + cargoSha256 = "sha256-cbZg2wc3G2ffMQBB6gd0vBbow5GRbXaj8Xh5ga1cMxU="; nativeBuildInputs = [ pkg-config From 8f15019f1b9fb164c3319e0534dade8b89a33252 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 23 Apr 2021 14:21:35 +0200 Subject: [PATCH 06/21] etcher: 1.5.86 -> 1.5.117 --- pkgs/tools/misc/etcher/default.nix | 36 ++++++++++++------------------ 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 0f68137066ed..a94dbae9a25a 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -2,18 +2,16 @@ , fetchurl , gcc-unwrapped , dpkg -, polkit , util-linux , bash -, nodePackages , makeWrapper -, electron_7 +, electron_12 }: let sha256 = { - "x86_64-linux" = "1yvqi86bw0kym401zwknhwq9041fxg047sbj3aydnfcqf11vrrmk"; - "i686-linux" = "12lghzhsl16h3jvzm3vw4hrly32fz99z6rdmybl8viralrxy8mb8"; + "x86_64-linux" = "03nxcafg405vcs4sb5qhpm5aqaai87d9ksqkl37mmzf6g0n4qbih"; + "i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1"; }."${stdenv.system}"; arch = { @@ -21,39 +19,36 @@ let "i686-linux" = "i386"; }."${stdenv.system}"; - electron = electron_7; + electron = electron_12; in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.86"; + version = "1.5.117"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; inherit sha256; }; - dontBuild = true; - dontConfigure = true; - nativeBuildInputs = [ makeWrapper ]; + dontConfigure = true; + dontBuild = true; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x $src . ''; # sudo-prompt has hardcoded binary paths on Linux and we patch them here # along with some other paths - patchPhase = '' - ${nodePackages.asar}/bin/asar extract opt/balenaEtcher/resources/app.asar tmp + postPatch = '' # use Nix(OS) paths - sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js - sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js - sed -i "s|'lsblk'|'${util-linux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js - sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js - ${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar - rm -rf tmp + substituteInPlace opt/balenaEtcher/resources/app/generated/gui.js \ + --replace '/usr/bin/pkexec' '/usr/bin/pkexec", "/run/wrappers/bin/pkexec' \ + --replace '/bin/bash' '${bash}/bin/bash' \ + --replace '"lsblk"' '"${util-linux}/bin/lsblk"' ''; installPhase = '' @@ -64,15 +59,12 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} - substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ - --replace 'Exec=/opt/balenaEtcher/balena-etcher-electron' 'Exec=${pname}' - runHook postInstall ''; postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ + --add-flags $out/share/${pname}/resources/app \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; From 9fea194ecda04ce4a4d3f0d86f12f8e5337706d7 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 11 May 2021 09:01:45 +0800 Subject: [PATCH 07/21] xplr: add libiconv as dependency when on darwin --- pkgs/applications/misc/xplr/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 1bc02e8952eb..f32aa8456e2a 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "xplr"; @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "00kmmdwwf9cll25bkszgin2021ggf9b28jlcpicin5kgw4iwlhkj"; }; + buildInputs = lib.optional stdenv.isDarwin libiconv; + cargoSha256 = "1j43vwb885h355wdmjijz1qpkqn1dmb93hwi6vc035vkbbxs1g4r"; meta = with lib; { From 971d2ea6cce13f9b5bebd61de3694265f82cd000 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 03:13:59 +0000 Subject: [PATCH 08/21] findomain: 4.1.0 -> 4.1.1 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 9c6aa52f6070..8acf4a93fbaf 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-kzB6HIZK1XRxnjg5FvUWESalrYppJiiXVI8DBsDpLu8="; + sha256 = "sha256-ySpkWAhLS4jPFviKnzcnW7vuUFyojTBhooq7CFz/y3w="; }; - cargoSha256 = "sha256-2XftJ/T8wSaHXVgqbWY6EAmaVBXEzM+J6TSOJ0QFR3g="; + cargoSha256 = "sha256-KWh++MHaCJpJq7mS2lRCUh0nN+e8McKWcTknUC8VFuo="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From 0f0660d8ef5d9da0086b250864cccdb895ea9cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 May 2021 08:34:33 +0200 Subject: [PATCH 09/21] nvidia_x11_legacy304: remove The patch used to build is no longer available. We only have one kernel 4.14 that could theoretical build with it? --- pkgs/os-specific/linux/nvidia-x11/default.nix | 37 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 38 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 765118be1198..92f6bd906250 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -14,15 +14,6 @@ let kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; - - maybePatch_drm_legacy = - lib.optional (lib.versionOlder "4.14" (kernel.version or "0")) - (fetchurl { - url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1" - + "/packages/x11/driver/xf86-video-nvidia-legacy/patches/" - + "xf86-video-nvidia-legacy-0010-kernel-4.14.patch"; - sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; - }); in rec { # Policy: use the highest stable version as the default (on our master). @@ -73,32 +64,4 @@ rec { patches = [ ./vm_operations_struct-fault.patch ]; }; - - legacy_304 = generic { - version = "304.137"; - sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a"; - sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb"; - settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj"; - persistencedSha256 = null; - useGLVND = false; - useProfiles = false; - settings32Bit = true; - - prePatch = let - debPatches = fetchurl { - url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/" - + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz"; - sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l"; - }; - prefix = "debian/module/debian/patches"; - applyPatches = pnames: if pnames == [] then null else - '' - tar xf '${debPatches}' - sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch - patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}" - ''; - in applyPatches [ "fix-typos" ]; - patches = maybePatch_drm_legacy; - broken = lib.versionAtLeast kernel.version "4.18"; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ac694822162..8c2237cc7a94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20293,7 +20293,6 @@ in nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_beta = nvidiaPackages.beta; From 4bb528424ef997c9c3897b47e1f58445b973e7cf Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 11 May 2021 00:41:09 -0400 Subject: [PATCH 10/21] gcr: enable on darwin --- pkgs/development/libraries/gcr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index da3a0d31f41e..94487ff6b4d7 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; homepage = "https://gitlab.gnome.org/GNOME/gcr"; From b5227312c84e17dadbcc35eeb555151a85e795cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 00:50:36 -0700 Subject: [PATCH 11/21] abcmidi: 2021.04.26 -> 2021.05.09 (#122544) --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index f0c1e35885b2..cfb5ff125e22 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.04.26"; + version = "2021.05.09"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-L6SfPRVIclAVloYfZ+kKfZaGHYnYNAgToRN2e5ZfJZ4="; + sha256 = "sha256-LgtS7IOGkw0K70UAP2a57ghIiJujVnQO5+j4ZanPZp4="; }; meta = with lib; { From e3fe2937a552a4c96aecd7f9257e48ae0d25bd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 10:05:40 +0200 Subject: [PATCH 12/21] cargo-about: fix darwin build --- pkgs/tools/package-management/cargo-about/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 3cb5340d1d7c..3632dc58f123 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; version = "0.3.0"; @@ -12,6 +12,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-NdzgIB6uXMtGiLwOACEIeAb4iv7mYLnwRte3M/TkSMA="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; homepage = "https://github.com/EmbarkStudios/cargo-about"; From e661b70903d7a4021b7d5b2268183978541ec6c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 May 2021 08:50:26 +0200 Subject: [PATCH 13/21] mbp2018-bridge-drv: fix source the 0.01 tag was deleted --- .../linux/mbp-modules/mbp2018-bridge-drv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 258f4296e2e0..070b4a6207e1 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mbp2018-bridge-drv"; - version = "0.01"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "MCMrARM"; repo = "mbp2018-bridge-drv"; - rev = "${version}"; - sha256 = "0ac2l51ybfrvg8m36x67rsvgjqs1vwp7c89ssvbjkrcq3y4qdb53"; + rev = "b43fcc069da73e051072fde24af4014c9c487286"; + sha256 = "sha256-o6yGiR+Y5SnX1johdi7fQWP5ts7HdDMqeju75UOhgik="; }; buildPhase = '' @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = platforms.linux; maintainers = [ lib.maintainers.hlolli ]; + broken = kernel.kernelOlder "5.4"; }; } From 33a4c431262255f4963b18e8ca6cc79dcdaed6b4 Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 11 May 2021 18:10:32 +1000 Subject: [PATCH 14/21] nixos/tor: fix HidServAuth (#122439) * add an example for services.tor.settings.HidServAuth * fix HidServAuth validation to require ".onion" Per https://manpages.debian.org/testing/tor/torrc.5.en.html : > Valid onion addresses contain 16 characters in a-z2-7 plus ".onion" --- nixos/modules/services/security/tor.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 54c2c2dea23a..9e8f18e93c85 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -170,7 +170,7 @@ let else if k == "ServerTransportPlugin" then optionalString (v.transports != []) "${concatStringsSep "," v.transports} exec ${v.exec}" else if k == "HidServAuth" then - concatMapStringsSep "\n${k} " (settings: settings.onion + " " settings.auth) v + v.onion + " " + v.auth else generators.mkValueStringDefault {} v; genTorrc = settings: generators.toKeyValue { @@ -715,7 +715,7 @@ in (submodule { options = { onion = mkOption { - type = strMatching "[a-z2-7]{16}(\\.onion)?"; + type = strMatching "[a-z2-7]{16}\\.onion"; description = "Onion address."; example = "xxxxxxxxxxxxxxxx.onion"; }; @@ -726,6 +726,12 @@ in }; }) ]); + example = [ + { + onion = "xxxxxxxxxxxxxxxx.onion"; + auth = "xxxxxxxxxxxxxxxxxxxxxx"; + } + ]; }; options.HiddenServiceNonAnonymousMode = optionBool "HiddenServiceNonAnonymousMode"; options.HiddenServiceStatistics = optionBool "HiddenServiceStatistics"; From a2f26bfaa9eb3bb7dcb7a71763c7bf678ef57d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 10:11:31 +0200 Subject: [PATCH 15/21] cargo-expand: fix darwin build --- pkgs/development/tools/rust/cargo-expand/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 934976f73866..a9a01fcc66a3 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-1+A+n5VQS8zJULiR8IWLGo+RnFuVjg6ist8G3eCsXJM="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; From d9fa8e811ed8f41f77f2d831361b5db286e91655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 10:17:50 +0200 Subject: [PATCH 16/21] cargo-feature: fix darwin build --- pkgs/development/tools/rust/cargo-feature/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index 94b5000b9b62..f3fc148f029c 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-feature"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0nvl5smibl81b826xcsrjx8p89lcfpj7wqdsvywnj7jd3p5ag03n"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Allows conveniently modify features of crate"; homepage = "https://github.com/Riey/cargo-feature"; From f2dd8762efcdddccf2ff7c6884c36b7878f3f099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 10:22:29 +0200 Subject: [PATCH 17/21] cargo-fuzz: fix darwin build --- pkgs/development/tools/rust/cargo-fuzz/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 80ce649d6c17..56a2962f0c92 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-eEfry6Q2YiIkNEHu6C8p17pUTF43eS1/iTP2oATZ/F8="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + doCheck = false; meta = with lib; { From 67e530be793dd3c9b1c9f6eb61b471ddb99b796d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 10:33:52 +0200 Subject: [PATCH 18/21] cargo-msrv: fix darwin build --- pkgs/development/tools/rust/cargo-msrv/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 32ce1464f82b..d5feba80d090 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -4,6 +4,9 @@ , nix-update-script , pkg-config , openssl +, stdenv +, libiconv +, Security }: rustPlatform.buildRustPackage rec { @@ -28,7 +31,9 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin + then [ libiconv Security ] + else [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c2237cc7a94..d7b52b65724a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11529,7 +11529,9 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { }; + cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; From bd7ea80d87e073ef8dec0eb3b6664b48f5676442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 11 May 2021 10:43:57 +0100 Subject: [PATCH 19/21] ledger-live-desktop: 2.24.0 -> 2.26.1 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 2dea189dca40..298ae39716bb 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.24.0"; + version = "2.26.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1xdqj825vwh3kg35v7568zr1jhvldb4wcazzgzcaawkr4qzfdb2n"; + sha256 = "0zbzqq3c0q45dz4vvgfbvqcgda7413mnwixi7yi78qb9mp8zxkhy"; }; appimageContents = appimageTools.extractType2 { From 93123faae0281d2e97d12641a7cfad07c8028aff Mon Sep 17 00:00:00 2001 From: Winter <78392041+winterqt@users.noreply.github.com> Date: Tue, 11 May 2021 05:46:24 -0400 Subject: [PATCH 20/21] bottom-rs: init at unstable-2021-04-27 (#120937) Co-authored-by: Sandro --- pkgs/tools/misc/bottom-rs/cargo-lock.patch | 791 +++++++++++++++++++++ pkgs/tools/misc/bottom-rs/default.nix | 23 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 816 insertions(+) create mode 100644 pkgs/tools/misc/bottom-rs/cargo-lock.patch create mode 100644 pkgs/tools/misc/bottom-rs/default.nix diff --git a/pkgs/tools/misc/bottom-rs/cargo-lock.patch b/pkgs/tools/misc/bottom-rs/cargo-lock.patch new file mode 100644 index 000000000000..9b736f763c82 --- /dev/null +++ b/pkgs/tools/misc/bottom-rs/cargo-lock.patch @@ -0,0 +1,791 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..edc9428 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,785 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bottom-bench" ++version = "0.1.0" ++dependencies = [ ++ "bottomify", ++ "criterion", ++] ++ ++[[package]] ++name = "bottomify" ++version = "1.2.0" ++dependencies = [ ++ "anyhow", ++ "clap", ++ "phf", ++ "phf_codegen", ++] ++ ++[[package]] ++name = "bstr" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" ++dependencies = [ ++ "lazy_static", ++ "memchr", ++ "regex-automata", ++ "serde", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "cast" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75" ++dependencies = [ ++ "rustc_version", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "clap" ++version = "2.33.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "criterion" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" ++dependencies = [ ++ "atty", ++ "cast", ++ "clap", ++ "criterion-plot", ++ "csv", ++ "itertools 0.10.0", ++ "lazy_static", ++ "num-traits", ++ "oorandom", ++ "plotters", ++ "rayon", ++ "regex", ++ "serde", ++ "serde_cbor", ++ "serde_derive", ++ "serde_json", ++ "tinytemplate", ++ "walkdir", ++] ++ ++[[package]] ++name = "criterion-plot" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" ++dependencies = [ ++ "cast", ++ "itertools 0.9.0", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-utils", ++ "lazy_static", ++ "memoffset", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "csv" ++version = "1.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" ++dependencies = [ ++ "bstr", ++ "csv-core", ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "csv-core" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "half" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" ++ ++[[package]] ++name = "log" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "oorandom" ++version = "11.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" ++ ++[[package]] ++name = "phf" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" ++dependencies = [ ++ "phf_shared", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" ++dependencies = [ ++ "phf_generator", ++ "phf_shared", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" ++dependencies = [ ++ "phf_shared", ++ "rand", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "plotters" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" ++dependencies = [ ++ "num-traits", ++ "plotters-backend", ++ "plotters-svg", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "plotters-backend" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" ++ ++[[package]] ++name = "plotters-svg" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" ++dependencies = [ ++ "plotters-backend", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++ "rand_pcg", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++dependencies = [ ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++dependencies = [ ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" ++dependencies = [ ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-automata" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" ++ ++[[package]] ++name = "serde_cbor" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++dependencies = [ ++ "half", ++ "serde", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.64" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "syn" ++version = "1.0.70" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "tinytemplate" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" ++dependencies = [ ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++dependencies = [ ++ "same-file", ++ "winapi", ++ "winapi-util", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" ++dependencies = [ ++ "bumpalo", ++ "lazy_static", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/misc/bottom-rs/default.nix b/pkgs/tools/misc/bottom-rs/default.nix new file mode 100644 index 000000000000..ab5763c207d1 --- /dev/null +++ b/pkgs/tools/misc/bottom-rs/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "bottom-rs"; + version = "unstable-2021-04-27"; + + src = fetchFromGitHub { + owner = "bottom-software-foundation"; + repo = pname; + rev = "3451cdadd7c4e64fe8e7f43e986a18628a741dec"; + sha256 = "0kr18q80021s1n9zzzff6w6yvbbjnk6zbbabi5b42b0rfv6fnfn2"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0nyzg6pg69bf9vvc3r5lnhmkb9s1508c1gqcra3y43zffdlwml1y"; + + meta = with lib; { + description = "Fantastic (maybe) CLI for translating between bottom and human-readable text"; + homepage = "https://github.com/bottom-software-foundation/bottom-rs"; + license = licenses.mit; + maintainers = with maintainers; [ winterqt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7b52b65724a..f45616b80035 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1934,6 +1934,8 @@ in buildpack = callPackage ../development/tools/buildpack { }; + bottom-rs = callPackage ../tools/misc/bottom-rs { }; + buildtorrent = callPackage ../tools/misc/buildtorrent { }; bustle = haskellPackages.bustle; From ab8e2e46d9e0e7be3158b473c4b59fec8f79287b Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Tue, 11 May 2021 12:01:35 +0000 Subject: [PATCH 21/21] hashcat: fixup opencl support (#121961) This fixes the following compilation error: ``` clBuildProgram(): CL_BUILD_PROGRAM_FAILURE /run/user/1000/comgr-64ff7f/input/CompileSource:2252:18: fatal error: cannot open file '/run/user/1000/comgr-64ff7f/input/inc_comp_multi_bs.cl': No such file or directory #include COMPARE_M ^ /run/user/1000/comgr-64ff7f/input/CompileSource:16:19: note: expanded from macro 'COMPARE_M' ^ 1 error generated. Error: Failed to compile opencl source (from CL or HIP source to LLVM IR). ``` Signed-off-by: Arthur Gautier --- pkgs/tools/security/hashcat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 173fdc8b18d2..ba46fbde2d62 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/share/hashcat/OpenCL/*.cl; do + # Rewrite files to be included for compilation at runtime for opencl offload sed "s|#include \"\(.*\)\"|#include \"$out/share/hashcat/OpenCL/\1\"|g" -i "$f" + sed "s|#define COMPARE_\([SM]\) \"\(.*\.cl\)\"|#define COMPARE_\1 \"$out/share/hashcat/OpenCL/\2\"|g" -i "$f" done '';