Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
b21a694014
27 changed files with 200 additions and 67 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
@ -11676,6 +11682,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";
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -181,6 +181,10 @@ in
|
|||
nativeBuildInputs = self.nativeBuildInputs;
|
||||
|
||||
dontUnpack = true;
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
28
pkgs/development/python-modules/iodata/default.nix
Normal file
28
pkgs/development/python-modules/iodata/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
31
pkgs/servers/computing/slurm-spank-stunnel/default.nix
Normal file
31
pkgs/servers/computing/slurm-spank-stunnel/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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) \
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
33
pkgs/tools/wayland/gnome-randr/default.nix
Normal file
33
pkgs/tools/wayland/gnome-randr/default.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6057,6 +6057,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 { };
|
||||
|
|
@ -22105,6 +22107,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 { };
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue