Merge staging-next into staging
This commit is contained in:
@@ -38,6 +38,19 @@ let
|
||||
"--bin=codelldb"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/share
|
||||
# codelldb expects libcodelldb.so to be in the same
|
||||
# directory as the executable, and can't find it in $out/lib.
|
||||
# To make codelldb executable as a standalone,
|
||||
# we put all files in $out/share, and then wrap the binary in $out/bin.
|
||||
mv $out/bin/* $out/share
|
||||
cp $out/lib/* $out/share
|
||||
ln -s ${lldb.lib} $out/lldb
|
||||
makeWrapper $out/share/codelldb $out/bin/codelldb \
|
||||
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
|
||||
'';
|
||||
|
||||
patches = [ ./adapter-output-shared_object.patch ];
|
||||
|
||||
# Tests are linked to liblldb but it is not available here.
|
||||
@@ -112,7 +125,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
mkdir -p $ext/{adapter,formatters}
|
||||
mv -t $ext vsix-extracted/extension/*
|
||||
cp -t $ext/adapter ${adapter}/{bin,lib}/*
|
||||
cp -t $ext/adapter ${adapter}/share/*
|
||||
cp -r ../adapter/scripts $ext/adapter
|
||||
wrapProgram $ext/adapter/codelldb \
|
||||
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.2";
|
||||
sha256 = "1k47wjfyhkfn4v5cpfwfgb8ypcsiaml2cxwbwasis926wda37gzk";
|
||||
manifestsSha256 = "1imwvm85p5m9s05vmjvqql2hbkrj4m5cy87212ghybaricklcx6a";
|
||||
version = "2.2.1";
|
||||
sha256 = "12zhg5j77jhn8v0c5mz6232bcx8dqn4dg32x89kqx8znkygd5a42";
|
||||
manifestsSha256 = "1hwcy64i6fg0qq0gzsxba6k7hak0ngqgi627680pk1daykfic7wv";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@@ -29,7 +29,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4srEYBI/Qay9F0JxEIT0HyOtF29V9dzdB1ei4tZYJbs=";
|
||||
vendorHash = "sha256-QElnhoWNp17SdRJJFZ+FpLS1NzGjIXaP0dYefzwBNkI=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "0.14.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D0BsjAZ7yhbZ8dJ3U/K2tdKhLTZBmK/HorApSYVb3ww=";
|
||||
hash = "sha256-TL/K1r76DV9CdKfVpE3Fn7N38lHqEF9Sxtthfew2l3w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vCcdQt8/jkUQVz0SpjWUhiJd7d3ePIF6qLD8NKCc618=";
|
||||
vendorHash = "sha256-72gFtM+Z65VreeIamoBHXx2EsGCv8aDHmRz2aSQCU7Q=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.54.3";
|
||||
version = "0.54.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZtBWp121+Gvt1BMLUAjtMW7fgVlqRjXXspeHmbEWGOU=";
|
||||
hash = "sha256-ISN2TWdxBucjG2tn+NuP6Wjqxc47haEE+rjCHIO/E+g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OIkrDvNk4XD11j/+BdOkzbw86cYUj0Vz7pZ5/vIZopY=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ostinato";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pstavirs";
|
||||
repo = "ostinato";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yhfhNfkiZulF0FxNT+3CeGqUTXLmwPQntl2TLdCcMTQ=";
|
||||
sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
|
||||
};
|
||||
|
||||
ostinatoIcon = fetchurl {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "dependabot-cli";
|
||||
version = "1.39.0";
|
||||
version = "1.41.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -17,10 +17,10 @@ buildGoModule {
|
||||
owner = "dependabot";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QuhgFWF97B72KTX/QKSXNl/4RDAKUMDga7vLYiZw4SM=";
|
||||
hash = "sha256-CnSDvLcLupWKBp1Wr6E9BScA8VsBlfmmfPwh8cyERZg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mNpNp/zeQGgcljj2VhGl4IN1HG1R8CJSTWKzrgC0z44=";
|
||||
vendorHash = "sha256-vN5r1OtHT16LeJ6iPmHmXTx9Oo+WALhV4PWqzMiUwSA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.5.3";
|
||||
version = "1.5.5";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit pname version;
|
||||
@@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pC6kEDOXNcuMfDvXomPZVMWpS/aHR4P4pIhqNkXAGuc=";
|
||||
hash = "sha256-TNXnXQMlMNXKPxN5GneZr+LyByfQX2TToUebpdD/d+U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA=";
|
||||
|
||||
@@ -1,21 +1,27 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub}:
|
||||
{ lib, buildNpmPackage, fetchFromGitHub, testers, typescript }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "typescript";
|
||||
version = "5.3.2";
|
||||
version = "5.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "TypeScript";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lwc2bYC2f8x3Np/LxbN+5x6Apuekp7LmHXNutqL9Z2E=";
|
||||
hash = "sha256-gZdS4TGbafaOdNc1ZB24uAjMu9g0hef6mEsOr/dPqvY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-dprint-dstBundler.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-vD/tax5RjREdsdte3ONahVf9GPOkxPqeP9jmsxjCYkY=";
|
||||
npmDepsHash = "sha256-gj59jjko13UBPqqy/3z1KgVMFUQPUAIg47UTTaseF+w=";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = typescript;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A superset of JavaScript that compiles to clean JavaScript output";
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -12,10 +15,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-BJDaDokyHgmyl+bGqCwG1J7iOvu0E3P3iYZ1/krot8s=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/include/CL
|
||||
cp CL/* $out/include/CL
|
||||
'';
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Khronos OpenCL headers version ${version}";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.31";
|
||||
version = "1.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-qK8l/v6nLuMAitz7DfVDjJyVjEmkeD2jgJkG5qOMCcQ=";
|
||||
sha256 = "sha256-Np91NevE0XiFSZ27cpwAUjm0XY2/IuugGDcfG17aV2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 pkg-config ];
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "molecule";
|
||||
version = "6.0.2";
|
||||
version = "6.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uRk1P3mXRt5gsWonV1YneD45wmj98vKqA3LwFix7VHg=";
|
||||
hash = "sha256-0qiBBi/MXvHgjB5RJ8BDVNLJUXGVXicL2Cs/v+9y07A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "moon";
|
||||
version = "1.16.0";
|
||||
version = "1.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FPhUGFumbO28rPWNDTrUNqMx0ppbotp9z6u8cCEHu/g=";
|
||||
hash = "sha256-7z5hmwBb8PBrQzXn2fg4MU7/jCOF8Ul4nMza87QNXYk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hak0xMV6MSqM88bNY+2C5B5YlRWlZ+dDYu50pYEDsmI=";
|
||||
cargoHash = "sha256-1YarqedZ4SUs+Nv0qLeiFo+RCBu4e2Ejf4UI42hs8YQ=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-C strip=symbols";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.8.2";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Hh4SfmdR7hujc6Ty+ay8uyl1vkjYuxwa5J5RacqHOAE=";
|
||||
hash = "sha256-B+7c27xq+JNhP6s9mS5t7AURPV9/HFf5o1jtqyH4x2g=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-SVChgkPgqhApWDNA1me41zS0hXd1G2oFrL/SsnFiIsg=";
|
||||
vendorHash = "sha256-4HdBTOTQGMAez5gg1R7+M3EqrP0cv8iNjD7ayZD95aU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "1.123.6";
|
||||
version = "1.125.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xDtFSUAETUgSvV5X1PU2hLfQKIxhSkj4D7vSvNRJqTY=";
|
||||
hash = "sha256-npMzmT3Tfci2E/WoAocKgDYS4K/5U40VHhtAWiX3ePU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PdWGqv0BekvutUAUNFMQuVUEnx9r22FjzBPoIdIRpdI=";
|
||||
vendorHash = "sha256-sZqvnp5ZJn4/xOM1L9C4W953gMRBOA3fzyhsTTFwZhg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,26 +1,56 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config
|
||||
, openssl, libiconv, CoreServices, Security }:
|
||||
{ lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
libiconv,
|
||||
jq,
|
||||
moreutils,
|
||||
CoreServices,
|
||||
Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trunk";
|
||||
version = "0.17.2";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thedodd";
|
||||
repo = "trunk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A6h8TmYK5WOcmANk/uM9QO1h767BWASWTwLthtKqrEk=";
|
||||
hash = "sha256-riebGbDCqkJTkDmvXCuD0ywjSfGfLgxywkHUPlGzCgI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = if stdenv.isDarwin
|
||||
then [ libiconv CoreServices Security ]
|
||||
else [ openssl ];
|
||||
|
||||
# requires network
|
||||
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
|
||||
|
||||
cargoHash = "sha256-+jz0J1qFK2fZ4OX089pgNtT2vfiOTf39qQjeXmLoFNs=";
|
||||
cargoHash = "sha256-O2AKIOvAwDpZDzEyc/x5lF0E0UR+Mj/J///1bYRgoX4=";
|
||||
|
||||
# the dependency css-minify contains both README.md and Readme.md,
|
||||
# which causes a hash mismatch on systems with a case-insensitive filesystem
|
||||
# this removes the readme files and updates cargo's checksum file accordingly
|
||||
depsExtraArgs = {
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
pushd $name/css-minify
|
||||
|
||||
rm -f README.md Readme.md
|
||||
jq 'del(.files."README.md") | del(.files."Readme.md")' \
|
||||
.cargo-checksum.json -c \
|
||||
| sponge .cargo-checksum.json
|
||||
|
||||
popd
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thedodd/trunk";
|
||||
|
||||
@@ -1,29 +1,17 @@
|
||||
{ lib, buildGo121Module, fetchFromGitHub, fetchpatch, installShellFiles, nixosTests }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }:
|
||||
|
||||
let
|
||||
buildGoModule rec {
|
||||
pname = "miniflux";
|
||||
version = "2.0.50";
|
||||
|
||||
in buildGo121Module {
|
||||
inherit pname version;
|
||||
version = "2.0.51";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
owner = "miniflux";
|
||||
repo = "v2";
|
||||
rev = version;
|
||||
sha256 = "sha256-+oNF/Zwc1Z/cu3SQC/ZTekAW5Qef9RKrdszunLomGII=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gffiZOsHUYTDEjIdKUPyKbsdRKX890aG6GY72LYESkA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/miniflux/v2/pull/2193, remove after 2.0.50
|
||||
name = "miniflux-user-agent-regression.patch";
|
||||
url = "https://github.com/miniflux/v2/commit/7a03291442a4e35572c73a2fcfe809fa8e03063e.patch";
|
||||
hash = "sha256-tJ1l5rqD0x0xtQs+tDwpFHOY+7k6X02bkwVJo6RAdb8=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-jLyjQ+w/QS9uA0pGWF2X6dEfOifcI2gC2sgi1STEzpU=";
|
||||
vendorHash = "sha256-yO4sNOkEDnM9eETE68C++dPnAfcoSMXznf5Nq4/iQmA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -44,7 +32,7 @@ in buildGo121Module {
|
||||
description = "Minimalist and opinionated feed reader";
|
||||
homepage = "https://miniflux.app/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rvolosatovs benpye ];
|
||||
maintainers = with maintainers; [ rvolosatovs benpye emilylange ];
|
||||
mainProgram = "miniflux";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, pkg-config, python3
|
||||
, buildPackages
|
||||
, pkg-config
|
||||
, zstd
|
||||
, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib
|
||||
, runCommand, btrfs-progs
|
||||
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
] ++ [
|
||||
(python3.withPackages (ps: with ps; [
|
||||
(buildPackages.python3.withPackages (ps: with ps; [
|
||||
sphinx
|
||||
sphinx-rtd-theme
|
||||
]))
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
, go
|
||||
, nodejs
|
||||
, perl
|
||||
, cabal-install
|
||||
, testers
|
||||
, pre-commit
|
||||
}:
|
||||
@@ -17,16 +18,16 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "pre-commit";
|
||||
version = "3.3.3";
|
||||
version = "3.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pre-commit";
|
||||
repo = "pre-commit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6FKf4jLHUt2c7LSxFcq53IsfHOWeUSI+P9To0eh48+o=";
|
||||
hash = "sha256-OTduVg8uhMdXs2gQ7KaMVOO1zQK4m489W9SU7PWIvcM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -58,6 +59,7 @@ buildPythonApplication rec {
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
re-assert
|
||||
cabal-install
|
||||
];
|
||||
|
||||
# i686-linux: dotnet-sdk not available
|
||||
@@ -156,6 +158,8 @@ buildPythonApplication rec {
|
||||
"test_run_versioned_node_hook"
|
||||
"test_rust_cli_additional_dependencies"
|
||||
"test_swift_language"
|
||||
"test_run_example_executable"
|
||||
"test_run_dep"
|
||||
|
||||
# i don't know why these fail
|
||||
"test_install_existing_hooks_no_overwrite"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boundary";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
||||
aarch64-darwin = "darwin_arm64";
|
||||
};
|
||||
sha256 = selectSystem {
|
||||
x86_64-linux = "sha256-UR34PX3GChOTM4ROcvlghXOv4M8CYgiCvQaR/BRRvzs=";
|
||||
aarch64-linux = "sha256-5q5Zz+/klgwbBvE40aMCw+ulv+g9Yhpcsn31PPCp9S4=";
|
||||
x86_64-darwin = "sha256-NH1/QKqmaKGL35verE2sRXUwXePJoQk5kiUEIA5Xxn8=";
|
||||
aarch64-darwin = "sha256-PpZ1dbT57+cdmLTvxo0/HY0lKoa+/N4cSfTNhbE6LLo=";
|
||||
x86_64-linux = "sha256-iKKpZ/5BrX+b7/r/Q6zQ0Qo51/8v4jekDDWmJ1x4dqQ=";
|
||||
aarch64-linux = "sha256-JYfgeiBUG4rk1fh89d3wiYkoiy4e41wHIphj1no/TS8=";
|
||||
x86_64-darwin = "sha256-4dEP7Gx7h1OT6eyQR4fUFed3jUbVxqHmsFzvrSvTLe0=";
|
||||
aarch64-darwin = "sha256-am/GX2NPOzWT0s+UQ2FYGapa9aOSxmbJ9X80xvnbaiQ=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, autoconf-archive
|
||||
, autoreconfHook
|
||||
, gobject-introspection
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, systemd
|
||||
, dbus
|
||||
, pcsclite
|
||||
, PCSC
|
||||
, wget
|
||||
, coreutils
|
||||
, perlPackages
|
||||
, testers
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pcsc-tools";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LudovicRousseau";
|
||||
repo = "pcsc-tools";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-tTeSlS1ncpdIaoJsSVgm3zSCogP6S8zlA9hRFocZ/R4=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--datarootdir=${placeholder "out"}/share"
|
||||
];
|
||||
|
||||
buildInputs = [ dbus perlPackages.perl pcsclite ]
|
||||
++ lib.optional stdenv.isDarwin PCSC
|
||||
++ lib.optional stdenv.isLinux systemd;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf-archive
|
||||
autoreconfHook
|
||||
gobject-introspection
|
||||
makeWrapper
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/scriptor \
|
||||
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC libintl-perl ]}"
|
||||
|
||||
wrapProgram $out/bin/gscriptor \
|
||||
''${makeWrapperArgs[@]} \
|
||||
--set PERL5LIB "${with perlPackages; makePerlPath [
|
||||
ChipcardPCSC
|
||||
libintl-perl
|
||||
GlibObjectIntrospection
|
||||
Glib
|
||||
Gtk3
|
||||
Pango
|
||||
Cairo
|
||||
CairoGObject
|
||||
]}"
|
||||
|
||||
wrapProgram $out/bin/ATR_analysis \
|
||||
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC libintl-perl ]}"
|
||||
|
||||
wrapProgram $out/bin/pcsc_scan \
|
||||
--prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}"
|
||||
|
||||
install -Dm444 -t $out/share/pcsc smartcard_list.txt
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "pcsc_scan -V";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools used to test a PC/SC driver, card or reader";
|
||||
homepage = "https://pcsc-tools.apdu.fr/";
|
||||
changelog = "https://github.com/LudovicRousseau/pcsc-tools/releases/tag/${finalAttrs.version}";
|
||||
license = licenses.gpl2Plus;
|
||||
mainProgram = "pcsc_scan";
|
||||
maintainers = with maintainers; [ peterhoeg anthonyroussel ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -1,57 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, systemd
|
||||
, dbus
|
||||
, pcsclite
|
||||
, wget
|
||||
, coreutils
|
||||
, perlPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsc-tools";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LudovicRousseau";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-c7md8m1llvz0EQqA0qY4aGb3guGFoj+8uS4hUTzie5o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ATR_analysis \
|
||||
--replace /usr/local/pcsc /etc/pcsc \
|
||||
--replace /usr/share/pcsc $out/share/pcsc
|
||||
'';
|
||||
|
||||
buildInputs = [ dbus perlPackages.perl pcsclite ]
|
||||
++ lib.optional stdenv.isLinux systemd;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/scriptor \
|
||||
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}"
|
||||
wrapProgram $out/bin/gscriptor \
|
||||
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}"
|
||||
wrapProgram $out/bin/ATR_analysis \
|
||||
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}"
|
||||
wrapProgram $out/bin/pcsc_scan \
|
||||
--prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}"
|
||||
|
||||
install -Dm444 -t $out/share/pcsc smartcard_list.txt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools used to test a PC/SC driver, card or reader";
|
||||
homepage = "https://pcsc-tools.apdu.fr/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nvitop";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XuehaiPan";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DPdKdIqFUozTt5Go3+c7oSv9tZSio486QeSlSfIrBZ4=";
|
||||
hash = "sha256-TunGtNe+lgx/hk8kNtB8yaCdbkiJ3d4JJ8NKB+6urJA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "nvidia-ml-py" ];
|
||||
@@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "An interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management";
|
||||
homepage = "https://github.com/XuehaiPan/nvitop";
|
||||
changelog = "https://github.com/XuehaiPan/nvitop/releases/tag/v${version}";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
platforms = with platforms; linux;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4kSnwJTS+am9ATlUPsWLGccHXFQqrEcK0GtaqqW7fdQ=";
|
||||
hash = "sha256-GImv4OJHanj6dKtAJpTaGLrR4AaVTboiYHwRdh/gXaU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BEYww1wsf9nxE48TNvyFkddF0TwQg7e5BoolvvKewYg=";
|
||||
vendorHash = "sha256-T7eki06fQuGvYIJKvBJsIkFS1fQ9Jbv+ieUSr2vupqg=";
|
||||
|
||||
excludedPackages = [ "./e2etests" ];
|
||||
|
||||
|
||||
@@ -705,6 +705,7 @@ mapAliases ({
|
||||
paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03
|
||||
parity = openethereum; # Added 2020-08-01
|
||||
pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16
|
||||
pcsctools = pcsc-tools; # Added 2023-12-07
|
||||
pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22
|
||||
peach = asouldocs; # Added 2022-08-28
|
||||
pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
|
||||
|
||||
@@ -11982,13 +11982,16 @@ with pkgs;
|
||||
polkitSupport = true;
|
||||
};
|
||||
|
||||
pcsctools = callPackage ../tools/security/pcsctools { };
|
||||
|
||||
pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };
|
||||
|
||||
pcsc-safenet = callPackage ../tools/security/pcsc-safenet { };
|
||||
|
||||
pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { };
|
||||
|
||||
pcsc-tools = callPackage ../tools/security/pcsc-tools {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) PCSC;
|
||||
};
|
||||
|
||||
ifdnfc = callPackage ../tools/security/ifdnfc { };
|
||||
|
||||
pdd = python3Packages.callPackage ../tools/misc/pdd { };
|
||||
|
||||
Reference in New Issue
Block a user