mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 10:23:29 +00:00
Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
Martin Weinelt
commit
d97017184f
@ -4895,7 +4895,7 @@
|
||||
email = "nixpkgs@felipeqq2.rocks";
|
||||
github = "felipeqq2";
|
||||
githubId = 71830138;
|
||||
keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }];
|
||||
keys = [{ fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; }];
|
||||
matrix = "@felipeqq2:pub.solar";
|
||||
};
|
||||
felixscheinost = {
|
||||
@ -8693,6 +8693,12 @@
|
||||
githubId = 542154;
|
||||
name = "Lorenz Leutgeb";
|
||||
};
|
||||
lugarun = {
|
||||
email = "lfschmidt.me@gmail.com";
|
||||
github = "lugarun";
|
||||
githubId = 5767106;
|
||||
name = "Lukas Schmidt";
|
||||
};
|
||||
luis = {
|
||||
email = "luis.nixos@gmail.com";
|
||||
github = "Luis-Hebendanz";
|
||||
|
||||
@ -450,8 +450,9 @@ sub addEntry {
|
||||
|
||||
# Include second initrd with secrets
|
||||
if (-e -x "$path/append-initrd-secrets") {
|
||||
my $initrdName = basename($initrd);
|
||||
my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets";
|
||||
# Name the initrd secrets after the system from which they're derived.
|
||||
my $systemName = basename(Cwd::abs_path("$path"));
|
||||
my $initrdSecretsPath = "$bootPath/kernels/$systemName-secrets";
|
||||
|
||||
mkpath(dirname($initrdSecretsPath), 0, 0755);
|
||||
my $oldUmask = umask;
|
||||
@ -470,7 +471,7 @@ sub addEntry {
|
||||
if (-e $initrdSecretsPathTemp && ! -z _) {
|
||||
rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n";
|
||||
$copied{$initrdSecretsPath} = 1;
|
||||
$initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets";
|
||||
$initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$systemName-secrets";
|
||||
} else {
|
||||
unlink $initrdSecretsPathTemp;
|
||||
rmdir dirname($initrdSecretsPathTemp);
|
||||
|
||||
@ -152,9 +152,11 @@ let
|
||||
|
||||
${lib.optionalString cfg.useBootLoader
|
||||
''
|
||||
# Create a writable copy/snapshot of the boot disk.
|
||||
# A writable boot disk can be booted from automatically.
|
||||
${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img"
|
||||
if ${if !cfg.persistBootDevice then "true" else "! test -e $TMPDIR/disk.img"}; then
|
||||
# Create a writable copy/snapshot of the boot disk.
|
||||
# A writable boot disk can be booted from automatically.
|
||||
${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img"
|
||||
fi
|
||||
|
||||
NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${cfg.efiVars}}")
|
||||
|
||||
@ -370,6 +372,17 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.persistBootDevice =
|
||||
mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description =
|
||||
lib.mdDoc ''
|
||||
If useBootLoader is specified, whether to recreate the boot device
|
||||
on each instantiaton or allow it to persist.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.emptyDiskImages =
|
||||
mkOption {
|
||||
type = types.listOf types.ints.positive;
|
||||
@ -853,6 +866,8 @@ in
|
||||
# * The disks are attached in `virtualisation.qemu.drives`.
|
||||
# Their order makes them appear as devices `a`, `b`, etc.
|
||||
# * `fileSystems."/boot"` is adjusted to be on device `b`.
|
||||
# * The disk.img is recreated each time the VM is booted unless
|
||||
# virtualisation.persistBootDevice is set.
|
||||
|
||||
# If `useBootLoader`, GRUB goes to the second disk, see
|
||||
# note [Disk layout with `useBootLoader`].
|
||||
|
||||
@ -312,6 +312,7 @@ in {
|
||||
initrd-network-ssh = handleTest ./initrd-network-ssh {};
|
||||
initrdNetwork = handleTest ./initrd-network.nix {};
|
||||
initrd-secrets = handleTest ./initrd-secrets.nix {};
|
||||
initrd-secrets-changing = handleTest ./initrd-secrets-changing.nix {};
|
||||
input-remapper = handleTest ./input-remapper.nix {};
|
||||
inspircd = handleTest ./inspircd.nix {};
|
||||
installer = handleTest ./installer.nix {};
|
||||
|
||||
58
nixos/tests/initrd-secrets-changing.nix
Normal file
58
nixos/tests/initrd-secrets-changing.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ system ? builtins.currentSystem
|
||||
, config ? {}
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
, lib ? pkgs.lib
|
||||
, testing ? import ../lib/testing-python.nix { inherit system pkgs; }
|
||||
}:
|
||||
|
||||
let
|
||||
secret1InStore = pkgs.writeText "topsecret" "iamasecret1";
|
||||
secret2InStore = pkgs.writeText "topsecret" "iamasecret2";
|
||||
in
|
||||
|
||||
testing.makeTest {
|
||||
name = "initrd-secrets-changing";
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
virtualisation.useBootLoader = true;
|
||||
virtualisation.persistBootDevice = true;
|
||||
|
||||
boot.loader.grub.device = "/dev/vda";
|
||||
|
||||
boot.initrd.secrets = {
|
||||
"/test" = secret1InStore;
|
||||
"/run/keys/test" = secret1InStore;
|
||||
};
|
||||
boot.initrd.postMountCommands = "cp /test /mnt-root/secret-from-initramfs";
|
||||
|
||||
specialisation.secrets2System.configuration = {
|
||||
boot.initrd.secrets = lib.mkForce {
|
||||
"/test" = secret2InStore;
|
||||
"/run/keys/test" = secret2InStore;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
print(machine.succeed("cat /run/keys/test"))
|
||||
machine.succeed(
|
||||
"cmp ${secret1InStore} /secret-from-initramfs",
|
||||
"cmp ${secret1InStore} /run/keys/test",
|
||||
)
|
||||
# Select the second boot entry corresponding to the specialisation secrets2System.
|
||||
machine.succeed("grub-reboot 1")
|
||||
machine.shutdown()
|
||||
|
||||
with subtest("Check that the specialisation's secrets are distinct despite identical kernels"):
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
print(machine.succeed("cat /run/keys/test"))
|
||||
machine.succeed(
|
||||
"cmp ${secret2InStore} /secret-from-initramfs",
|
||||
"cmp ${secret2InStore} /run/keys/test",
|
||||
)
|
||||
machine.shutdown()
|
||||
'';
|
||||
}
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lighthouse";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
# lighthouse/common/deposit_contract/build.rs
|
||||
depositContractSpecVersion = "0.12.1";
|
||||
@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "sigp";
|
||||
repo = "lighthouse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-09EQr/ghgdcnek0dih0+TXyIh5qwGWmg+nhI8d9n3Jc=";
|
||||
hash = "sha256-oF32s1nfzEZbaNUi5sQSrotcyOSinULj/qrRQWdMXHg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NWG3yIgxfD1GkiQ6TyZF4lNPy9s/i/9TaTujlOtx2NI=";
|
||||
cargoHash = "sha256-T404OxWBDy8ghQDdhqt0jac+Tff8ph6D3gGnKrToXHY=";
|
||||
|
||||
buildFeatures = [ "modern" "gnosis" ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bvi";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "0a0yl0dcyff31k3dr4dpgqmlwygp8iaslnr5gmb6814ylxf2ad9h";
|
||||
sha256 = "sha256-S7oWwrSWljqbk5M2wKvMjUiGZEkggK5DqG2hjPTOlPI=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -3010,6 +3010,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/andviro/flake8-vim/";
|
||||
};
|
||||
|
||||
flatten-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "flatten.nvim";
|
||||
version = "2023-03-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "willothy";
|
||||
repo = "flatten.nvim";
|
||||
rev = "438c8b8ff8bc02e5c6650d55ec0094f56697f70a";
|
||||
sha256 = "1kby1448pqi3fgmmkkfd5ms1ln13hab3g4xnnm1cy9bppa441p24";
|
||||
};
|
||||
meta.homepage = "https://github.com/willothy/flatten.nvim/";
|
||||
};
|
||||
|
||||
flit-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "flit.nvim";
|
||||
version = "2023-03-04";
|
||||
|
||||
@ -251,6 +251,7 @@ https://github.com/j-hui/fidget.nvim/,,
|
||||
https://github.com/bogado/file-line/,,
|
||||
https://github.com/glacambre/firenvim/,HEAD,
|
||||
https://github.com/andviro/flake8-vim/,,
|
||||
https://github.com/willothy/flatten.nvim/,HEAD,
|
||||
https://github.com/ggandor/flit.nvim/,HEAD,
|
||||
https://github.com/ncm2/float-preview.nvim/,,
|
||||
https://github.com/fhill2/floating.nvim/,,
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.27";
|
||||
version = "3.5.31";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EeQs7WcNpnz2KrgUel9OF9pwW7WzKJrv5pvsZkV4RVg=";
|
||||
hash = "sha256-v6N1isaTVPwV/LC/a2lzrboLI6V/4W586RE5esfR500=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -70,6 +70,10 @@ python3Packages.buildPythonApplication rec {
|
||||
transmission-rpc
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flexget"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://flexget.com/";
|
||||
changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}";
|
||||
|
||||
36
pkgs/applications/terminal-emulators/kitty/themes.nix
Normal file
36
pkgs/applications/terminal-emulators/kitty/themes.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "kitty-themes";
|
||||
version = "unstable-2023-03-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty-themes";
|
||||
rev = "c01fcbd694353507c3cc7f657179bad1f32140a7";
|
||||
hash = "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 -t $out/share/kitty-themes/ themes.json
|
||||
mv themes $out/share/kitty-themes
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kovidgoyal/kitty-themes";
|
||||
description = "Themes for the kitty terminal emulator";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres nelsonjeppesen ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -15,13 +15,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "halide";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halide";
|
||||
repo = "Halide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/7U2TBcpSAKeEyWncAbtW6Vk/cP+rp1CXtbIjvQMmZA=";
|
||||
sha256 = "sha256-te9Yn/rmA0YSulnxXL/y5d8PFphjQPgZUDWHNn7oqMg=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" "-DTARGET_WEBASSEMBLY=OFF" ];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smooth";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "enzo1982";
|
||||
repo = "smooth";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-30qVXK54SDL2+ZPbTINZix4Ax1iOMg2WLeEDyAr77Og=";
|
||||
sha256 = "sha256-J2Do1iAbE1GBC8co/4nxOzeGJQiPRc+21fgMDpzKX+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopulse";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Wp8NUjRlO+6ASqIt3C0YJRh0EKcEukXVMp4I+TCTElo=";
|
||||
hash = "sha256-JbdJbkzd55KeM3Sf1ExvMuHRKNu5VAvGG4y+wkMS0Wo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
||||
binary protocol to issues commands to the Pulse Hub.
|
||||
'';
|
||||
homepage = "https://github.com/atmurray/aiopulse";
|
||||
changelog = "https://github.com/atmurray/aiopulse/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosomecomfort";
|
||||
version = "0.0.11";
|
||||
version = "0.0.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "mkmer";
|
||||
repo = "AIOSomecomfort";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Mn7SQnnWVYh92Ogih6nRYHAf9DiVh1zCuGw5N4r6G8E=";
|
||||
hash = "sha256-YVZSqTynlAH7y6vH07wsFCLMWnde/cBx4jjfJ4ZV3LA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.14.0";
|
||||
version = "6.14.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5VFXrBi7Pj3+9CQ4HAKZxnqsYz3lqhH3+A/gpQgEHXo=";
|
||||
hash = "sha256-3ofvEEMCwsb8tDeYp1xC1PClwH6IfCodB6C1qft3TeA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asn1tools";
|
||||
version = "0.165.0";
|
||||
version = "0.166.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "eerimoq";
|
||||
repo = "asn1tools";
|
||||
rev = version;
|
||||
hash = "sha256-E9ns4xBDHkmIET2rXsMP9/9knXZ9H0D24w5QISQrYlc=";
|
||||
hash = "sha256-TWAOML6nsLX3TYqoQ9fcSjrUmC4byXOfczfkmSaSa0k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
|
||||
# tests
|
||||
, backports-zoneinfo
|
||||
, freezegun
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
@ -27,14 +27,15 @@ buildPythonPackage rec {
|
||||
pytz
|
||||
];
|
||||
|
||||
# including backports.zoneinfo for python<3.9 yields infinite recursion
|
||||
doCheck = pythonAtLeast "3.9";
|
||||
|
||||
nativeCheckInputs = [
|
||||
# via setup.py
|
||||
freezegun
|
||||
pytestCheckHook
|
||||
# via tox.ini
|
||||
pytz
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
backports-zoneinfo
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beancount-black";
|
||||
version = "0.1.14";
|
||||
version = "0.2.0";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
format = "pyproject";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "LaunchPlatform";
|
||||
repo = "beancount-black";
|
||||
rev = version;
|
||||
hash = "sha256-4ooMskwPJJLJBfPikaHJ4xuwR1x478ecYWZdIE0UAK8=";
|
||||
hash = "sha256-1n+IADiGUsi69XoxO4Tjio2QdkJyoYZHgvYc646TuF4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.17.6";
|
||||
version = "1.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-917JTjNKvO/Gp9qvvd0Dd5Zjl+AQzUw8PfbH2MQ14Dg=";
|
||||
hash = "sha256-NB8WJJ/cZF4fbgWtU7wM0IplJ98K195Q0WcQ632Ha6U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,46 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, mock
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, service-identity
|
||||
, six
|
||||
, twisted
|
||||
, txi2p-tahoe
|
||||
, txtorcon
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "foolscap";
|
||||
version = "21.7.0";
|
||||
version = "23.3.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q=";
|
||||
hash = "sha256-Vu7oXC1brsgBwr2q59TAgx8j1AFRbi5mjRNIWZTbkUU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-tests-with-twisted-22.10.0.patch";
|
||||
url = "https://github.com/warner/foolscap/commit/c04202eb5d4cf052e650ec2985ea6037605fd79e.patch";
|
||||
hash = "sha256-RldDc18n3WYHdYg0ZmM8PBffIuiGa1NIfdoHs3mEEfc=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mock
|
||||
six
|
||||
twisted
|
||||
pyopenssl
|
||||
service-identity
|
||||
];
|
||||
] ++ twisted.optional-dependencies.tls;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
i2p = [ txi2p-tahoe ];
|
||||
tor = [ txtorcon ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Not all dependencies are present
|
||||
"src/foolscap/test/test_connection.py"
|
||||
];
|
||||
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "foolscap" ];
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fritzconnection";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "kbr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA=";
|
||||
hash = "sha256-1giXmmyuy+qrY6xV3yZn4kcDd6w6l8uCL4ozcZE4N00=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -28,6 +28,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TEMP
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fritzconnection"
|
||||
];
|
||||
@ -35,7 +39,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python module to communicate with the AVM Fritz!Box";
|
||||
homepage = "https://github.com/kbr/fritzconnection";
|
||||
changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html";
|
||||
changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/version_history.html";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda valodim ];
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ghrepo-stats";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "mrbean-bremen";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YKGVDE1cM3Lcr9lHE2iserleob0BE3DxchdSX65CJBE=";
|
||||
hash = "sha256-65+Ah1DCEkIym2ehlZkubLIE+yJynlYNwE4g1IZ+AzM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.15.0";
|
||||
version = "2.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao=";
|
||||
hash = "sha256-wysLs0seCRDadYj9aRowebq6+kMi7RZp/DITC4lqsVY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-redis";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM=";
|
||||
hash = "sha256-0uhWndF50vKVUk71DwoInQORAiR5vQyNMMA+T2p69W4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.5.19";
|
||||
version = "2.5.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+EY2x9PQ8MQsvLg4p1Oki5JLqYHatTsANLBwqS1y7kw=";
|
||||
hash = "sha256-QBFA4vq58rlW9XR1jrn2VrrsZuW+hZJHrZzSoRVZUMQ=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-builder";
|
||||
version = "7.12.5";
|
||||
version = "7.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "youtype";
|
||||
repo = "mypy_boto3_builder";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ij01EExSc4pU8eC+JPhSB8YKXkspusMRgdPhdgbUEKk=";
|
||||
hash = "sha256-9D2w1rnYf7aKOABXmePghR695dlq37bci+bVOWrQCYw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pPWnK5Xui339D10vS2QA2Og+Qg3JM8c3CbvRxksl0NY=";
|
||||
hash = "sha256-Fp+OFvFYI4o5KFGgp3E41X55FHzvP66PoB5LtMqdbjg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
113
pkgs/development/python-modules/scikit-rf/default.nix
Normal file
113
pkgs/development/python-modules/scikit-rf/default.nix
Normal file
@ -0,0 +1,113 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, scipy
|
||||
, pandas
|
||||
, matplotlib
|
||||
, tox
|
||||
, coverage
|
||||
, flake8
|
||||
, nbval
|
||||
, pyvisa
|
||||
, networkx
|
||||
, ipython
|
||||
, ipykernel
|
||||
, ipywidgets
|
||||
, jupyter-client
|
||||
, sphinx-rtd-theme
|
||||
, sphinx
|
||||
, nbsphinx
|
||||
, openpyxl
|
||||
, qtpy
|
||||
, pyqtgraph
|
||||
, pyqt5
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-rf";
|
||||
version = "0.25.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-rf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-drH1N1rKFu/zdLmLsD1jH5xUkzK37V/+nJqGQ38vsTI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
pandas
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
plot = [
|
||||
matplotlib
|
||||
];
|
||||
xlsx = [
|
||||
openpyxl
|
||||
];
|
||||
netw = [
|
||||
networkx
|
||||
];
|
||||
visa = [
|
||||
pyvisa
|
||||
];
|
||||
docs = [
|
||||
ipython
|
||||
ipykernel
|
||||
ipywidgets
|
||||
jupyter-client
|
||||
sphinx-rtd-theme
|
||||
sphinx
|
||||
nbsphinx
|
||||
openpyxl
|
||||
];
|
||||
qtapps = [
|
||||
qtpy
|
||||
pyqtgraph
|
||||
pyqt5
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
tox
|
||||
coverage
|
||||
flake8
|
||||
pytest-cov
|
||||
nbval
|
||||
matplotlib
|
||||
pyvisa
|
||||
openpyxl
|
||||
networkx
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"skrf"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library for RF/Microwave engineering";
|
||||
homepage = "https://scikit-rf.org/";
|
||||
changelog = "https://github.com/scikit-rf/scikit-rf/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ lugarun ];
|
||||
};
|
||||
}
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.20.1";
|
||||
version = "3.20.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w=";
|
||||
hash = "sha256-2MPXV+rVXZYMTZe11T8x8GKQmHZwUlkwarCkheVkERo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spur";
|
||||
version = "0.3.22";
|
||||
version = "0.3.23";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mwilliamson";
|
||||
repo = "spur.py";
|
||||
rev = version;
|
||||
hash = "sha256-YlwezAE7V4ykFsp+bJ2nYRp6HG4I9Bk7Lhq6f1Inn0s=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LTkZ1p2P9fsD+gZEQZaCS68Q6nGc4qFGMNtH75gQmXQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -33,6 +33,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python module to run commands and manipulate files locally or over SSH";
|
||||
homepage = "https://github.com/mwilliamson/spur.py";
|
||||
changelog = "https://github.com/mwilliamson/spur.py/blob/0.3.23/CHANGES";
|
||||
license = with licenses; [ bsd2 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tls-parser";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "nabla-c0d3";
|
||||
repo = "tls_parser";
|
||||
rev = version;
|
||||
hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc=";
|
||||
hash = "sha256-2XHhUDiJ1EctnYdxYFbNSVLF8dmHP9cZXjziOE9+Dew=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tplink-omada-client";
|
||||
version = "1.1.1";
|
||||
version = "1.1.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "tplink_omada_client";
|
||||
inherit version;
|
||||
hash = "sha256-Fg1rhTS9aP7C1URDfoC3w1w1IduToxYUtwTLDM3916U=";
|
||||
hash = "sha256-Ppo/vv15fcwN7qTiLO8umF6ig3C8k0Z974znviWcY8c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "7.16.4";
|
||||
version = "7.16.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OB7jW+I5oAE2TGPWmuIcXcABY1v1FMjo8UT83Xn4DB8=";
|
||||
hash = "sha256-Z/A+NcB/LpzF3JtdDA7+h0scjGWOiYx5fwAZTuyfdug=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
50
pkgs/development/python-modules/txi2p-tahoe/default.nix
Normal file
50
pkgs/development/python-modules/txi2p-tahoe/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, parsley
|
||||
, twisted
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "txi2p-tahoe";
|
||||
version = "0.3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tahoe-lafs";
|
||||
repo = "txi2p";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u/IOhxK9jWC/tTKKLsc4PexbCuki+yEtMNw7LuQKmuk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
parsley
|
||||
twisted
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "txi2p" ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} -m twisted.trial txi2p
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "I2P bindings for Twisted";
|
||||
homepage = "https://github.com/tahoe-lafs/txi2p";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -1,29 +1,50 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, jwcrypto
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, redis
|
||||
, requests
|
||||
, simplejson
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.10.0";
|
||||
pname = "websockify";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6c4cc1bc132abb4a99834bcb1b4bd72f51d35a08d08093a817646ecc226ac44e";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "novnc";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-82Fk9qbiiCD5Rts1d14sK/njeN7DcjKMKPqE7S/1WHs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
propagatedBuildInputs = [
|
||||
jwcrypto
|
||||
numpy
|
||||
redis
|
||||
requests
|
||||
simplejson
|
||||
];
|
||||
|
||||
# Ran 0 tests in 0.000s
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "websockify" ];
|
||||
pythonImportsCheck = [
|
||||
"websockify"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "WebSockets support for any application/server";
|
||||
homepage = "https://github.com/kanaka/websockify";
|
||||
license = licenses.lgpl3;
|
||||
changelog = "https://github.com/novnc/websockify/releases/tag/v${version}";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.8.0";
|
||||
version = "10.8.1";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "sha256-gWcenFKcqTDg1Ld3D40+dbw+cD4QO2JG/3Bcol2Aj6c=";
|
||||
sha256 = "sha256-xVtouHBS5zR62WsPSn2mPlxce4Hn6JZLDwg2saCOrL0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -26,7 +26,7 @@ buildGoModule rec {
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/site/yarn.lock";
|
||||
hash = "sha256-4GbM7GNZ3wHIZJIJuHw1v/SwjUNc1vi8IHRGaGwPGZQ=";
|
||||
hash = "sha256-nRmEXR9fjDxvpbnT+qpGeM0Cc/qW/kN53sKOXwZiBXY=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/..." ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micronaut";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
|
||||
sha256 = "sha256-hnECB/tqyEN0g3WIIEHg2uAzEmspB+TQUTECyOtUNy4=";
|
||||
sha256 = "sha256-k0elIvsaKnVkerBUmRSEwbP+tl4sEKfzeoWkc4uYWvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "highlight-assertions";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thehamsta";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OVf8s7zuGj5//zWJIVBfHBoA6zD+l8lqVQGn2vHsvSQ=";
|
||||
sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cS4IbFuxZCKDIAcgiKzBF/qQ6mXZb9omvMeGcU+yWpk=";
|
||||
cargoSha256 = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo=";
|
||||
|
||||
# requires nightly features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "function-runner";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shopify";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4uW7gjvQjv10evBeYdRiQFsnA67VAzL74YBNUbVciHg=";
|
||||
sha256 = "sha256-3HhtRzeOgn2fhC7qf95Wy04hI2/d9oReX9r/BTvW5nQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EZubfW4PNdBurLk3YJ/BLtDq3zxkQ3YxfWMMBa2TpWU=";
|
||||
cargoHash = "sha256-27QY+QQHR+bK7Sf8I6wWyYMwBZYJbEBe5ZK+zYEansQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, SDL2, libsecret, glib, gnutls, aria2, steam-run
|
||||
, copyDesktopItems, makeDesktopItem
|
||||
{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, SDL2, libsecret, glib, gnutls, aria2, steam-run, gst_all_1
|
||||
, copyDesktopItems, makeDesktopItem, makeWrapper
|
||||
, useSteamRun ? true }:
|
||||
|
||||
let
|
||||
@ -17,7 +17,9 @@ in
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
buildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ];
|
||||
|
||||
projectFile = "src/XIVLauncher.Core/XIVLauncher.Core.csproj";
|
||||
nugetDeps = ./deps.nix; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps`
|
||||
@ -40,6 +42,8 @@ in
|
||||
postFixup = lib.optionalString useSteamRun ''
|
||||
substituteInPlace $out/bin/XIVLauncher.Core \
|
||||
--replace 'exec' 'exec ${steam-run}/bin/steam-run'
|
||||
'' + ''
|
||||
wrapProgram $out/bin/XIVLauncher.Core --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
'';
|
||||
|
||||
executables = [ "XIVLauncher.Core" ];
|
||||
|
||||
@ -2,11 +2,14 @@
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
dxvk32_dir=@dxvk32@/bin
|
||||
dxvk64_dir=@dxvk64@/bin
|
||||
# shellcheck disable=SC2034
|
||||
{
|
||||
dxvk32_dir=@dxvk32@/bin
|
||||
dxvk64_dir=@dxvk64@/bin
|
||||
|
||||
mcfgthreads32_dir=@mcfgthreads32@/bin
|
||||
mcfgthreads64_dir=@mcfgthreads64@/bin
|
||||
mcfgthreads32_dir=@mcfgthreads32@/bin
|
||||
mcfgthreads64_dir=@mcfgthreads64@/bin
|
||||
}
|
||||
|
||||
## Defaults
|
||||
|
||||
@ -42,7 +45,7 @@ usage() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
case "${1:-}" in
|
||||
uninstall|install)
|
||||
action=$1
|
||||
shift
|
||||
@ -51,7 +54,7 @@ case "$1" in
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
if [ ! -z "${1:-}" ]; then
|
||||
if [ -n "${1:-}" ]; then
|
||||
echo "Unrecognized command: $1"
|
||||
fi
|
||||
usage
|
||||
@ -62,19 +65,19 @@ esac
|
||||
do_symlink=false
|
||||
do_makeprefix=false
|
||||
|
||||
while [ ! -z "${1:-}" ]; do
|
||||
while [ -n "${1:-}" ]; do
|
||||
case "$1" in
|
||||
--with-dxgi)
|
||||
targets[dxgi]=1
|
||||
;;
|
||||
--without-dxgi)
|
||||
unset targets[dxgi]
|
||||
unset "targets[dxgi]"
|
||||
;;
|
||||
--with-d3d10)
|
||||
targets[d3d10]=1
|
||||
;;
|
||||
--without-d3d10)
|
||||
unset targets[d3d10]
|
||||
unset "targets[d3d10]"
|
||||
;;
|
||||
-s|--symlink)
|
||||
do_symlink=true
|
||||
@ -90,7 +93,7 @@ while [ ! -z "${1:-}" ]; do
|
||||
;;
|
||||
-p|--prefix)
|
||||
shift
|
||||
if [ ! -z "${1:-}" ]; then
|
||||
if [ -n "${1:-}" ]; then
|
||||
WINEPREFIX=$1
|
||||
else
|
||||
echo "Required PREFIX missing"
|
||||
@ -223,8 +226,7 @@ uninstall_file() {
|
||||
|
||||
install_override() {
|
||||
dll=$(basename "$1")
|
||||
$wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /d native /f >/dev/null 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
if ! $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /d native /f >/dev/null 2>&1; then
|
||||
echo -e "Failed to add override for $dll"
|
||||
exit 1
|
||||
fi
|
||||
@ -232,8 +234,7 @@ install_override() {
|
||||
|
||||
uninstall_override() {
|
||||
dll=$(basename "$1")
|
||||
$wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /f > /dev/null 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
if ! $wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /f > /dev/null 2>&1; then
|
||||
echo "Failed to remove override for $dll"
|
||||
fi
|
||||
}
|
||||
@ -243,16 +244,16 @@ uninstall_override() {
|
||||
declare -A paths
|
||||
|
||||
for target in "${!targets[@]}"; do
|
||||
[ ${targets[$target]} -eq 1 ] || continue
|
||||
[ "${targets[$target]}" -eq 1 ] || continue
|
||||
for dll in ${dlls[$target]}; do
|
||||
dllname=$(basename "$dll")
|
||||
basedir=$(dirname "$dll")
|
||||
|
||||
if [ ! -z "${win32_sys_path:-}" ]; then
|
||||
if [ -n "${win32_sys_path:-}" ]; then
|
||||
basedir32=${basedir}32_dir
|
||||
paths["${!basedir32}/$dllname"]="$win32_sys_path/$dllname"
|
||||
fi
|
||||
if [ ! -z "${win64_sys_path:-}" ]; then
|
||||
if [ -n "${win64_sys_path:-}" ]; then
|
||||
basedir64=${basedir}64_dir
|
||||
paths["${!basedir64}/$dllname"]="$win64_sys_path/$dllname"
|
||||
fi
|
||||
@ -260,6 +261,6 @@ for target in "${!targets[@]}"; do
|
||||
done
|
||||
|
||||
for srcpath in "${!paths[@]}"; do
|
||||
${action}_file "$srcpath" "${paths["$srcpath"]}"
|
||||
${action}_override "$(basename srcpath)"
|
||||
"${action}_file" "$srcpath" "${paths["$srcpath"]}"
|
||||
"${action}_override" "$(basename "$srcpath" .dll)"
|
||||
done
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
{ fetchFromGitHub, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kitty-themes";
|
||||
version = "unstable-2023-01-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = pname;
|
||||
rev = "e0bb9d751033e82e455bf658744872c83f04b89d";
|
||||
sha256 = "sha256-ol/AWScGsskoxOEW32aGkJFgg8V6pIujoYIMQaVskWM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/themes
|
||||
mv themes.json $out
|
||||
mv themes/*.conf $out/themes
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kovidgoyal/kitty-themes";
|
||||
description = "Themes for the kitty terminal emulator";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ nelsonjeppesen ];
|
||||
};
|
||||
}
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.15";
|
||||
hash = "sha256-KQ/1C8/nCQL8y/eTHQNJDYb/BSjwzdrUKdK05bSwuSI=";
|
||||
version = "6.1.16";
|
||||
hash = "sha256-w44mynSAcxx9jpTfj/3LiB2eZKzOBzH2rBKzvXqKQJU=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.2.2";
|
||||
hash = "sha256-YQSaIiGzszuOSO3rYnuBeucvhVlnue24b3ECRTH55bg=";
|
||||
version = "6.2.3";
|
||||
hash = "sha256-C3Vwgk3UyD638CYeO2z+GBjmCTMVC2fwU7HyX8bxgxg=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@ -11,9 +11,9 @@ let
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.1.18"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "1gyjy01ys74apa65abgvxcj0y51vf5ixampyj3jd8lxzn4vvkih6"; #lqx
|
||||
version = "6.2.5"; #lqx
|
||||
suffix = "lqx3"; #lqx
|
||||
sha256 = "0njzx2wkdiimp4lp7sl22ldsma65kcvz287z2dj46l0sssgh3830"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
||||
@ -19,16 +19,16 @@ in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "karma";
|
||||
version = "0.112";
|
||||
version = "0.113";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prymitive";
|
||||
repo = "karma";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dzz5BgWrI5f9HlRm7Mna8JgUJlTVJia31v1In2zzcBY=";
|
||||
hash = "sha256-q0RGdwZQv8ypBcjrf0UjBSp2PlaKzM0wX5q4GzUNX9o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iYm19oAYPi3OUxp0wQsqgEkBLp3Fw2nCSdDI2vbV37w=";
|
||||
vendorHash = "sha256-8YyTHPIr5Kk7M0LH662KQw4t2CuHZ/3jD0Rzhl8ps0M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs-18_x
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
libpng, uthash , which, xnee, xorg, python3Packages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
pname = "alttab";
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "sagb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g56207IGNDnBIqZmbpcgOLcfAGKwBE0DYu2Dq0bLS8o=";
|
||||
sha256 = "sha256-AxHagyGbU3bWJ+sP2S7YjHBHsIbd/doONPgd2tsBtKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
|
||||
description = "X11 window switcher designed for minimalistic window managers or standalone X11 session";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.sgraf ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipcalc";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ipcalc";
|
||||
repo = "ipcalc";
|
||||
rev = version;
|
||||
hash = "sha256-UQq5TqK83I44ANU0yXD8YUTQWvBFLiAxmLSRtKUJ5WE=";
|
||||
hash = "sha256-HlAGAjNUjfr/Ysjiml54vph/S5pS6fTMWYJwLFr1NSI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.15.03";
|
||||
version = "0.15.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-ryZoW2N93f1jDNF+qZ8y9brPGrTLiOFi2ciIEh1Lt1c=";
|
||||
hash = "sha256-MyV2GocnmZ9BqHq5ibjHenks5aSJkKdpqUXIDPxjfms=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -10486,6 +10486,8 @@ self: super: with self; {
|
||||
|
||||
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
|
||||
|
||||
scikit-rf = callPackage ../development/python-modules/scikit-rf { };
|
||||
|
||||
scikits-odes = callPackage ../development/python-modules/scikits-odes { };
|
||||
|
||||
scikits-samplerate = callPackage ../development/python-modules/scikits-samplerate {
|
||||
@ -11937,6 +11939,8 @@ self: super: with self; {
|
||||
|
||||
txgithub = callPackage ../development/python-modules/txgithub { };
|
||||
|
||||
txi2p-tahoe = callPackage ../development/python-modules/txi2p-tahoe { };
|
||||
|
||||
txredisapi = callPackage ../development/python-modules/txredisapi { };
|
||||
|
||||
txrequests = callPackage ../development/python-modules/txrequests { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user