From c9f22532e4caf25c46f1d966aca13e9d0e97938d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 21 Feb 2022 07:52:42 +0000 Subject: [PATCH 01/27] pipewire_0_2: add -fcommon workaround Without the change build fails as: $ nix build --impure --expr 'with import ./. {}; pipewire_0_2.override { stdenv = clang12Stdenv; }' -L ... ld: spa/plugins/bluez5/libspa-bluez5.so.p/bluez5-monitor.c.o:(.bss+0x0): multiple definition of `spa_a2dp_sink_factory' Newer versions don't require the fix as upstream removed the code completely later. --- pkgs/development/libraries/pipewire/0.2.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index d21ceafbcf9d..16c8d5d25128 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -28,6 +28,11 @@ in stdenv.mkDerivation rec { alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; + # Workaround build on gcc-10+ and clang11+: + # spa/plugins/bluez5/libspa-bluez5.so.p/bluez5-monitor.c.o:(.bss+0x0): + # multiple definition of `spa_a2dp_sink_factory' + NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + mesonFlags = [ "-Ddocs=true" "-Dgstreamer=enabled" From f844e0d2cf7372bc302e839252d2c979d9a648a8 Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 3 Mar 2022 06:23:13 +1300 Subject: [PATCH 02/27] maintainers: add steinybot --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ec7d705ef2e..fb56b6d70fd5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11565,6 +11565,17 @@ githubId = 55607356; name = "Stephan Heßelmann"; }; + steinybot = { + name = "Jason Pickens"; + email = "jasonpickensnz@gmail.com"; + matrix = "@steinybot:matrix.org"; + github = "steinybot"; + githubId = 4659562; + keys = [{ + longkeyid = "ed25519/0x21DE1CAE59762A0F"; + fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; + }]; + }; stelcodes = { email = "stel@stel.codes"; github = "stelcodes"; From 829ef15879a2cadde366975b20630e77441f1a0c Mon Sep 17 00:00:00 2001 From: Jason Pickens Date: Thu, 17 Feb 2022 12:20:30 +1300 Subject: [PATCH 03/27] iterm2: fix build --- .../terminal-emulators/iterm2/default.nix | 54 +++++++++---------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 4c46bcc6c3fc..e8fbb8cb9fa9 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -1,48 +1,42 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ fetchzip, lib, stdenvNoCC }: /* - This derivation is impure: it relies on an Xcode toolchain being installed - and available in the expected place. The values of sandboxProfile - are copied pretty directly from the MacVim derivation, which - is also impure. In order to build you at least need the `sandbox` - option set to `relaxed` or `false`. + This cannot be built from source as it requires entitlements and + for that it needs to be code signed. Automatic updates will have + to be disabled via preferences instead of at build time. To do + that edit $HOME/Library/Preferences/com.googlecode.iterm2.plist + and add: + SUEnableAutomaticChecks = 0; */ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.14"; + version = "3.4.15"; - src = fetchFromGitHub { - owner = "gnachman"; - repo = "iTerm2"; - rev = "v${version}"; - sha256 = "sha256-sDCnBO7xDpecu2cSjpHwync2DVsj9EKUmgpqEVLtxRM="; + src = fetchzip { + url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; + sha256 = "sha256-ZE/uYBKB2popdIdZWA8AvyJiwMzt32u6u/H/AyNcoVo="; }; - patches = [ ./disable_updates.patch ]; - postPatch = '' - sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj - ''; - - preConfigure = "LD=$CC"; - makeFlagsArray = ["Nix"]; installPhase = '' - mkdir -p $out/Applications - mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app - ''; - - sandboxProfile = '' - (allow file-read* file-write* process-exec mach-lookup) - ; block homebrew dependencies - (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + runHook preInstall + APP_DIR="$out/Applications/iTerm2.app" + mkdir -p "$APP_DIR" + cp -r . "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/iterm2" + #!${stdenvNoCC.shell} + open -na "$APP_DIR" --args "$@" + EOF + chmod +x "$out/bin/iterm2" + runHook postInstall ''; meta = with lib; { description = "A replacement for Terminal and the successor to iTerm"; homepage = "https://www.iterm2.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ tricktron ]; - platforms = platforms.darwin; - hydraPlatforms = []; + maintainers = with maintainers; [ steinybot tricktron ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; } From 02de37ca072841559df7063d66a25b91d82f9538 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 7 Mar 2022 11:04:38 +0100 Subject: [PATCH 04/27] lib/modules.nix: Optimize optionSet legacy compat code It's still in the hot path. --- lib/modules.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 79d54e4a5387..4c4d9f994dae 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -761,13 +761,13 @@ rec { options = opt.options or (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); f = tp: - let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); - in if tp.name == "option set" || tp.name == "submodule" then throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." - else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) - else if optionSetIn "listOf" then types.listOf (types.submodule options) - else if optionSetIn "nullOr" then types.nullOr (types.submodule options) + else if (tp.functor.wrapped.name or null) == "optionSet" then + if tp.name == "attrsOf" then types.attrsOf (types.submodule options) + else if tp.name == "listOf" then types.listOf (types.submodule options) + else if tp.name == "nullOr" then types.nullOr (types.submodule options) + else tp else tp; in if opt.type.getSubModules or null == null From b255f6d60c7a5ea5deb25c9f8836351e958e949e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 16 Feb 2022 14:28:28 +0100 Subject: [PATCH 05/27] yosys: fix homepage The old link was now pointing at a casino website. --- pkgs/development/compilers/yosys/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 30b9b8393987..8a6645d9b561 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Open RTL synthesis framework and tools"; - homepage = "http://www.clifford.at/yosys/"; + homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ shell thoughtpolice emily ]; From 9488c22d584677bac6792f3407cb3abd9b7e772d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 16 Feb 2022 14:30:18 +0100 Subject: [PATCH 06/27] yosys: 0.12+54 -> 0.15 https://github.com/YosysHQ/yosys/releases/tag/yosys-0.15 --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 8a6645d9b561..ecdebdda849a 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.12+54"; + version = "0.15"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "59a71503448401d2476cf0872808e0a99c3a4d81"; - hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U="; + rev = "${pname}-${version}"; + hash = "sha256-1NCcsq0otVKTTSSmnX2kCvvngF1yzqYWlRVzu+XY65w="; }; enableParallelBuilding = true; From 0e4d199cbdd6ecd0d229a0ae1dccb016f37bad1b Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 8 Mar 2022 18:26:18 +0100 Subject: [PATCH 07/27] abc-verifier: 2021.11.12 -> 2022.03.04 --- pkgs/applications/science/logic/abc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index fe73f4f4d6e2..60454ca9ce99 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2021.11.12"; + version = "2022.03.04"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "f6fa2ddcfc89099726d60386befba874c7ac1e0d"; - hash = "sha256-0rvMPZ+kL0m/GjlCLx3eXYQ0osQ2wQiS3+csqPl3U9s="; + rev = "d7ecb23eeee9c9b4924182ce570c2e33eb18abff"; + hash = "sha256-aufWRTggJNOaUFsjh5+HFDqEur+nuM0hZSsTfGptbks="; }; nativeBuildInputs = [ cmake ]; From d68782e061465758105940b93e503d5c55d05173 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 10 Mar 2022 16:17:15 +0100 Subject: [PATCH 08/27] slurm-spank-stunnel: init at 0.2.2 --- .../computing/slurm-spank-stunnel/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/computing/slurm-spank-stunnel/default.nix diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/servers/computing/slurm-spank-stunnel/default.nix new file mode 100644 index 000000000000..9fdd5625f78f --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-stunnel/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, slurm } : + +stdenv.mkDerivation rec { + pname = "slurm-spank-stunnel"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "stanford-rc"; + repo = "slurm-spank-stunnel"; + rev = version; + sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj"; + }; + + buildPhase = '' + gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c + ''; + + installPhase = '' + mkdir -p $out/lib $out/etc/slurm/plugstack.conf.d + install -m 755 stunnel.so $out/lib + install -m 644 plugstack.conf $out/etc/slurm/plugstack.conf.d/stunnel.conf.example + ''; + + meta = with lib; { + homepage = "https://github.com/stanford-rc/slurm-spank-stunnel"; + description = "Plugin for SLURM for SSH tunneling and port forwarding support"; + platforms = platforms.linux; + license = licenses.gpl3Only; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62a3006dd704..5b3b98a6c3e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22098,6 +22098,8 @@ with pkgs; slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; + slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { }; + slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; From 7f36f5da9b962a0eac7f9a1b79be50a1eda052d6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 10 Mar 2022 13:37:21 -0800 Subject: [PATCH 09/27] linuxPackages.nvidiaPackages: make extensible --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9e254ee64a10..dedb8f015fc4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -324,7 +324,7 @@ in { nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); + nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; From 92dce804e3965ef1678b19619263fbe3945d2944 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 11 Mar 2022 05:56:40 +0000 Subject: [PATCH 10/27] linux-firmware: 20220209 -> 20220310 --- pkgs/os-specific/linux/firmware/linux-firmware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index 4aff785b855e..22dc930d293d 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20220209"; + version = "20220310"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/${version}"; - sha256 = "sha256-QWGnaGQrDUQeYUIBq0/63YdHZgyaF4s9fdyLA9bb6qs="; + sha256 = "sha256-U5XZHzriZaPlgiAcrZnAA7K8PKnIGy58Pi6JziVFTR8="; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-ahXZK13wrcZW/8ZCgUTHU6N4QKsL3NV98eRbYGBp3jw="; + outputHash = "sha256-CAYJssH36aKhzvl0q60HyxgDXeAluspfnLLmawmWIQw="; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; From c0ca1422e7caa1939d66234ba1601e1845d4d877 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 26 Feb 2022 02:59:36 +0800 Subject: [PATCH 11/27] linux_xanmod: 5.15.24 -> 5.15.27 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 636803f29097..b170ec044b05 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.24"; + version = "5.15.27"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-O3OadPMBl74IK92w7IPGfiePeo/Ox+bIVr4XmOmPYTg="; + sha256 = "sha256-ycUvTXDKnffxs8FKZJurX2bDr85gMQlSIFD0nST2Q98="; }; structuredExtraConfig = with lib.kernel; { From acc555907714c370f1ffcfad59775b8db219041e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 11 Mar 2022 15:07:20 +0100 Subject: [PATCH 12/27] nodePackages: fix eval Remove use of aliases so that eval succeeds with allowAliases = false --- pkgs/development/node-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 5d8064bac2d1..46f1a977775b 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -228,7 +228,7 @@ let near-cli = super.near-cli.override { nativeBuildInputs = with pkgs; [ - libusb + libusb1 nodePackages.prebuild-install nodePackages.node-gyp-build pkg-config From dde9e8d0706159a58f6cb985b3140f5bec33cf01 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 11 Mar 2022 17:26:45 +0300 Subject: [PATCH 13/27] yandex-browser: mark insecure --- .../networking/browsers/yandex-browser/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 0ea0c5515270..7df9b6b1e7a4 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -132,5 +132,12 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; + + knownVulnerabilities = [ + '' + Trusts a Russian government issued CA certificate for some websites. + See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. + '' + ]; }; } From f491e8c3326f102c0ef45f6b0abe0868d6df5bbd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 11 Mar 2022 15:42:05 +0000 Subject: [PATCH 14/27] mercurial: disable all non-essential phases in withExtensions --- pkgs/applications/version-management/mercurial/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 17d21f30e3b2..0124cf0646e5 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -181,6 +181,10 @@ in nativeBuildInputs = self.nativeBuildInputs; dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; installPhase = '' runHook preInstall From d2040a8cdfe34044a40883ca848fcfa0fc3042c6 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 11 Mar 2022 16:45:53 +0100 Subject: [PATCH 15/27] python3.pkgs.iodata: init at 0.1.7 --- .../python-modules/iodata/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/iodata/default.nix diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix new file mode 100644 index 000000000000..b81d7981a280 --- /dev/null +++ b/pkgs/development/python-modules/iodata/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, lib, fetchFromGitHub, numpy, scipy, attrs, cython, nose }: + +buildPythonPackage rec { + pname = "iodata"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "theochem"; + repo = pname; + rev = version; + hash = "sha256-Qn2xWFxdS12K92DhdHVzYrBjPRV+vYo7Cs27vkeCaxM="; + }; + + leaveDotGit = true; + + nativeBuildInputs = [ cython nose ]; + propagatedBuildInputs = [ numpy scipy attrs ]; + + pythonImportsCheck = [ "iodata" "iodata.overlap_accel" ]; + doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules + + meta = with lib; { + description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files"; + homepage = "https://github.com/theochem/iodata"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index deff0e937d51..9e9fb29a35f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4080,6 +4080,8 @@ in { invoke = callPackage ../development/python-modules/invoke { }; + iodata = callPackage ../development/python-modules/iodata { }; + iocapture = callPackage ../development/python-modules/iocapture { }; iotawattpy = callPackage ../development/python-modules/iotawattpy { }; From 5e3ca94dc35263024a5e56ba710e986d7cada2f5 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 11 Mar 2022 17:06:31 +0100 Subject: [PATCH 16/27] shadowsocks-rust: fix build (#163552) Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com> --- pkgs/tools/networking/shadowsocks-rust/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 7d06c4ac51c9..ed61740a6849 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, libiconv }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, libiconv }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; @@ -15,7 +15,10 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; cargoBuildFlags = [ "--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun" From 387905aa1436e007e2418998f186ec67e5037651 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 2 Mar 2022 10:39:09 +0100 Subject: [PATCH 17/27] gnome-randr: init at 0.1.1 --- pkgs/tools/wayland/gnome-randr/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/wayland/gnome-randr/default.nix diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/tools/wayland/gnome-randr/default.nix new file mode 100644 index 000000000000..9c88130f27b2 --- /dev/null +++ b/pkgs/tools/wayland/gnome-randr/default.nix @@ -0,0 +1,33 @@ +{ dbus +, fetchFromGitHub +, lib +, pkg-config +, rustPlatform +}: +let + version = "0.1.1"; +in +rustPlatform.buildRustPackage { + pname = "gnome-randr"; + inherit version; + + src = fetchFromGitHub { + owner = "maxwellainatchi"; + repo = "gnome-randr-rust"; + rev = "v" + version; + sha256 = "sha256-mciHgBEOCFjRA4MSoEdP7bIag0KE+zRbk4wOkB2PAn0="; + }; + + cargoSha256 = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs="; + + buildInputs = [ dbus ]; + + nativeBuildInputs = [ pkg-config ]; + + meta = { + description = "An xrandr-like CLI for configuring displays on GNOME/Wayland, on distros that don't support `wlr-randr`"; + homepage = "https://github.com/maxwellainatchi/gnome-randr-rust"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.roberth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c8b6885688..67a54d47ccc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6011,6 +6011,8 @@ with pkgs; gnome-photos = callPackage ../applications/graphics/gnome-photos { }; + gnome-randr = callPackage ../tools/wayland/gnome-randr { }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; From 3c14e6c15ee360ccd035c4c22305cc090a2e79fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 17:52:21 +0100 Subject: [PATCH 18/27] intel-media-driver: 22.1.1 -> 22.2.2 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 6a9d523f9031..380f0c1f7e25 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.1.1"; + version = "22.2.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1gv89k48s03hwvlcg484li0dznqg93z82xv9lpv3gkncvwfvh9c8"; + sha256 = "sha256-ksh8xx46x9OgXBrhJr3FnBI9g4PHXUDhLPbgpvccffM="; }; patches = [ From d2c185f31a38710533c71ab48b52cb277e3b4502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 21:57:49 +0000 Subject: [PATCH 19/27] python310Packages.glcontext: 2.3.4 -> 2.3.5 --- pkgs/development/python-modules/glcontext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index b091d2583b6b..fe25277e8cda 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = version; - sha256 = "1m2zkl696vqmgrd5k1c5kl0krk6qgjgsz88qhahwva0l40bswvhp"; + sha256 = "sha256-wvoIfwd0UBooqbJGshADjf96Xqx2k9G1nN3Dy6v3GIY="; }; disabled = !isPy3k; From 80c891c5404b138348f060f656385fb1e77b9e8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Mar 2022 04:42:28 +0000 Subject: [PATCH 20/27] python310Packages.pycurl: 7.44.1 -> 7.45.0 --- pkgs/development/python-modules/pycurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 5494360e51fc..0b87aba81655 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.44.1"; + version = "7.45.0"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8"; + sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0="; }; preConfigure = '' From 866d76bed634e1bffe02c42188336301c8a682fc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 11 Mar 2022 10:31:33 -0800 Subject: [PATCH 21/27] hqplayerd: 4.29.1-80 -> 4.30.3-87 --- pkgs/servers/hqplayerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 1f0fe8845549..7b65a789af89 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.29.1-80"; + version = "4.30.3-87"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; - sha256 = "sha256-TL5zq7fu7tLoWadmVDMXrE8oiVhHbggpmwWrIGRuAnI="; + hash = "sha256-RX9KI+4HGDUJ3y3An1zTMJTz28Of2Awn7COeX6EQc38="; }; unpackPhase = '' From 1b15c8da6c5663ffb28931300b799e7c175d2d3e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 11 Mar 2022 11:47:16 -0800 Subject: [PATCH 22/27] swaybg: 1.1 -> 1.1.1 --- pkgs/applications/window-managers/sway/bg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 6d91d8c8f46c..e98adefa4476 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaybg"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; rev = "v${version}"; - sha256 = "17508q9wsw6c1lsxlcbxj74z2naqhwi5c7lkbq24m4lk8qmy0576"; + hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; }; depsBuildBuild = [ pkg-config ]; From 131ca9006d05b9da118995829735872bca38211a Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Fri, 11 Mar 2022 17:02:41 -0500 Subject: [PATCH 23/27] bisq-desktop: 1.8.2 -> 1.8.4 --- pkgs/applications/blockchains/bisq-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 0e1e9f291128..869f8dcad05a 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "154b8whbbpnb8lk1b3an44h53gh5fdzxkg5vdfrw1ld6miy68kii"; + sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; From 2b6904e08220fd2920cf34d8c19d6d5a3fcd3117 Mon Sep 17 00:00:00 2001 From: Christopher Grainger Date: Sat, 12 Mar 2022 08:54:09 +1100 Subject: [PATCH 24/27] add cigrainger to maintainers list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 077381e8d30b..25a959650a61 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2181,6 +2181,12 @@ githubId = 42220376; name = "Charlotte Van Petegem"; }; + cigrainger = { + name = "Christopher Grainger"; + email = "chris@amplified.ai"; + github = "cigrainger"; + githubId = 3984794; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; From 327391ceb0e2870fd1c9185348cab90ba3aa0918 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 11 Mar 2022 17:16:23 -0500 Subject: [PATCH 25/27] cloudflared: 2022.2.1 -> 2022.3.1 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 954ce2292ec1..3707876fd740 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.2.1"; + version = "2022.3.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-y9TduC6Fa1p3UFvSeW9n42AUD63dp/LEagiv3xlT/4U="; + hash = "sha256-iVg+AXSBO+caeYxUR41infCvsCTZkJTf7K0oZnOQmnY="; }; vendorSha256 = null; From 1e3198063922e49fc730f973d7ebf027142220ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 23:25:45 +0100 Subject: [PATCH 26/27] qrcp: 0.8.5 -> 0.8.6 --- pkgs/tools/networking/qrcp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index 84854a4bdff3..79dc6a7fab93 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "sha256-UpSYJ/OXFObqhmGlIm73104tVfEVOjGt1r9GKLgrLtI="; + sha256 = "sha256-5HW0OtDlqUvsKMTjxmIDpmlKdo0GFj7b+6jh9TlLllI="; }; vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; From 7e0169e26db412ac4efd93d72225d23ad32a5601 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Fri, 11 Mar 2022 23:42:57 +0100 Subject: [PATCH 27/27] zellij: add manpage Add manpage to the `zellij` package. --- pkgs/tools/misc/zellij/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 20d338989cfd..3463c5ccb6de 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -8,6 +8,7 @@ , openssl , DiskArbitration , Foundation +, mandown , zellij , testVersion }: @@ -26,6 +27,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2QEDrxTz7I9hF+WfVKkGLXHWZjQ5by/zuO16NGOJSKk="; nativeBuildInputs = [ + mandown installShellFiles pkg-config ]; @@ -43,6 +45,9 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' + mandown docs/MANPAGE.md > zellij.1 + installManPage zellij.1 + installShellCompletion --cmd $pname \ --bash <($out/bin/zellij setup --generate-completion bash) \ --fish <($out/bin/zellij setup --generate-completion fish) \