Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
sternenseemann
commit
d66b8dfa96
24 changed files with 162 additions and 108 deletions
|
|
@ -22,13 +22,9 @@ with lib;
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
kernelPackages.hid-nintendo
|
||||
cfg.package
|
||||
];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
boot.extraModulePackages = [ kernelPackages.hid-nintendo ];
|
||||
boot.kernelModules = [ "hid_nintendo" ];
|
||||
boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo;
|
||||
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
cfg4 = config.services.dhcpd4;
|
||||
cfg6 = config.services.dhcpd6;
|
||||
|
||||
writeConfig = cfg: pkgs.writeText "dhcpd.conf"
|
||||
writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf"
|
||||
''
|
||||
default-lease-time 600;
|
||||
max-lease-time 7200;
|
||||
|
|
@ -21,7 +21,9 @@ let
|
|||
(machine: ''
|
||||
host ${machine.hostName} {
|
||||
hardware ethernet ${machine.ethernetAddress};
|
||||
fixed-address ${machine.ipAddress};
|
||||
fixed-address${
|
||||
optionalString (postfix == "6") postfix
|
||||
} ${machine.ipAddress};
|
||||
}
|
||||
'')
|
||||
cfg.machines
|
||||
|
|
@ -33,7 +35,7 @@ let
|
|||
configFile =
|
||||
if cfg.configFile != null
|
||||
then cfg.configFile
|
||||
else writeConfig cfg;
|
||||
else writeConfig postfix cfg;
|
||||
leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";
|
||||
args = [
|
||||
"@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluej";
|
||||
version = "5.0.2";
|
||||
version = "5.0.3";
|
||||
src = fetchurl {
|
||||
# We use the deb here. First instinct might be to go for the "generic" JAR
|
||||
# download, but that is actually a graphical installer that is much harder
|
||||
# to unpack than the deb.
|
||||
url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb";
|
||||
sha256 = "sha256-9sWfVQF/wCiVDKBmesMpM+5BHjFUPszm6U1SgJNQ8lE=";
|
||||
sha256 = "sha256-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
52
pkgs/applications/emulators/flycast/default.nix
Normal file
52
pkgs/applications/emulators/flycast/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, libX11
|
||||
, libevdev
|
||||
, udev
|
||||
, libpulseaudio
|
||||
, SDL2
|
||||
, libzip
|
||||
, miniupnpc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flycast";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MzHAGK++oukIs84OR/l6gBwCJssdi8Iyte5Rtro2+Q0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libX11
|
||||
libevdev
|
||||
udev
|
||||
libpulseaudio
|
||||
SDL2
|
||||
libzip
|
||||
miniupnpc
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/flyinghead/flycast";
|
||||
changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}";
|
||||
description = "A multi-platform Sega Dreamcast, Naomi and Atomiswave emulator";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, curl
|
||||
, alsa-lib
|
||||
, libGLU
|
||||
, libX11
|
||||
, libevdev
|
||||
, udev
|
||||
, libpulseaudio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reicast";
|
||||
version = "20.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reicast";
|
||||
repo = "reicast-emulator";
|
||||
rev = "r${version}";
|
||||
sha256 = "0vz3b1hg1qj6nycnqq5zcpzqpcbxw1c2ffamia5z3x7rapjx5d71";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
curl
|
||||
alsa-lib
|
||||
libGLU
|
||||
libX11
|
||||
libevdev
|
||||
udev
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
# No rule to make target 'install'
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D ./reicast $out/bin/reicast
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://reicast.com/";
|
||||
description = "A multi-platform Sega Dreamcast emulator";
|
||||
license = with licenses; [ bsd3 gpl2Only lgpl2Only ];
|
||||
platforms = ["x86_64-linux" ];
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "17.2.1";
|
||||
version = "17.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "28019774a18f6e74c0d126346ae3551b5eb9c73aae13fe87f6d49120c183697a";
|
||||
sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -179,6 +179,14 @@ buildStdenv.mkDerivation ({
|
|||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# RDD Sandbox paths for NixOS, remove with Firefox>=100
|
||||
# https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1761692
|
||||
name = "mozbz-1761692-rdd-sandbox-paths.patch";
|
||||
url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14";
|
||||
hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
|
||||
++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch
|
||||
|
|
|
|||
31
pkgs/applications/networking/cluster/krelay/default.nix
Normal file
31
pkgs/applications/networking/cluster/krelay/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "krelay";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knight42";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7P+pGiML/1aZEpYAWtAPEhrBAo8e8ATcemrH8tD73w8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PrL3GYP5K6ZaSAShwuDQA7WfOVJeQraxZ8jrtnajR9g=";
|
||||
|
||||
subPackages = [ "cmd/client" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/knight42/krelay/pkg/constants.ClientVersion=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/client $out/bin/kubectl-relay
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A better alternative to `kubectl port-forward` that can forward TCP or UDP traffic to IP/Host which is accessible inside the cluster.";
|
||||
homepage = "https://github.com/knight42/krelay";
|
||||
changelog = "https://github.com/knight42/krelay/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivankovnatsky ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.26.2";
|
||||
version = "0.26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UYvTsoNJwH8DOa/Ns9QlckcMVf/+k9/5UX8gO/el0jw=";
|
||||
sha256 = "sha256-jrVf6vNlEkTgALS93o3kIiticvsyFHm5oA2Fh1edAGY=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "ipaddr-cstruct";
|
||||
|
||||
inherit (ipaddr) version src useDune2 minimumOCamlVersion;
|
||||
inherit (ipaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ ipaddr cstruct ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "ipaddr";
|
||||
|
||||
inherit (macaddr) version src useDune2 minimumOCamlVersion;
|
||||
inherit (macaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "ipaddr-sexp";
|
||||
|
||||
inherit (ipaddr) version src useDune2 minimumOCamlVersion;
|
||||
inherit (ipaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ ipaddr ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
buildDunePackage {
|
||||
pname = "macaddr-cstruct";
|
||||
|
||||
inherit (macaddr) version src minimumOCamlVersion;
|
||||
|
||||
useDune2 = true;
|
||||
inherit (macaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ macaddr cstruct ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,15 +4,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "macaddr";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz";
|
||||
sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec";
|
||||
url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
|
||||
sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn";
|
||||
};
|
||||
|
||||
checkInputs = [ ppx_sexp_conv ounit ];
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
buildDunePackage {
|
||||
pname = "macaddr-sexp";
|
||||
|
||||
inherit (macaddr) version src minimumOCamlVersion;
|
||||
|
||||
useDune2 = true;
|
||||
inherit (macaddr) version src;
|
||||
|
||||
propagatedBuildInputs = [ ppx_sexp_conv ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ lib, buildPythonPackage, isPy27, fetchPypi
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, azure-common
|
||||
, azure-core
|
||||
|
|
@ -9,13 +12,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-keys";
|
||||
version = "4.4.0";
|
||||
disabled = isPy27;
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0";
|
||||
hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -25,11 +30,17 @@ buildPythonPackage rec {
|
|||
cryptography
|
||||
];
|
||||
|
||||
pythonNamespaces = [ "azure.keyvault" ];
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonNamespaces = [
|
||||
"azure.keyvault"
|
||||
];
|
||||
|
||||
# requires relative paths to utilities in the mono-repo
|
||||
doCheck = false;
|
||||
checkInputs = [ aiohttp pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"azure"
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
pname = "bids-validator";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JxPOHeK8glWwAhYwlCVJtfWeMtU6KHgvNg5b2DgGxGc=";
|
||||
sha256 = "sha256-ATJi4eCWV0i3Z8AsgV/DtiCn8Qzi2cMDtId5jXCoDL0=";
|
||||
};
|
||||
|
||||
# needs packages which are not available in nixpkgs
|
||||
|
|
|
|||
|
|
@ -5,6 +5,14 @@
|
|||
, importlib-metadata
|
||||
, locale
|
||||
, pytestCheckHook
|
||||
|
||||
# large-rebuild downstream dependencies
|
||||
, flask
|
||||
, black
|
||||
|
||||
# applications
|
||||
, magic-wormhole
|
||||
, mitmproxy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -29,6 +37,10 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit black flask magic-wormhole mitmproxy;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://click.palletsprojects.com/";
|
||||
description = "Create beautiful command line interfaces in Python";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{ lib
|
||||
, black
|
||||
, buildPythonPackage
|
||||
, dataclasses
|
||||
, fetchFromGitHub
|
||||
, hypothesis
|
||||
, isort
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
|
|
@ -63,8 +61,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
black
|
||||
isort
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, bson
|
||||
, pytest
|
||||
, pytest-cov
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, setuptools
|
||||
|
|
@ -23,9 +20,15 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=pymarshal --cov-report=html --cov-report=term" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -35,8 +38,6 @@ buildPythonPackage rec {
|
|||
checkInputs = [
|
||||
pytestCheckHook
|
||||
bson
|
||||
pytest
|
||||
pytest-cov
|
||||
pyyaml
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "sha256-uaROz7DQcy5FlR9/U/QmanqA1qJPJj/ix725Gnei2U0=";
|
||||
sha256 = "sha256-DVmszzDre0pWXARUqXuqGfY3pX1Ijh33G0Gsdmp8f98=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-H67oCOCkS/xpkCZ4C3BuIzpUKuLvItDqC4tNSNKjv0E=";
|
||||
vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monit";
|
||||
version = "5.31.0";
|
||||
version = "5.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}dist/monit-${version}.tar.gz";
|
||||
sha256 = "sha256-6ucfKJQftmPux0waWbaVRsZZUpeWVQvZwMVE6bUqwFU=";
|
||||
url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz";
|
||||
sha256 = "sha256-EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
|
|
|||
|
|
@ -1011,6 +1011,7 @@ mapAliases ({
|
|||
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22
|
||||
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12
|
||||
redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
|
||||
reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
|
||||
renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12
|
||||
residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27
|
||||
retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19
|
||||
|
|
|
|||
|
|
@ -3452,6 +3452,8 @@ with pkgs;
|
|||
|
||||
krapslog = callPackage ../tools/misc/krapslog { };
|
||||
|
||||
krelay = callPackage ../applications/networking/cluster/krelay { };
|
||||
|
||||
krill = callPackage ../servers/krill {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -9476,8 +9478,6 @@ with pkgs;
|
|||
|
||||
repseek = callPackage ../applications/science/biology/repseek { };
|
||||
|
||||
reicast = callPackage ../applications/emulators/reicast { };
|
||||
|
||||
reredirect = callPackage ../tools/misc/reredirect { };
|
||||
|
||||
retext = libsForQt5.callPackage ../applications/editors/retext { };
|
||||
|
|
@ -12155,6 +12155,8 @@ with pkgs;
|
|||
|
||||
flasm = callPackage ../development/compilers/flasm { };
|
||||
|
||||
flycast = callPackage ../applications/emulators/flycast { };
|
||||
|
||||
flyctl = callPackage ../development/web/flyctl { };
|
||||
|
||||
fluidd = callPackage ../applications/misc/fluidd { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue