Merge master into staging-next
This commit is contained in:
commit
19a0988af4
|
@ -10172,7 +10172,7 @@
|
||||||
matrix = "@obfusk:matrix.org";
|
matrix = "@obfusk:matrix.org";
|
||||||
github = "obfusk";
|
github = "obfusk";
|
||||||
githubId = 1260687;
|
githubId = 1260687;
|
||||||
name = "Felix C. Stegerman";
|
name = "FC Stegerman";
|
||||||
keys = [{
|
keys = [{
|
||||||
fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D";
|
fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D";
|
||||||
}];
|
}];
|
||||||
|
|
|
@ -186,6 +186,7 @@
|
||||||
./programs/less.nix
|
./programs/less.nix
|
||||||
./programs/liboping.nix
|
./programs/liboping.nix
|
||||||
./programs/light.nix
|
./programs/light.nix
|
||||||
|
./programs/mdevctl.nix
|
||||||
./programs/mosh.nix
|
./programs/mosh.nix
|
||||||
./programs/mininet.nix
|
./programs/mininet.nix
|
||||||
./programs/msmtp.nix
|
./programs/msmtp.nix
|
||||||
|
|
18
nixos/modules/programs/mdevctl.nix
Normal file
18
nixos/modules/programs/mdevctl.nix
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
cfg = config.programs.mdevctl;
|
||||||
|
in {
|
||||||
|
options.programs.mdevctl = {
|
||||||
|
enable = mkEnableOption (lib.mdDoc "Mediated Device Management");
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [ mdevctl ];
|
||||||
|
|
||||||
|
environment.etc."mdevctl.d/scripts.d/notifiers/.keep".text = "";
|
||||||
|
environment.etc."mdevctl.d/scripts.d/callouts/.keep".text = "";
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
|
@ -392,6 +392,24 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
failDelay = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
If enabled, this will replace the `FAIL_DELAY` setting from `login.defs`.
|
||||||
|
Change the delay on failure per-application.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
delay = mkOption {
|
||||||
|
default = 3000000;
|
||||||
|
type = types.int;
|
||||||
|
example = 1000000;
|
||||||
|
description = lib.mdDoc "The delay time (in microseconds) on failure.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
gnupg = {
|
gnupg = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
@ -531,6 +549,7 @@ let
|
||||||
|| cfg.enableGnomeKeyring
|
|| cfg.enableGnomeKeyring
|
||||||
|| cfg.googleAuthenticator.enable
|
|| cfg.googleAuthenticator.enable
|
||||||
|| cfg.gnupg.enable
|
|| cfg.gnupg.enable
|
||||||
|
|| cfg.failDelay.enable
|
||||||
|| cfg.duoSecurity.enable))
|
|| cfg.duoSecurity.enable))
|
||||||
(
|
(
|
||||||
''
|
''
|
||||||
|
@ -551,6 +570,9 @@ let
|
||||||
optionalString cfg.gnupg.enable ''
|
optionalString cfg.gnupg.enable ''
|
||||||
auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"}
|
auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"}
|
||||||
'' +
|
'' +
|
||||||
|
optionalString cfg.failDelay.enable ''
|
||||||
|
auth optional ${pkgs.pam}/lib/security/pam_faildelay.so delay=${toString cfg.failDelay.delay}
|
||||||
|
'' +
|
||||||
optionalString cfg.googleAuthenticator.enable ''
|
optionalString cfg.googleAuthenticator.enable ''
|
||||||
auth required ${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so no_increment_hotp
|
auth required ${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so no_increment_hotp
|
||||||
'' +
|
'' +
|
||||||
|
|
|
@ -206,7 +206,7 @@ in
|
||||||
|
|
||||||
daemonIOSchedPriority = mkOption {
|
daemonIOSchedPriority = mkOption {
|
||||||
type = types.int;
|
type = types.int;
|
||||||
default = 0;
|
default = 4;
|
||||||
example = 1;
|
example = 1;
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Nix daemon process I/O scheduling priority. This priority propagates
|
Nix daemon process I/O scheduling priority. This priority propagates
|
||||||
|
|
|
@ -391,6 +391,19 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# the target is required to start new peer units when they are added
|
||||||
|
generateInterfaceTarget = name: values:
|
||||||
|
let
|
||||||
|
mkPeerUnit = peer: (peerUnitServiceName name peer.publicKey (peer.dynamicEndpointRefreshSeconds != 0)) + ".service";
|
||||||
|
in
|
||||||
|
nameValuePair "wireguard-${name}"
|
||||||
|
rec {
|
||||||
|
description = "WireGuard Tunnel - ${name}";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
wants = [ "wireguard-${name}.service" ] ++ map mkPeerUnit values.peers;
|
||||||
|
after = wants;
|
||||||
|
};
|
||||||
|
|
||||||
generateInterfaceUnit = name: values:
|
generateInterfaceUnit = name: values:
|
||||||
# exactly one way to specify the private key must be set
|
# exactly one way to specify the private key must be set
|
||||||
#assert (values.privateKey != null) != (values.privateKeyFile != null);
|
#assert (values.privateKey != null) != (values.privateKeyFile != null);
|
||||||
|
@ -409,7 +422,6 @@ let
|
||||||
after = [ "network-pre.target" ];
|
after = [ "network-pre.target" ];
|
||||||
wants = [ "network.target" ];
|
wants = [ "network.target" ];
|
||||||
before = [ "network.target" ];
|
before = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
environment.DEVICE = name;
|
environment.DEVICE = name;
|
||||||
path = with pkgs; [ kmod iproute2 wireguard-tools ];
|
path = with pkgs; [ kmod iproute2 wireguard-tools ];
|
||||||
|
|
||||||
|
@ -540,6 +552,8 @@ in
|
||||||
// (mapAttrs' generateKeyServiceUnit
|
// (mapAttrs' generateKeyServiceUnit
|
||||||
(filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces));
|
(filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces));
|
||||||
|
|
||||||
});
|
systemd.targets = mapAttrs' generateInterfaceTarget cfg.interfaces;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -321,5 +321,6 @@ in {
|
||||||
"proc-sys-fs-binfmt_misc.mount"
|
"proc-sys-fs-binfmt_misc.mount"
|
||||||
"systemd-binfmt.service"
|
"systemd-binfmt.service"
|
||||||
];
|
];
|
||||||
|
systemd.services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,8 +10,8 @@ let
|
||||||
inherit tiling_wm;
|
inherit tiling_wm;
|
||||||
};
|
};
|
||||||
stableVersion = {
|
stableVersion = {
|
||||||
version = "2021.3.1.16"; # "Android Studio Dolphin (2021.3.1)"
|
version = "2021.3.1.17"; # "Android Studio Dolphin (2021.3.1)"
|
||||||
sha256Hash = "GnJbWFeG9DuUQzbK9wM2BEbj9LXm4jQFf/Eh5Q75HZo=";
|
sha256Hash = "sha256-ia2wzg/6RreJTnv+2xQrH11SxDwXHmpsualaSfd3Vso=";
|
||||||
};
|
};
|
||||||
betaVersion = {
|
betaVersion = {
|
||||||
version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2"
|
version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2"
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonApplication
|
, python3
|
||||||
, fetchPypi
|
|
||||||
, alsa-utils
|
, alsa-utils
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, libappindicator-gtk3
|
, libappindicator-gtk3
|
||||||
|
@ -10,14 +9,10 @@
|
||||||
, xprintidle
|
, xprintidle
|
||||||
, xprop
|
, xprop
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, babel
|
|
||||||
, psutil
|
|
||||||
, xlib
|
|
||||||
, pygobject3
|
|
||||||
, dbus-python
|
|
||||||
, croniter
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
with python3.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "safeeyes";
|
pname = "safeeyes";
|
||||||
version = "2.1.3";
|
version = "2.1.3";
|
||||||
|
|
|
@ -87,7 +87,7 @@ let
|
||||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||||
|
|
||||||
# Upstream source
|
# Upstream source
|
||||||
version = "11.5.6";
|
version = "11.5.7";
|
||||||
|
|
||||||
lang = "en-US";
|
lang = "en-US";
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ let
|
||||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||||
];
|
];
|
||||||
sha256 = "sha256-DTMY6n7GXokOz6WSrvFUkC64Siuo1Zy80A4UDolmIME=";
|
sha256 = "sha256-K50T9Fe6tMuP1J5gfwK9f/25ZeakQ9vsJi4IOPa6fMk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
i686-linux = fetchurl {
|
i686-linux = fetchurl {
|
||||||
|
@ -109,7 +109,7 @@ let
|
||||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||||
];
|
];
|
||||||
sha256 = "sha256-2/fGt+m/EDoeaSune32zmktHVHt8zH2wCr8+stewKCs=";
|
sha256 = "sha256-tbL/iTI3vR0gdMcLwOoWlfIDZNefIKA2hfvWKNNM9vE=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gotktrix";
|
pname = "gotktrix";
|
||||||
version = "0.1.4";
|
version = "unstable-2022-09-29";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "diamondburned";
|
owner = "diamondburned";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "3d9e8ac4810f7cb9d9ead7b4b13ffa6f5da8927f"; # compound
|
||||||
sha256 = "sha256-ZaE7L43fA9L5WbTAsBiIxlwYgjl1hMrtfrraAROz+7k=";
|
sha256 = "sha256-VIV4vSntu3oCIE23f5fiYj8cxcKY1n4M4Xkf0MGhvxI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-k6T44aH1NogyrbUnflfEHkp0zpOOH1YFly/X2kwbMzs=";
|
vendorSha256 = "sha256-R55tfTJL/bgNWTgmuBFRxIQleKS9zeDqvfez2VyzqjI=";
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk4
|
gtk4
|
||||||
|
@ -32,8 +32,12 @@ buildGoModule rec {
|
||||||
# Checking requires a working display
|
# Checking requires a working display
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
postInstall = ''
|
postPatch = ''
|
||||||
|
sed -i '/DBusActivatable/d' .nix/com.github.diamondburned.gotktrix.desktop
|
||||||
echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop
|
echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/
|
install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/
|
||||||
install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png
|
install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -21,12 +21,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mutt";
|
pname = "mutt";
|
||||||
version = "2.2.7";
|
version = "2.2.8";
|
||||||
outputs = [ "out" "doc" "info" ];
|
outputs = [ "out" "doc" "info" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||||
sha256 = "6xOFj1i7Np9He/ZS2Q6baq3dDWEKy+o0VQSeXvrTbfE=";
|
sha256 = "A/PSN6LuKh0WM2QXyaXxe0nPcEXu/qYCHwggu/hdClM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optional smimeSupport (fetchpatch {
|
patches = lib.optional smimeSupport (fetchpatch {
|
||||||
|
|
|
@ -13,10 +13,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags =
|
||||||
# Link the executable with the shared library
|
# Link the executable with the shared library on system with shared libraries.
|
||||||
"-DCMARK_STATIC=OFF"
|
lib.optional (!stdenv.hostPlatform.isStatic) "-DCMARK_STATIC=OFF"
|
||||||
];
|
# Do not attempt to build .so library on static platform.
|
||||||
|
++ lib.optional stdenv.hostPlatform.isStatic "-DCMARK_SHARED=OFF";
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
separateDebugInfo = stdenv.isLinux;
|
# https://github.com/NixOS/nixpkgs/issues/153528
|
||||||
|
# Can't be linked within a 4GB address space.
|
||||||
|
separateDebugInfo = stdenv.isLinux && !stdenv.is32bit;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||||
|
|
|
@ -1,27 +1,47 @@
|
||||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
|
{ lib
|
||||||
, cython, numpy
|
, buildPythonPackage
|
||||||
|
, cython
|
||||||
|
, fetchFromGitHub
|
||||||
|
, numpy
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "2.6.0";
|
|
||||||
pname = "gsd";
|
pname = "gsd";
|
||||||
disabled = isPy27;
|
version = "2.6.1";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "glotzerlab";
|
owner = "glotzerlab";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-GVb05uy5HKIn+fARFBN+mK54y2CtFBM8At21VUFr7tc=";
|
hash = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cython ];
|
nativeBuildInputs = [
|
||||||
propagatedBuildInputs = [ numpy ];
|
cython
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
numpy
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"gsd"
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
pushd gsd/test
|
pushd gsd/test
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postCheck = ''
|
postCheck = ''
|
||||||
popd
|
popd
|
||||||
'';
|
'';
|
||||||
|
@ -30,6 +50,6 @@ buildPythonPackage rec {
|
||||||
description = "General simulation data file format";
|
description = "General simulation data file format";
|
||||||
homepage = "https://github.com/glotzerlab/gsd";
|
homepage = "https://github.com/glotzerlab/gsd";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
maintainers = [ maintainers.costrouc ];
|
maintainers = with maintainers; [ costrouc ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyinfra";
|
pname = "pyinfra";
|
||||||
version = "2.5.1";
|
version = "2.5.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||||
owner = "Fizzadar";
|
owner = "Fizzadar";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-cN7nyjdnU/ls3HNhC2m1sunRrmZFT5pFZr+kEBcwHkU=";
|
hash = "sha256-35qM6u3I8yH1E8mrlaeFjhliOVTkMXH13b8S6e9ROig=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -18,6 +18,7 @@ buildPythonPackage rec {
|
||||||
homepage = "https://sourceforge.net/p/raspberry-gpio-python";
|
homepage = "https://sourceforge.net/p/raspberry-gpio-python";
|
||||||
description = "Python module to control the GPIO on a Raspberry Pi";
|
description = "Python module to control the GPIO on a Raspberry Pi";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ onny ];
|
maintainers = with maintainers; [ onny ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,13 +15,13 @@
|
||||||
|
|
||||||
let ccache = stdenv.mkDerivation rec {
|
let ccache = stdenv.mkDerivation rec {
|
||||||
pname = "ccache";
|
pname = "ccache";
|
||||||
version = "4.7.2";
|
version = "4.7.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-djqqXw6SSxH0ki1905hvRrCa1vYKDRFIsCvZ2vat/CM=";
|
sha256 = "sha256-i5VOKBNAzu65Ha3Lj3Hh6k+EMGPRAo5/qnwnJipDnMI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "sshs";
|
pname = "sshs";
|
||||||
version = "3.3.0";
|
version = "3.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quantumsheep";
|
owner = "quantumsheep";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "OTyk3EGlpr5k6QSwGmHFoF3cAJKQEEkWJuV53Wi8ook=";
|
sha256 = "KD971dGm1oQt9GbiUGZm2k4SJrBAA9rnHj7Gu0t3SJw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "wClgX08UbItCpWOkWLgmsy7Ad5LlpvXrStN3JHujVww=";
|
vendorSha256 = "OCh37wjSs40Q0VQmoc1nXQ4nWddnoUCrI5xgxpxR/Ec=";
|
||||||
|
|
||||||
ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ];
|
ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ];
|
||||||
|
|
||||||
|
|
30
pkgs/os-specific/linux/mdevctl/default.nix
Normal file
30
pkgs/os-specific/linux/mdevctl/default.nix
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
{ lib, fetchFromGitHub
|
||||||
|
, rustPackages, pkg-config, docutils
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPackages.rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
|
pname = "mdevctl";
|
||||||
|
version = "1.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = pname;
|
||||||
|
repo = pname;
|
||||||
|
rev = "v" + version;
|
||||||
|
hash = "sha256-Hgl+HsWAYIdabHJdPbCaBNnhY49vpuIjR3l6z2CAmx0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoPatches = [ ./lock.patch ];
|
||||||
|
|
||||||
|
cargoHash = "sha256-PXVc7KUMPze06gCnD2gqzlySwPumOw/z31CTd0UHp9w=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkg-config docutils ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/mdevctl/mdevctl";
|
||||||
|
description = "A mediated device management utility for linux";
|
||||||
|
license = licenses.lgpl21Only;
|
||||||
|
maintainers = with maintainers; [ edwtjo ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
446
pkgs/os-specific/linux/mdevctl/lock.patch
Normal file
446
pkgs/os-specific/linux/mdevctl/lock.patch
Normal file
|
@ -0,0 +1,446 @@
|
||||||
|
---
|
||||||
|
Cargo.lock | 432 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 432 insertions(+)
|
||||||
|
create mode 100644 Cargo.lock
|
||||||
|
|
||||||
|
diff --git a/Cargo.lock b/Cargo.lock
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..b91a26d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Cargo.lock
|
||||||
|
@@ -0,0 +1,432 @@
|
||||||
|
+# This file is automatically @generated by Cargo.
|
||||||
|
+# It is not intended for manual editing.
|
||||||
|
+version = 3
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "aho-corasick"
|
||||||
|
+version = "0.7.19"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
|
||||||
|
+dependencies = [
|
||||||
|
+ "memchr",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "anyhow"
|
||||||
|
+version = "1.0.66"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "atty"
|
||||||
|
+version = "0.2.14"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||||
|
+dependencies = [
|
||||||
|
+ "hermit-abi",
|
||||||
|
+ "libc",
|
||||||
|
+ "winapi",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "autocfg"
|
||||||
|
+version = "1.1.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "bitflags"
|
||||||
|
+version = "1.3.2"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "cfg-if"
|
||||||
|
+version = "1.0.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "clap"
|
||||||
|
+version = "3.2.23"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
|
||||||
|
+dependencies = [
|
||||||
|
+ "atty",
|
||||||
|
+ "bitflags",
|
||||||
|
+ "clap_derive",
|
||||||
|
+ "clap_lex",
|
||||||
|
+ "indexmap",
|
||||||
|
+ "once_cell",
|
||||||
|
+ "strsim",
|
||||||
|
+ "termcolor",
|
||||||
|
+ "textwrap",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "clap_complete"
|
||||||
|
+version = "3.2.5"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
|
||||||
|
+dependencies = [
|
||||||
|
+ "clap",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "clap_derive"
|
||||||
|
+version = "3.2.18"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
|
||||||
|
+dependencies = [
|
||||||
|
+ "heck",
|
||||||
|
+ "proc-macro-error",
|
||||||
|
+ "proc-macro2",
|
||||||
|
+ "quote",
|
||||||
|
+ "syn",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "clap_lex"
|
||||||
|
+version = "0.2.4"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
||||||
|
+dependencies = [
|
||||||
|
+ "os_str_bytes",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "env_logger"
|
||||||
|
+version = "0.8.4"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
|
||||||
|
+dependencies = [
|
||||||
|
+ "atty",
|
||||||
|
+ "humantime",
|
||||||
|
+ "log",
|
||||||
|
+ "regex",
|
||||||
|
+ "termcolor",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "fastrand"
|
||||||
|
+version = "1.8.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
|
||||||
|
+dependencies = [
|
||||||
|
+ "instant",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "getrandom"
|
||||||
|
+version = "0.2.8"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
|
||||||
|
+dependencies = [
|
||||||
|
+ "cfg-if",
|
||||||
|
+ "libc",
|
||||||
|
+ "wasi",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "hashbrown"
|
||||||
|
+version = "0.12.3"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "heck"
|
||||||
|
+version = "0.4.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "hermit-abi"
|
||||||
|
+version = "0.1.19"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||||
|
+dependencies = [
|
||||||
|
+ "libc",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "humantime"
|
||||||
|
+version = "2.1.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "indexmap"
|
||||||
|
+version = "1.9.1"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
|
||||||
|
+dependencies = [
|
||||||
|
+ "autocfg",
|
||||||
|
+ "hashbrown",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "instant"
|
||||||
|
+version = "0.1.12"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
|
||||||
|
+dependencies = [
|
||||||
|
+ "cfg-if",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "itoa"
|
||||||
|
+version = "1.0.4"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "libc"
|
||||||
|
+version = "0.2.136"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "55edcf6c0bb319052dea84732cf99db461780fd5e8d3eb46ab6ff312ab31f197"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "log"
|
||||||
|
+version = "0.4.17"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||||
|
+dependencies = [
|
||||||
|
+ "cfg-if",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "mdevctl"
|
||||||
|
+version = "1.2.0"
|
||||||
|
+dependencies = [
|
||||||
|
+ "anyhow",
|
||||||
|
+ "clap",
|
||||||
|
+ "clap_complete",
|
||||||
|
+ "env_logger",
|
||||||
|
+ "log",
|
||||||
|
+ "serde_json",
|
||||||
|
+ "tempfile",
|
||||||
|
+ "uuid",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "memchr"
|
||||||
|
+version = "2.5.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "once_cell"
|
||||||
|
+version = "1.15.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "os_str_bytes"
|
||||||
|
+version = "6.3.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "proc-macro-error"
|
||||||
|
+version = "1.0.4"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||||
|
+dependencies = [
|
||||||
|
+ "proc-macro-error-attr",
|
||||||
|
+ "proc-macro2",
|
||||||
|
+ "quote",
|
||||||
|
+ "syn",
|
||||||
|
+ "version_check",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "proc-macro-error-attr"
|
||||||
|
+version = "1.0.4"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||||
|
+dependencies = [
|
||||||
|
+ "proc-macro2",
|
||||||
|
+ "quote",
|
||||||
|
+ "version_check",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "proc-macro2"
|
||||||
|
+version = "1.0.47"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
|
||||||
|
+dependencies = [
|
||||||
|
+ "unicode-ident",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "quote"
|
||||||
|
+version = "1.0.21"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
||||||
|
+dependencies = [
|
||||||
|
+ "proc-macro2",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "redox_syscall"
|
||||||
|
+version = "0.2.16"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||||
|
+dependencies = [
|
||||||
|
+ "bitflags",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "regex"
|
||||||
|
+version = "1.6.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
|
||||||
|
+dependencies = [
|
||||||
|
+ "aho-corasick",
|
||||||
|
+ "memchr",
|
||||||
|
+ "regex-syntax",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "regex-syntax"
|
||||||
|
+version = "0.6.27"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "remove_dir_all"
|
||||||
|
+version = "0.5.3"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
||||||
|
+dependencies = [
|
||||||
|
+ "winapi",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "ryu"
|
||||||
|
+version = "1.0.11"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "serde"
|
||||||
|
+version = "1.0.147"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "serde_json"
|
||||||
|
+version = "1.0.87"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
|
||||||
|
+dependencies = [
|
||||||
|
+ "indexmap",
|
||||||
|
+ "itoa",
|
||||||
|
+ "ryu",
|
||||||
|
+ "serde",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "strsim"
|
||||||
|
+version = "0.10.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "syn"
|
||||||
|
+version = "1.0.103"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
|
||||||
|
+dependencies = [
|
||||||
|
+ "proc-macro2",
|
||||||
|
+ "quote",
|
||||||
|
+ "unicode-ident",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "tempfile"
|
||||||
|
+version = "3.3.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
|
||||||
|
+dependencies = [
|
||||||
|
+ "cfg-if",
|
||||||
|
+ "fastrand",
|
||||||
|
+ "libc",
|
||||||
|
+ "redox_syscall",
|
||||||
|
+ "remove_dir_all",
|
||||||
|
+ "winapi",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "termcolor"
|
||||||
|
+version = "1.1.3"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
|
||||||
|
+dependencies = [
|
||||||
|
+ "winapi-util",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "textwrap"
|
||||||
|
+version = "0.16.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "unicode-ident"
|
||||||
|
+version = "1.0.5"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "uuid"
|
||||||
|
+version = "0.8.2"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
|
||||||
|
+dependencies = [
|
||||||
|
+ "getrandom",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "version_check"
|
||||||
|
+version = "0.9.4"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "wasi"
|
||||||
|
+version = "0.11.0+wasi-snapshot-preview1"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "winapi"
|
||||||
|
+version = "0.3.9"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||||
|
+dependencies = [
|
||||||
|
+ "winapi-i686-pc-windows-gnu",
|
||||||
|
+ "winapi-x86_64-pc-windows-gnu",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "winapi-i686-pc-windows-gnu"
|
||||||
|
+version = "0.4.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "winapi-util"
|
||||||
|
+version = "0.1.5"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||||
|
+dependencies = [
|
||||||
|
+ "winapi",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
+[[package]]
|
||||||
|
+name = "winapi-x86_64-pc-windows-gnu"
|
||||||
|
+version = "0.4.0"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
|
--
|
||||||
|
2.37.2
|
||||||
|
|
|
@ -5,13 +5,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "rtw88";
|
pname = "rtw88";
|
||||||
version = "unstable-2022-06-03";
|
version = "unstable-2022-11-05";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lwfinger";
|
owner = "lwfinger";
|
||||||
repo = "rtw88";
|
repo = "rtw88";
|
||||||
rev = "03da251c76ea1005b42625825c39181e12d75693";
|
rev = "c0dfe571fd7b307e036f186ef5711b4c0d9f3f08";
|
||||||
sha256 = "0l5ysp4x5wzrn48sfjv3rciqhq5ldcmk86b9x6j9775zjj7yw8hw";
|
sha256 = "1gc5nv5pyrfag826z36vsrbirg6iww99yx45pcgpp7rmrpbwamvg";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
|
@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
||||||
license = with licenses; [ bsd3 gpl2Only ];
|
license = with licenses; [ bsd3 gpl2Only ];
|
||||||
maintainers = with maintainers; [ tvorog atila ];
|
maintainers = with maintainers; [ tvorog atila ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
broken = kernel.kernelOlder "4.14";
|
broken = kernel.kernelOlder "4.20";
|
||||||
priority = -1;
|
priority = -1;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unrar, ffmpeg, nixosTests }:
|
{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unrar, ffmpeg, nixosTests }:
|
||||||
|
|
||||||
|
let
|
||||||
|
runtimeProgDeps = [
|
||||||
|
ffmpeg
|
||||||
|
unrar
|
||||||
|
];
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bazarr";
|
pname = "bazarr";
|
||||||
version = "1.1.2";
|
version = "1.1.2";
|
||||||
|
@ -13,16 +19,26 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip makeWrapper ];
|
nativeBuildInputs = [ unzip makeWrapper ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
(python3.withPackages (ps: [ ps.lxml ps.numpy ps.gevent ps.gevent-websocket ]))
|
||||||
|
] ++ runtimeProgDeps;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/{bin,share/${pname}-${version}}
|
runHook preInstall
|
||||||
cp -r * $out/share/${pname}-${version}
|
|
||||||
makeWrapper "${
|
mkdir -p "$out"/{bin,share/${pname}}
|
||||||
(python3.withPackages
|
cp -r * "$out/share/${pname}"
|
||||||
(ps: [ ps.lxml ps.numpy ps.gevent ps.gevent-websocket ])).interpreter
|
|
||||||
}" \
|
# Add missing shebang and execute perms so that patchShebangs can do its
|
||||||
$out/bin/bazarr \
|
# thing.
|
||||||
--add-flags "$out/share/${pname}-${version}/bazarr.py" \
|
sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py"
|
||||||
--suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]}
|
chmod +x "$out/share/${pname}/bazarr.py"
|
||||||
|
|
||||||
|
makeWrapper "$out/share/${pname}/bazarr.py" \
|
||||||
|
"$out/bin/bazarr" \
|
||||||
|
--suffix PATH : ${lib.makeBinPath runtimeProgDeps}
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "kronometer";
|
pname = "kronometer";
|
||||||
version = "2.2.3";
|
version = "2.3.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
|
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
|
||||||
sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm";
|
sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -11155,7 +11155,7 @@ with pkgs;
|
||||||
|
|
||||||
safe-rm = callPackage ../tools/system/safe-rm { };
|
safe-rm = callPackage ../tools/system/safe-rm { };
|
||||||
|
|
||||||
safeeyes = with python3.pkgs; toPythonApplication safeeyes;
|
safeeyes = callPackage ../applications/misc/safeeyes { };
|
||||||
|
|
||||||
sagoin = callPackage ../tools/misc/sagoin { };
|
sagoin = callPackage ../tools/misc/sagoin { };
|
||||||
|
|
||||||
|
@ -25333,6 +25333,8 @@ with pkgs;
|
||||||
mdadm = mdadm4;
|
mdadm = mdadm4;
|
||||||
mdadm4 = callPackage ../os-specific/linux/mdadm { };
|
mdadm4 = callPackage ../os-specific/linux/mdadm { };
|
||||||
|
|
||||||
|
mdevctl = callPackage ../os-specific/linux/mdevctl { };
|
||||||
|
|
||||||
metastore = callPackage ../os-specific/linux/metastore { };
|
metastore = callPackage ../os-specific/linux/metastore { };
|
||||||
|
|
||||||
mingetty = callPackage ../os-specific/linux/mingetty { };
|
mingetty = callPackage ../os-specific/linux/mingetty { };
|
||||||
|
|
|
@ -9901,8 +9901,6 @@ self: super: with self; {
|
||||||
|
|
||||||
safe = callPackage ../development/python-modules/safe { };
|
safe = callPackage ../development/python-modules/safe { };
|
||||||
|
|
||||||
safeeyes = callPackage ../applications/misc/safeeyes { };
|
|
||||||
|
|
||||||
safeio = callPackage ../development/python-modules/safeio { };
|
safeio = callPackage ../development/python-modules/safeio { };
|
||||||
|
|
||||||
safety = callPackage ../development/python-modules/safety { };
|
safety = callPackage ../development/python-modules/safety { };
|
||||||
|
|
Loading…
Reference in a new issue