Merge staging-next into staging
This commit is contained in:
commit
70093bbd44
|
@ -468,6 +468,7 @@
|
|||
./services/misc/couchpotato.nix
|
||||
./services/misc/devmon.nix
|
||||
./services/misc/dictd.nix
|
||||
./services/misc/duckling.nix
|
||||
./services/misc/dwm-status.nix
|
||||
./services/misc/dysnomia.nix
|
||||
./services/misc/disnix.nix
|
||||
|
|
39
nixos/modules/services/misc/duckling.nix
Normal file
39
nixos/modules/services/misc/duckling.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.duckling;
|
||||
in {
|
||||
options = {
|
||||
services.duckling = {
|
||||
enable = mkEnableOption "duckling";
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8080;
|
||||
description = ''
|
||||
Port on which duckling will run.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.duckling = {
|
||||
description = "Duckling server service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
environment = {
|
||||
PORT = builtins.toString cfg.port;
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.haskellPackages.duckling}/bin/duckling-example-exe --no-access-log --no-error-log";
|
||||
Restart = "always";
|
||||
DynamicUser = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -138,7 +138,7 @@ in rec {
|
|||
# Build the initial ramdisk so Hydra can keep track of its size over time.
|
||||
initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk);
|
||||
|
||||
netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
|
||||
netboot = forMatchingSystems supportedSystems (system: makeNetboot {
|
||||
module = ./modules/installer/netboot/netboot-minimal.nix;
|
||||
inherit system;
|
||||
});
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
|
||||
let
|
||||
humioCtlVersion = "0.28.2";
|
||||
sha256 = "sha256-mCYxgBiuKylL2Qx4RCnD4ZoMFUm2J6VIL/Erc0u3BMA=";
|
||||
humioCtlVersion = "0.28.3";
|
||||
sha256 = "sha256-GUn5hg4gPGjQ6U2dboGE22u8XuZ578+EnkmHLASXd3Q=";
|
||||
vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo=";
|
||||
in buildGoModule {
|
||||
name = "humioctl-${humioCtlVersion}";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calcurse";
|
||||
version = "4.7.0";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://calcurse.org/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "0dc4bka2l9z03bnlygsnl06l1zi2wbn29rkc02b13x2kdab7arpg";
|
||||
sha256 = "sha256-CnxV0HZ0Vp0WbAsOdYeyly09qBYM231gsdvSiVgDr7A=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ];
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, runCommand
|
||||
, seaweedfs
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
|
@ -15,6 +20,11 @@ buildGoModule rec {
|
|||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
passthru.tests.check-version = runCommand "weed-version" { meta.timeout = 3; } ''
|
||||
${seaweedfs}/bin/weed version | grep -Fw ${version}
|
||||
touch $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and highly scalable distributed file system";
|
||||
homepage = "https://github.com/chrislusf/seaweedfs";
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitui";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "extrawurst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ymvvmryzv5is535bjg8h9p7gsxygyawnpyd0hicdrdiwml5mgsq";
|
||||
sha256 = "sha256-KJXYkOHR50Zap0Ou+jVi09opHuZBfHN/ToZbasZ3IE4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "14hf3xkdvk2mgag5pzai5382h3g79fq76s0p9pj8q9v8q21wg6pr";
|
||||
cargoSha256 = "sha256-N6Yr+TqxWwl/6SgjizIyZJoVsjn/R9yjxUKCqwt8UJg=";
|
||||
|
||||
nativeBuildInputs = [ python3 perl ];
|
||||
buildInputs = [ openssl ]
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pijul";
|
||||
version = "1.0.0-alpha.46";
|
||||
version = "1.0.0-alpha.48";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "0x095g26qdch1m3izkn8ynwk1xg1qyz9ia8di23j61k7z2rqk0j5";
|
||||
sha256 = "09sz5665nwj2jppx2695hbwdqr3ws6z6rg7mmc4ldb7hkp4yilig";
|
||||
};
|
||||
|
||||
cargoSha256 = "0cw1y4vmhn70a94512mppk0kfh9xdfm0v4rp3zm00y06jzq1a1fp";
|
||||
cargoSha256 = "1v5w5za7l3hy9anz136x0vgdmgg090f5sawzgrg5ylgxy2l9s2gn";
|
||||
|
||||
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
|
||||
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, ffmpeg_3
|
||||
, tqdm
|
||||
, ffmpeg
|
||||
, ffmpeg-progress-yield
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.19.0";
|
||||
version = "1.22.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x";
|
||||
sha256 = "df826053212d540ab1bbe9819587fcbf36162f8c2535ae85b88b252e47d6d632";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg_3 tqdm ];
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
||||
checkPhase = ''
|
||||
$out/bin/ffmpeg-normalize --help > /dev/null
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3wsr";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roosta";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PluczllPRlfzoM2y552YJirrX5RQZQAkBQkner7fWhU=";
|
||||
sha256 = "sha256-JzQWfC0kmnMArpIAE5fgb3YLmXktSCH5aUdrQH9pCbo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GwRiyAHTcRoByxUViXSwslb+IAP6LK8IWZ0xICQ8qag=";
|
||||
cargoSha256 = "sha256-ZvSdJLaw1nfaqpTBKIiHiXvNFSZhsmLk0PBrV6ykv/w=";
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
buildInputs = [ libxcb ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janet";
|
||||
version = "1.15.4";
|
||||
version = "1.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janet-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lE2BAwiwvewydIpVYoN+zrfpzQbMbe5Nb1r0mzdxMao=";
|
||||
sha256 = "sha256-szqH2Qqc+AKTuoZjYHhTmiHcFQ+PMsljh0RSD/q4gD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "0.16.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "sha256-ckbKxWzcISo9yOXuwgOiSfR2hs+5od0Ru0Ku2I52Gu8=";
|
||||
sha256 = "sha256-3OimYXcQ3KPav44sClbC60220/YK4Jhq+l5UfRFYoJI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belr";
|
||||
version = "4.5.1";
|
||||
version = "4.5.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0m0s7g8d25nbnafbl76w9v3x7q4jhsypxmz1gg80pj7j34xc2dsd";
|
||||
sha256 = "sha256-TTfBOhnyyAvQe+HXfr2GkuDTx07cHLqcsssW0dA7GlQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox ];
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.16.0";
|
||||
version = "0.16.2";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-vgy/zn1Xm7Fm7u/YMe/nJa3tyRNKx/WHz0AHfhFaVKo=";
|
||||
sha256 = "0raq3jgh2aqllycvvi0x2j5f602vv8ggmyd3879jzqbz2znngsgb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "clldutils";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clld";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "13shas7krf7j04gqxjn09ipy318hmrp1s3b5d576d5r1xfxakam4";
|
||||
sha256 = "18sjcqzprf96s7bkn5zm3lh83hxfxj56nycxyldrwz7ndgkgxxx2";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deepmerge";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "082bvlk65pkf9qzkzzl8fq7s6zfz1b2v5pcb0ikwg1nx0xspggaz";
|
||||
sha256 = "1zfl8rkw98vj7jdpb29ably50x46pq6pazhrkrczndf5jc97zzgn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, colorama
|
||||
, tqdm
|
||||
, pytestCheckHook
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ffmpeg-progress-yield";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e944093e2c1b213da8fa4f0c276c1bad44e0b8ba8be7e4fd001f5132d16baef5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama tqdm ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ffmpeg ];
|
||||
|
||||
pytestFlagsArray = [ "test/test.py" ];
|
||||
|
||||
pythonImportsCheck = [ "ffmpeg_progress_yield" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run an ffmpeg command with progress";
|
||||
homepage = "https://github.com/slhck/ffmpeg-progress-yield";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
|
@ -1,12 +1,14 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, scikitlearn
|
||||
, numpy
|
||||
, matplotlib
|
||||
, scipy
|
||||
, deprecated
|
||||
, hopcroftkarp
|
||||
, pytest
|
||||
, joblib
|
||||
, matplotlib
|
||||
, numpy
|
||||
, scikitlearn
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -19,26 +21,24 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scikitlearn
|
||||
numpy
|
||||
matplotlib
|
||||
scipy
|
||||
deprecated
|
||||
hopcroftkarp
|
||||
joblib
|
||||
matplotlib
|
||||
numpy
|
||||
scikitlearn
|
||||
scipy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
preCheck = ''
|
||||
# specifically needed for darwin
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p $HOME/.matplotlib
|
||||
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
|
||||
|
||||
# ignore tests due to python 2.7 fail
|
||||
pytest --ignore test/test_plots.py \
|
||||
--ignore test/test_visuals.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, nose
|
||||
, scikitlearn
|
||||
, scipy
|
||||
|
@ -12,25 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynndescent";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "74a05a54d13573a38878781d44812ac6df97d8762a56f9bb5dd87a99911820fe";
|
||||
sha256 = "0w87c2v0li2rdbx6qfc2lb6y6bxpdy3jwfgzfs1kcr4d1chj5zfr";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes tests, included in 0.5.2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch";
|
||||
sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s=";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scikitlearn
|
||||
scipy
|
||||
|
@ -39,6 +26,10 @@ buildPythonPackage rec {
|
|||
joblib
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sacn";
|
||||
version = "1.6.2";
|
||||
version = "1.6.4";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2fea82a1dd83b0a67dc0be68a53b1fef1c44b12f3f018e47ac736bd15b36c068";
|
||||
sha256 = "1abkalzpy8bj2hpx563bxii5h0gv9v89f0yp9clc1l76amyf6dj2";
|
||||
};
|
||||
|
||||
# no tests
|
||||
|
|
|
@ -13,21 +13,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "umap-learn";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmcinnes";
|
||||
repo = "umap";
|
||||
rev = version;
|
||||
sha256 = "sha256-2Z5RDi4bz8hh8zMwkcCQY9NrGaVd1DJEBOmrCl2oSvM=";
|
||||
sha256 = "0favphngcz5jvyqs06x07hk552lvl9qx3vka8r4x0xmv88gsg349";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
tensorflow
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scikitlearn
|
||||
|
@ -36,6 +30,12 @@ buildPythonPackage rec {
|
|||
pynndescent
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
tensorflow
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.41.1";
|
||||
version = "8.42";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "sha256-zW6gjRu5YEH04xCbsW20FeFfmBg+i+aW3WpViBQigXI=";
|
||||
sha256 = "sha256-SYLr6qQp/kHzviwzCaXEnYTHHuH3j5ZzRLi8gs8xAao=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N6o+1cfer8rgKJ3+CL25axJSjGV/YSG1sLIHXJzsC6o=";
|
||||
sha256 = "sha256-f1UcvsXWW+fMAgTRtHkEXmUN/DTrJ/Xd+9HbR2FjFog=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -25,7 +25,7 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ protobuf ];
|
||||
|
||||
vendorSha256 = "sha256-vl+WqtpegoAvylx/lcyfJk8DAOub8U4Lx3Pe3eW4M/E=";
|
||||
vendorSha256 = "sha256-XMGXVsSLEzuzujX5Fg3LLkgzyJY+nIBJEO9iI2t9eGc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "open-policy-agent";
|
||||
version = "0.27.1";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IiPUmLgkD50LxOT+ZEf/UZJ0192GYOy9xk8U94Q0BWc=";
|
||||
sha256 = "sha256-khXcpV4bPfFwoQ4LrHFohhlTHOIDClZuE3qg+MYk36k=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.210";
|
||||
version = "0.0.211";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9SHH54ryll2Mt22Z82YQIcNYk9raPyOZ/QFri2ebPrQ=";
|
||||
sha256 = "sha256-iR8vEXLRdhLggFvu4Vhb8WW2Wo6qzAMQWC7qUMlWGd8=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aws-nuke";
|
||||
version = "2.14.0";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rebuy-de";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ULHT2ysAVZHSojIdsbPTuwskwOQVrK8f14r9eq+Effs=";
|
||||
sha256 = "sha256-FntHZi+L0Ti2QFbd8keF1sxcdXc01hs13Np23hF/pVc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-GUCsl5VyptNvStJZgCsJDlllZasX1OhbVkahcQFuiC8=";
|
||||
vendorSha256 = "sha256-VtsHUxI5RuKbQOSu55qPCJHsDO5+cNGT92y9dlibXlc=";
|
||||
|
||||
preBuild = ''
|
||||
if [ "x$outputHashAlgo" != "x" ]; then
|
||||
|
|
|
@ -1,38 +1,41 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, openssl
|
||||
, which
|
||||
, findutils
|
||||
, gawk
|
||||
, gnugrep
|
||||
, gnused
|
||||
, gawk
|
||||
, makeWrapper
|
||||
, mktemp
|
||||
, coreutils
|
||||
, findutils
|
||||
, openssl
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ssl-cert-check";
|
||||
version = "3.31";
|
||||
version = "4.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matty9191";
|
||||
repo = pname;
|
||||
rev = "698c1996d05152cfaf2a1a3df4cc70482411fac8";
|
||||
sha256 = "0jvi9phs0ngfwrj9zixb03v9byavbwxx8xkp0h5m98qppn1kvl3n";
|
||||
rev = "4056ceeab5abc0e39f4e0ea40cd54147253a3369";
|
||||
sha256 = "07k2n4l68hykraxvy030djc208z8rqff3kc7wy4ib9g6qj7s4mif";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
which
|
||||
gnugrep
|
||||
mktemp
|
||||
gawk
|
||||
gnused
|
||||
coreutils
|
||||
findutils
|
||||
gawk
|
||||
gnugrep
|
||||
gnused
|
||||
mktemp
|
||||
openssl
|
||||
which
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
|
@ -47,11 +50,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "a Bourne shell script that can be used to report on expiring SSL certificates";
|
||||
description = "Bourne shell script that can be used to report on expiring SSL certificates";
|
||||
homepage = "https://github.com/Matty9191/ssl-cert-check";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.ryantm ];
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ryantm ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -2323,6 +2323,8 @@ in {
|
|||
|
||||
ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
|
||||
|
||||
ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { };
|
||||
|
||||
fido2 = callPackage ../development/python-modules/fido2 { };
|
||||
|
||||
filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { };
|
||||
|
|
|
@ -83,15 +83,29 @@ self: super: let
|
|||
});
|
||||
};
|
||||
|
||||
llvmStaticAdapter = llvmPackages:
|
||||
llvmPackages // {
|
||||
stdenv = foldl (flip id) llvmPackages.stdenv staticAdapters;
|
||||
libcxxStdenv = foldl (flip id) llvmPackages.libcxxStdenv staticAdapters;
|
||||
};
|
||||
|
||||
in {
|
||||
stdenv = foldl (flip id) super.stdenv staticAdapters;
|
||||
|
||||
gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters;
|
||||
gcc6Stdenv = foldl (flip id) super.gcc6Stdenv staticAdapters;
|
||||
gcc7Stdenv = foldl (flip id) super.gcc7Stdenv staticAdapters;
|
||||
gcc8Stdenv = foldl (flip id) super.gcc8Stdenv staticAdapters;
|
||||
gcc9Stdenv = foldl (flip id) super.gcc9Stdenv staticAdapters;
|
||||
clangStdenv = foldl (flip id) super.clangStdenv staticAdapters;
|
||||
libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters;
|
||||
|
||||
llvmPackages_5 = llvmStaticAdapter super.llvmPackages_5;
|
||||
llvmPackages_6 = llvmStaticAdapter super.llvmPackages_6;
|
||||
llvmPackages_7 = llvmStaticAdapter super.llvmPackages_7;
|
||||
llvmPackages_8 = llvmStaticAdapter super.llvmPackages_8;
|
||||
llvmPackages_9 = llvmStaticAdapter super.llvmPackages_9;
|
||||
llvmPackages_10 = llvmStaticAdapter super.llvmPackages_10;
|
||||
llvmPackages_11 = llvmStaticAdapter super.llvmPackages_11;
|
||||
llvmPackages_12 = llvmStaticAdapter super.llvmPackages_12;
|
||||
|
||||
boost = super.boost.override {
|
||||
# Don’t use new stdenv for boost because it doesn’t like the
|
||||
|
|
Loading…
Reference in a new issue