Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
70e275b1cb
34 changed files with 236 additions and 97 deletions
|
|
@ -1,6 +1,4 @@
|
|||
{ pkgs
|
||||
, testers
|
||||
, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
|
||||
|
|
@ -21,7 +19,7 @@ let
|
|||
passthru.override = args': testsForPackage (args // args');
|
||||
};
|
||||
|
||||
testLegacyNetwork = { nixopsPkg, ... }: testers.nixosTest ({
|
||||
testLegacyNetwork = { nixopsPkg, ... }: pkgs.testers.nixosTest ({
|
||||
name = "nixops-legacy-network";
|
||||
nodes = {
|
||||
deployer = { config, lib, nodes, pkgs, ... }: {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, libX11, libXv
|
||||
|
|
@ -36,6 +36,14 @@ stdenv.mkDerivation {
|
|||
# be set to $out, so this will result in the .app ending up in the
|
||||
# Applications directory in the current nix profile.
|
||||
./macos-copy-app-to-prefix.patch
|
||||
|
||||
# Fix build against gcc-13:
|
||||
# https://github.com/DerKoun/bsnes-hd/pull/124
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/DerKoun/bsnes-hd/commit/587e496f667970d60b6ea29976c171da1681388e.patch";
|
||||
hash = "sha256-7KBXh8b4xGTzgV2Pt8B1eFZHOaXcCKXKzqGOf0rFG0c=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
lib,
|
||||
}: let
|
||||
pname = "upscayl";
|
||||
version = "2.9.5";
|
||||
version = "2.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
|
||||
hash = "sha256-zEqdHWfMbxdOoZ3NfvOPZL0osrFVMxFN32gXfEjbKLs=";
|
||||
hash = "sha256-hLK9AX87WbJdKTV/rzEzNeaUWeDz1+bvp/R2LkjHp+w=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, buildEnv, fetchurl, mono }:
|
||||
|
||||
let
|
||||
version = "1.14.0";
|
||||
version = "1.16.0";
|
||||
drv = stdenv.mkDerivation {
|
||||
pname = "keepassrpc";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
|
||||
sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24";
|
||||
hash = "sha256-p5dYluCrXAKhBhlm6sQ3QQE3gLMJzEZsHXwGnVeXFos=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "120.0.2210.77";
|
||||
version = "120.0.2210.144";
|
||||
revision = "1";
|
||||
hash = "sha256-mSIx/aYutmA/hGycNapvm8/BnADtXA6NRlMmns+yM5k=";
|
||||
hash = "sha256-O/7LdopcMfSYx8cg9BNDU6KxbPfnF9rYXD7Q6jugBLU=";
|
||||
};
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "121.0.2277.4";
|
||||
version = "121.0.2277.71";
|
||||
revision = "1";
|
||||
hash = "sha256-Qn0H5JUMZUASqfaJfM1cpKj9E6XHjArvZ3jE+GpREOs=";
|
||||
hash = "sha256-PsfUZJ5ftHxSFGaXjzFMEff7Czfq88yL31mqNkFilNM=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "121.0.2277.4";
|
||||
version = "122.0.2348.0";
|
||||
revision = "1";
|
||||
hash = "sha256-41hOoZANy5hWrHAzxZGLX69apNMoAn7PiarWl6wicPA=";
|
||||
hash = "sha256-Vsnrc43d70fLDncMeQeYhZJhnYex2LsIV1U2KPlkP9U=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "legit";
|
||||
version = "1.2.0";
|
||||
version = "1.2.0.post0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c";
|
||||
sha256 = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -94,6 +94,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch";
|
||||
hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70=";
|
||||
})
|
||||
|
||||
# Fix libobs.pc for plugins on non-x86 systems
|
||||
(fetchpatch {
|
||||
name = "fix-arm64-cmake.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b";
|
||||
hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI=";
|
||||
includes = [ "*/CompilerConfig.cmake" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.12.22";
|
||||
version = "2.12.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xjHPlZenkxZCJ9KwjyWsrAd1LiQRRuS9Z2fsRdHV7eA=";
|
||||
hash = "sha256-Ne386WK0icQcsW2tqfkiW5udI7Umq10v+954bfjQiHM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JzIafJOSlZUWwewp6sJaM7x3U+vZMdY4gBx/NfI7p5I=";
|
||||
vendorHash = "sha256-en2gLeYZr7MwZnz47qAxQo48ZIsDZPXoCkMV2c4LHSU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ironbar";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = "ironbar";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e79eJGc/kxQjRwa1HnF7V/pCbrMTstJsBOl1Luo6i0g=";
|
||||
hash = "sha256-NRQAR412m14SHozYjJmlnb/TJyCroiWdqY0NLvCOQSE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-N8uAisQ50W/9zCr9bRX6tZ0slEoe1zCEMDXuvmoWEs4=";
|
||||
cargoHash = "sha256-EzLcmOppzUtTg1dOdZcx2rweiELPXv2Mt/we7hMr4m4=";
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
|
|
|
|||
55
pkgs/by-name/re/regripper/package.nix
Normal file
55
pkgs/by-name/re/regripper/package.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, perl
|
||||
, perlPackages
|
||||
, runtimeShell
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "regripper";
|
||||
version = "unstable-2023-07-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keydet89";
|
||||
repo = "RegRipper3.0";
|
||||
rev = "cee174fb6f137b14c426e97d17945ddee0d31051";
|
||||
hash = "sha256-vejIRlcVjxQJpxJabJJcljODYr+lLJjYINVtAPObvkQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ perl perlPackages.ParseWin32Registry ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace rip.pl rr.pl \
|
||||
--replace \"plugins/\" \"$out/share/regripper/plugins/\" \
|
||||
--replace \"plugins\" \"$out/share/regripper/plugins\"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share}
|
||||
|
||||
rm -r *.md *.exe *.bat *.dll
|
||||
|
||||
cp -aR . "$out/share/regripper/"
|
||||
|
||||
cat > "$out/bin/${pname}" << EOF
|
||||
#!${runtimeShell}
|
||||
exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@"
|
||||
EOF
|
||||
|
||||
chmod u+x "$out/bin/${pname}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source forensic software used as a Windows Registry data extraction command line";
|
||||
mainProgram = "regripper";
|
||||
homepage = "https://github.com/keydet89/RegRipper3.0";
|
||||
maintainers = with maintainers; [ d3vil0p3r ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "assemblyscript";
|
||||
version = "0.27.22";
|
||||
version = "0.27.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssemblyScript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8j012eAM+tl8AH5vNhg9xKDRJt5pZKV9KNwJFmUgXMY=";
|
||||
sha256 = "sha256-pKb46AfL5MGKiH1AjyPeHw7ZeLnIiPYmf8b2bOkuRe0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-y7gY9VhbR+xfXf3OvKvpcohk2mwfa0uOQO7Nmg+L6ug=";
|
||||
npmDepsHash = "sha256-io/3T0LE1kupjtMg8rpQlRmIn048X0jqhKKj/W7Ilo0=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/AssemblyScript/${pname}";
|
||||
|
|
|
|||
|
|
@ -3,28 +3,27 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, fftw
|
||||
, libpng
|
||||
, libjpeg
|
||||
, libwebp
|
||||
, openblas
|
||||
, blas
|
||||
, lapack
|
||||
, config
|
||||
, guiSupport ? false
|
||||
, libX11
|
||||
|
||||
# see http://dlib.net/compile.html
|
||||
, sse4Support ? stdenv.hostPlatform.sse4_1Support
|
||||
, avxSupport ? stdenv.hostPlatform.avxSupport
|
||||
, cudaSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, cudaPackages
|
||||
}@inputs:
|
||||
(if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec {
|
||||
pname = "dlib";
|
||||
version = "19.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davisking";
|
||||
repo = "dlib";
|
||||
rev ="v${version}";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk=";
|
||||
};
|
||||
|
||||
|
|
@ -33,20 +32,53 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_DLIB_USE_CUDA" cudaSupport)
|
||||
(lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support)
|
||||
(lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport)
|
||||
(lib.cmakeBool "DLIB_USE_CUDA" cudaSupport)
|
||||
] ++ lib.optionals cudaSupport [
|
||||
(lib.cmakeFeature "DLIB_USE_CUDA_COMPUTE_CAPABILITIES" (builtins.concatStringsSep "," (with cudaPackages.flags; map dropDot cudaCapabilities)))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
] ++ lib.optionals cudaSupport (with cudaPackages; [
|
||||
cuda_nvcc
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
fftw
|
||||
libpng
|
||||
libjpeg
|
||||
libwebp
|
||||
openblas
|
||||
] ++ lib.optional guiSupport libX11;
|
||||
blas
|
||||
lapack
|
||||
]
|
||||
++ lib.optionals guiSupport [ libX11 ]
|
||||
++ lib.optionals config.cudaSupport (with cudaPackages; [
|
||||
cuda_cudart.dev
|
||||
cuda_cudart.lib
|
||||
cuda_cudart.static
|
||||
cuda_nvcc.dev
|
||||
libcublas.dev
|
||||
libcublas.lib
|
||||
libcublas.static
|
||||
libcurand.dev
|
||||
libcurand.lib
|
||||
libcurand.static
|
||||
libcusolver.dev
|
||||
libcusolver.lib
|
||||
libcusolver.static
|
||||
cudnn.dev
|
||||
cudnn.lib
|
||||
cudnn.static
|
||||
cuda_cccl.dev
|
||||
]);
|
||||
|
||||
passthru = {
|
||||
inherit
|
||||
cudaSupport cudaPackages
|
||||
sse4Support avxSupport;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A general purpose cross-platform C++ machine learning library";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,17 @@
|
|||
, fetchPypi
|
||||
, lib
|
||||
|
||||
# propagates
|
||||
# propagates
|
||||
, click
|
||||
, dlib
|
||||
, face-recognition-models
|
||||
, numpy
|
||||
, pillow
|
||||
|
||||
# tests
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
, config
|
||||
, cudaSupport ? config.cudaSupport
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -18,7 +20,7 @@ buildPythonPackage rec {
|
|||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
src = fetchPypi {
|
||||
pname = "face_recognition";
|
||||
inherit version;
|
||||
hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew=";
|
||||
|
|
@ -36,6 +38,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Disables tests when running with cuda due to https://github.com/NixOS/nixpkgs/issues/225912
|
||||
doCheck = !config.cudaSupport;
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/ageitgey/face_recognition";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pglast";
|
||||
version = "5.8";
|
||||
version = "6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+3ysQuGrAH5xCBKaP0T/PLfbmLuxiKHPB+76D32GG9E=";
|
||||
hash = "sha256-XdQQsknvZ4Nlmlsh/Lnp0bGjaduqaoH8IKPTOqBWhrU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "posthog";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage {
|
|||
owner = "PostHog";
|
||||
repo = "posthog-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aF2Q3ztoFV7j47edtHiLddw+PZyMz6EHj3Zu55rOcF8=";
|
||||
hash = "sha256-7Bs0KDa799qt8sKwmj6oO0L/nWzczI+UXGWNXGv7B7s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pot";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "PythonOT";
|
||||
repo = "POT";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sq8jIWC2DD0T6675W4THbNethm7a//U8HuccKuK0Hjo=";
|
||||
hash = "sha256-fdqDM0V6zTFe1lcqi53ZZNHAfmuR2I7fdX4SN9qeNn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,26 +2,26 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, appdirs
|
||||
, requests
|
||||
, httpx
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyradios";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Uqg/owmf2popAhyanAUIdSWpXAGCWkQja4P944BpNhc=";
|
||||
hash = "sha256-XTpw8bgFZo35PJngr9oweU6fY3KAphJsrEhkKzWHLIA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
requests
|
||||
httpx
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-hep-testdata";
|
||||
version = "0.4.35";
|
||||
version = "0.4.37";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "scikit-hep";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1SROsrl7zBaZRDju1M6wlKLZypk9OswA8kromiJGeqw=";
|
||||
hash = "sha256-/zg6B1vBDaHXRSMo+Wy+CuQaBXP7v1hX2X2cK/7Djlk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snakemake-interface-executor-plugins";
|
||||
version = "8.1.3";
|
||||
version = "8.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QBLdqhR6WrO/zT0Ux5xcUtr5HbrDy91qiWuSjAA5c3E=";
|
||||
hash = "sha256-ZkhayXWy83/INRH7FYwFkhgHL+nSj7ReYC9I97SEeTM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "devspace";
|
||||
version = "6.3.8";
|
||||
version = "6.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devspace-sh";
|
||||
repo = "devspace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hB5foVVWVANX+Nmdl8layK5B08NQ11nIqt/d2du4bkQ=";
|
||||
hash = "sha256-Jy2e1bCCO3YeigQM9qSbbgqrZppXlUq+2oXIiotMKtI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "reviewdog";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aHxK1Wu6AHTYhhbW67e4Yb/uOArwsiZnW8qHXHFCu2w=";
|
||||
hash = "sha256-zr98hzWU27d+HCKvzTch7FkpUOWkHvpuMIq2cfWNRHQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-htBy+ie1RjlWkr5z3BA9us5z5VxLtl4q1pyiESsyMFY=";
|
||||
vendorHash = "sha256-S5SEM6EFXI2Vig8ze5kGOCIL5bLF6CMy/TKV+/3zAjI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.14.3";
|
||||
version = "0.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-deny";
|
||||
rev = version;
|
||||
hash = "sha256-syBf90xPcwp86xJDHtLMZXCsqh4P0mcaAcNnvjYudn8=";
|
||||
hash = "sha256-Ods0uibPrvrFW9HRHm4k9xhmOmvW8zJfVjMYEX7H0UA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YmHHuFubac0j0ptFGOr7GI1PYR4KhShrEwdqikG4RlQ=";
|
||||
cargoHash = "sha256-/wHXKzHl00q+8e4A9YFAGqhoCqVwkFhMtWTuzdmZIHc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.37.5";
|
||||
version = "0.37.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagiegurari";
|
||||
repo = "cargo-make";
|
||||
rev = version;
|
||||
hash = "sha256-2kJdj1Ye6o/GQSWRIi/SvSEz0Yvdx9xDzsYdJm4I0GQ=";
|
||||
hash = "sha256-1WITPilqdJeOPWleEGP4ApHE0pIOQZabeY8x2joq6N4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3Xo1JqqaEIEA18bsrLFOD4HMd/evdSEHL0DdqNNjJL8=";
|
||||
cargoHash = "sha256-kT7IbknQ/TF4l/X7GIpX1btHCp10Z15GHd6GjPMCpJs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "21.6.0";
|
||||
sha256 = "sha256-ICZb/PpzyLRrMjeGQdOLAJ38mA6ygZLD1at/aYb9seM=";
|
||||
version = "21.6.1";
|
||||
sha256 = "sha256-eoLzVtHcul12bw4dTHUOLhjWKQtxC30ZqHJSQeevH2A=";
|
||||
patches = [
|
||||
./disable-darwin-v8-system-instrumentation-node19.patch
|
||||
./bypass-darwin-xcrun-node16.patch
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "publii";
|
||||
version = "0.44.2";
|
||||
version = "0.44.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getpublii.com/download/Publii-${version}.deb";
|
||||
hash = "sha256-L54Aa/LiGtOEZ/ks62KckOnH042TfprOl+35AE1FwTM=";
|
||||
hash = "sha256-Qk7Ix8VLfrgT4VbSIQFwB5oVfjgeSi8nttQWovptliw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
"version": "1.1.101"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.100.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.101.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "0ylr1x39x6x9d4zx5h0j4isgz5m56kznadf984bcvsl51plhh5wc",
|
||||
"sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.100/alpha/linux64",
|
||||
"version": "1.1.100"
|
||||
"url": "https://factorio.com/get-download/1.1.101/alpha/linux64",
|
||||
"version": "1.1.101"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
|
|
@ -28,12 +28,12 @@
|
|||
"version": "1.1.101"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.1.100.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.101.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "08xrmik7z7p0pgrnscriqhssv2chrpp42gi2dw8fgjb4wf76wqc4",
|
||||
"sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.100/demo/linux64",
|
||||
"version": "1.1.100"
|
||||
"url": "https://factorio.com/get-download/1.1.101/demo/linux64",
|
||||
"version": "1.1.101"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
|
|
@ -46,12 +46,12 @@
|
|||
"version": "1.1.101"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.100.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.101.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0d6qphx6kpdmvyf40j45ih2s8q48i28nac86pal4vvlkdwadsl4q",
|
||||
"sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.100/headless/linux64",
|
||||
"version": "1.1.100"
|
||||
"url": "https://factorio.com/get-download/1.1.101/headless/linux64",
|
||||
"version": "1.1.101"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||
description = "iotop identifies processes that use high amount of input/output requests on your machine";
|
||||
homepage = "https://github.com/Tomas-M/iotop";
|
||||
maintainers = [ maintainers.arezvov ];
|
||||
mainProgram = "iotop-c";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-discord";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "discord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p2DQD2E9RmP6yZGD88Y15eTz06euhNDaxCnnrWzqaB4=";
|
||||
hash = "sha256-kjIBjkRI0BrbMNkb1Tdv7d+ZFOKRkUL9KxtQMtvxpIM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rbz6bWBl2rmfHuszjKoWZP4/B4F90MUtR5nAIXCU3pg=";
|
||||
vendorHash = "sha256-qRIgdkDp1pd/bA/AIU4PvoXcvrQam0kmr0hu4yAl+IY=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "0.29.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteube";
|
||||
repo = "${pname}-bin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eLdS3PIJYmG/U2LEU7C3vYoJsP6bpgSFUK8TH/HWekk=";
|
||||
hash = "sha256-6q6CUZS6blWTwBqpVthsn+wSRd0UJDpweWmvx3RGbgc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-16dzHcX6EZhV1wV4lhrJXNNT1ThR5RK47Y4FJr8kcXE=";
|
||||
vendorHash = "sha256-iMrAapJxipeGyJki8ijtrLKFETi0jEBYnJowgPbBGPg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dual-function-keys";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
group = "interception";
|
||||
owner = "linux/plugins";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xlplbkeptXMBlRnSsc5NgGJfT8aoZxTRgTwTOd7aiWg=";
|
||||
hash = "sha256-m/oEczUNKqj0gs/zMOIBxoQaffNg+YyPINMXArkATJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, testers
|
||||
, argocd-vault-plugin
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd-vault-plugin";
|
||||
|
|
@ -13,9 +18,23 @@ buildGoModule rec {
|
|||
|
||||
vendorHash = "sha256-0PrGrcS8Gx0cVImGrlmXlycFgWCTLjg2ISi0OhYoPpw=";
|
||||
|
||||
ldflags = [
|
||||
"-X=github.com/argoproj-labs/argocd-vault-plugin/version.Version=v${version}"
|
||||
"-X=github.com/argoproj-labs/argocd-vault-plugin/version.BuildDate=1970-01-01T00:00:00Z"
|
||||
"-X=github.com/argoproj-labs/argocd-vault-plugin/version.CommitSHA=unknown"
|
||||
];
|
||||
|
||||
# integration tests require filesystem and network access for credentials
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = argocd-vault-plugin;
|
||||
command = "argocd-vault-plugin version";
|
||||
version = "argocd-vault-plugin v${version} (unknown) BuildDate: 1970-01-01T00:00:00Z";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://argocd-vault-plugin.readthedocs.io";
|
||||
changelog = "https://github.com/argoproj-labs/argocd-vault-plugin/releases/tag/v${version}";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FanFicFare";
|
||||
version = "4.29.0";
|
||||
version = "4.30.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dfPb/PWguUIUAR3EdriPygs5sozc69WZmN9bcqrNPFM=";
|
||||
hash = "sha256-bUJWpl0sBN7ljr1tPDW2a346NsgLhWexl/kzdXTki1o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ugrep";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "ugrep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-unryRXGuxQXCwzpQW6AJAYQEL3Xvs2u4DH2E3LATQaU=";
|
||||
hash = "sha256-aQJU4SuGJy+TyxBgaHimxc0HtW9ZJIB2b6jxcGIoqo4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -19983,6 +19983,19 @@ with self; {
|
|||
};
|
||||
};
|
||||
|
||||
ParseWin32Registry = buildPerlPackage {
|
||||
pname = "ParseWin32Registry";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JM/JMACFARLA/Parse-Win32Registry-1.1.tar.gz";
|
||||
hash = "sha256-wWOyAr5q17WPSEZJT/crjJqXloPKmU5DgOmsZWTcBbo=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Module for parsing Windows Registry files";
|
||||
license = with licenses; [ artistic1 gpl1Only ];
|
||||
};
|
||||
};
|
||||
|
||||
ParseEDID = buildPerlPackage {
|
||||
pname = "Parse-Edid";
|
||||
version = "1.0.7";
|
||||
|
|
|
|||
Loading…
Reference in a new issue