mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
8f73f12f12
@ -32,14 +32,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
version = "24.1";
|
||||
version = "25.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
# hash retrieved from signed SHA256SUMS
|
||||
sha256 = "8a0a3db3b2d9cc024e897113f70a3a65d8de831c129eb6d1e26ffa65e7bfaf4e";
|
||||
sha256 = "5df67cf42ca3b9a0c38cdafec5bbb517da5b58d251f32c8d2a47511f9be1ebc2";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@ -1581,8 +1581,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "Ionide-fsharp";
|
||||
publisher = "Ionide";
|
||||
version = "7.5.2";
|
||||
sha256 = "sha256-v2fd2vGaGwRnebKiyjyd/2pgWit0H5lhJT+PXWQq0h4=";
|
||||
version = "7.5.4";
|
||||
sha256 = "sha256-cM3ssUzQnqt5WL8UaLYkrmfHscVa2sGa7/UWLXMIHGg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, pkg-config
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libclang
|
||||
}:
|
||||
let
|
||||
inherit (rustPlatform) buildRustPackage bindgenHook;
|
||||
@ -24,16 +23,16 @@ buildRustPackage {
|
||||
|
||||
cargoSha256 = "sha256-Gc94Uk/Ikxjnb541flQL7AeblgU/yS6zQ/187ZGRYco=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
freetype
|
||||
bindgenHook
|
||||
];
|
||||
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.153.1";
|
||||
version = "0.154.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helmfile";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XdRA2lFkO98llH1A5GW5wgFsggvO5ZBbNXYZR9eoHgM=";
|
||||
sha256 = "sha256-AKrTpV5Ky94H610iYO31/CBuZkTd1OcxX5Tl0GjNWaA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gm/fVtmcmVHyJnzODwfgJeCaFKk2iLjTpLKtdABqdCE=";
|
||||
vendorHash = "sha256-PenQxs5Ds5GQ2LSlFRdpNUN8Y+jKCFSllMncWZwaL4c=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dablin";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Opendigitalradio";
|
||||
repo = "dablin";
|
||||
rev = version;
|
||||
sha256 = "02mhxaqpj0094sbb3c28r5xznw9z8ayvlkczknizlk75ag895zz2";
|
||||
sha256 = "sha256-tmmOk7nOkuSCjPNHiwAqP5yf1r8+fsCeDGCxhZUImD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -68,6 +68,10 @@ python.pkgs.buildPythonApplication rec {
|
||||
./release.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "'shapely>=1.3'" "'shapely>=1.3',"
|
||||
'';
|
||||
|
||||
# Only non-GUI tests can be run deterministically in the Nix build environment.
|
||||
checkPhase = ''
|
||||
python -m unittest tests.test_excellon
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opensmt";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usi-verification-and-security";
|
||||
repo = "opensmt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+u0Go+QU56mmV1G+m+sDOhi3QaWveZILS9fWv8THoWc=";
|
||||
sha256 = "sha256-XwrhqxDunao4uyUyBhDgGdMjRlmetke77Zmb7za+Aes=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ];
|
||||
|
||||
@ -1,21 +1,36 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
pname = "gpac";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpac";
|
||||
repo = "gpac";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m2qXTXLGgAyU9y6GEk4Hp/7Al57IPRSqImJatIcwswQ=";
|
||||
hash = "sha256-VjA1VFMsYUJ8uJqhYgjXYtqlGWSJHr16Ck3b5stuZWw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-0358.patch";
|
||||
url = "https://github.com/gpac/gpac/commit/9971fb125cf91cefd081a080c417b90bbe4a467b.patch";
|
||||
sha256 = "sha256-0PDQXahbJCOo1JJAC0T0N1u2mqmwAkdm87wXMJnBicM=";
|
||||
name = "CVE-2023-2837.patch";
|
||||
url = "https://github.com/gpac/gpac/commit/6f28c4cd607d83ce381f9b4a9f8101ca1e79c611.patch";
|
||||
hash = "sha256-HA6qMungIoh1fz1R3zUvV1Ahoa2pp861JRzYY/NNDQI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-2838.patch";
|
||||
url = "https://github.com/gpac/gpac/commit/c88df2e202efad214c25b4e586f243b2038779ba.patch";
|
||||
hash = "sha256-gIISG7pz01iVoWqlho2BL27ki87i3pGkug2Z+KKn+xs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-2839.patch";
|
||||
url = "https://github.com/gpac/gpac/commit/047f96fb39e6bf70cb9f344093f5886e51dce0ac.patch";
|
||||
hash = "sha256-i+/iFrWJ+Djc8xYtIOYvlZ98fYUdJooqUz9y/uhusL4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-2840.patch";
|
||||
url = "https://github.com/gpac/gpac/commit/ba59206b3225f0e8e95a27eff41cb1c49ddf9a37.patch";
|
||||
hash = "sha256-mwO9Qeeufq0wa57lO+LgWGjrN3CHMYK+xr2ZBalKBQo=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "20.6.1";
|
||||
version = "20.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-fJDMxNDXDijPL0sg86LB6nYQwjTdInf3dyOr8Lkydmg=";
|
||||
sha256 = "sha256-3bE6x1d3IMXN5miBAeb+1qRBbx8Ni386iEhSwT0znR8=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hYEFboZa6RGiy0wr7NEWaf5KCz/O7KGXTc6c9hMmoXk=";
|
||||
sha256 = "sha256-a1v+nhB6pZAe7UpMoA31TseEnvSYFeAIYI4tU+xGFG8=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
2
pkgs/applications/virtualization/pods/Cargo.lock
generated
2
pkgs/applications/virtualization/pods/Cargo.lock
generated
@ -1672,7 +1672,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pods"
|
||||
version = "1.2.0"
|
||||
version = "1.2.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"ashpd",
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pods";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marhkb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BCsieVMH2G2vT/ohrVyeIkwO9Ud0N5rXpIQj5mL9L2g=";
|
||||
sha256 = "sha256-xi9PmgSINW64vl1skQFjkTqnC6Dfty9eVFVFmMy9K9E=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
||||
@ -19,10 +19,7 @@
|
||||
#
|
||||
# if vendorHash is null, then we won't fetch any dependencies and
|
||||
# rely on the vendor folder within the source.
|
||||
, vendorHash ? "_unset"
|
||||
# same as vendorHash, but outputHashAlgo is hardcoded to sha256
|
||||
# so regular base32 sha256 hashes work
|
||||
, vendorSha256 ? "_unset"
|
||||
, vendorHash ? args'.vendorSha256 or (throw "buildGoModule: vendorHash is missing")
|
||||
# Whether to delete the vendor folder supplied with the source.
|
||||
, deleteVendor ? false
|
||||
# Whether to fetch (go mod download) and proxy the vendor directory.
|
||||
@ -52,23 +49,12 @@
|
||||
, ... }@args':
|
||||
|
||||
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
|
||||
assert (vendorSha256 == "_unset" && vendorHash == "_unset") -> throw "either `vendorHash` or `vendorSha256` is required";
|
||||
assert (vendorSha256 != "_unset" && vendorHash != "_unset") -> throw "both `vendorHash` and `vendorSha256` set. only one can be set.";
|
||||
assert (args' ? vendorHash && args' ? vendorSha256) -> throw "both `vendorHash` and `vendorSha256` set. only one can be set.";
|
||||
|
||||
let
|
||||
hasAnyVendorHash = (vendorSha256 != null && vendorSha256 != "_unset") || (vendorHash != null && vendorHash != "_unset");
|
||||
vendorHashType =
|
||||
if hasAnyVendorHash then
|
||||
if vendorSha256 != null && vendorSha256 != "_unset" then
|
||||
"sha256"
|
||||
else
|
||||
"sri"
|
||||
else
|
||||
null;
|
||||
|
||||
args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ];
|
||||
|
||||
go-modules = if hasAnyVendorHash then stdenv.mkDerivation (let modArgs = {
|
||||
go-modules = if (vendorHash != null) then stdenv.mkDerivation (let modArgs = {
|
||||
|
||||
name = "${name}-go-modules";
|
||||
|
||||
@ -114,7 +100,7 @@ let
|
||||
fi
|
||||
'' + ''
|
||||
if [ -d vendor ]; then
|
||||
echo "vendor folder exists, please set 'vendorHash = null;' or 'vendorSha256 = null;' in your expression"
|
||||
echo "vendor folder exists, please set 'vendorHash = null;' in your expression"
|
||||
exit 10
|
||||
fi
|
||||
|
||||
@ -144,7 +130,7 @@ let
|
||||
''}
|
||||
|
||||
if ! [ "$(ls -A $out)" ]; then
|
||||
echo "vendor folder is empty, please set 'vendorHash = null;' or 'vendorSha256 = null;' in your expression"
|
||||
echo "vendor folder is empty, please set 'vendorHash = null;' in your expression"
|
||||
exit 10
|
||||
fi
|
||||
|
||||
@ -155,14 +141,9 @@ let
|
||||
}; in modArgs // (
|
||||
{
|
||||
outputHashMode = "recursive";
|
||||
} // (if (vendorHashType == "sha256") then {
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = vendorSha256;
|
||||
} else {
|
||||
outputHash = vendorHash;
|
||||
}) // (lib.optionalAttrs (vendorHashType == "sri" && vendorHash == "") {
|
||||
outputHashAlgo = "sha256";
|
||||
})
|
||||
outputHashAlgo = if args' ? vendorSha256 || vendorHash == "" then "sha256" else null;
|
||||
}
|
||||
) // overrideModAttrs modArgs) else "";
|
||||
|
||||
package = stdenv.mkDerivation (args // {
|
||||
@ -182,7 +163,7 @@ let
|
||||
export GOPROXY=off
|
||||
export GOSUMDB=off
|
||||
cd "$modRoot"
|
||||
'' + lib.optionalString hasAnyVendorHash ''
|
||||
'' + lib.optionalString (vendorHash != null) ''
|
||||
${if proxyVendor then ''
|
||||
export GOPROXY=file://${go-modules}
|
||||
'' else ''
|
||||
@ -309,7 +290,7 @@ let
|
||||
|
||||
disallowedReferences = lib.optional (!allowGoReference) go;
|
||||
|
||||
passthru = passthru // { inherit go go-modules vendorSha256 vendorHash; };
|
||||
passthru = passthru // { inherit go go-modules vendorHash; } // { inherit (args') vendorSha256; };
|
||||
|
||||
meta = {
|
||||
# Add default meta information
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nordzy-icon-theme";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvatip";
|
||||
repo = "Nordzy-icon";
|
||||
rev = version;
|
||||
sha256 = "sha256-3Lv1jwvFjeKxtBmY1ZwgPBjz8xjbqDH5EcwsIb9Vy7g=";
|
||||
sha256 = "sha256-ea5OBvZrwH5Wvd7aieI9x3S10E8qcyg99Mh9B5RHkjo=";
|
||||
};
|
||||
|
||||
# In the post patch phase we should first make sure to patch shebangs.
|
||||
|
||||
@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "44.2";
|
||||
version = "44.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sfbfFftqYX/t1hmLLcqr1EENJYNECdpRVwndd8/FazM=";
|
||||
sha256 = "9ekEsuUQIQTYt/46YVA0rdeN4DEWSStUy968ooC92Jk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libhv";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ithewei";
|
||||
repo = "libhv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LMk8B/1EofcQcIF3kGmtPdM2s+/gN9ctcsybwTpf4Po=";
|
||||
hash = "sha256-hzqU06Gc/vNqRKe3DTdP4AihJqeuNpt2mn4GlLuGU6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s2n-tls";
|
||||
version = "1.3.43";
|
||||
version = "1.3.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o2e2AWCQ4IGDfdQ6zvAddKs40/BENj1Xbrw8IKNytCw=";
|
||||
sha256 = "sha256-8YF9PhxTrXQBTUJvTrJZFDVijQecTeZ1ayGuvQRqGEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mastodon-py";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "halcy";
|
||||
repo = "Mastodon.py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-T/yG9LLdttBQ+9vCSit+pyQX/BPqqDXbrTcPfTAUu1U=";
|
||||
hash = "sha256-r0AAUjd2MBfZANEpyztMNyaQTlGWvWoUVjJNO1eL218=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -42,6 +42,21 @@ buildPythonPackage rec {
|
||||
url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch";
|
||||
hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0=";
|
||||
})
|
||||
# Fix tests with numpy>=1.24
|
||||
# https://github.com/lmcinnes/umap/pull/952
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/588e1f724c9f5de528eb1500b0c85a1a609fe947.patch";
|
||||
hash = "sha256-B50eyMs3CRuzOAq+jxz56XMJPdiUofUxCL0Vqolaafo=";
|
||||
})
|
||||
# https://github.com/lmcinnes/umap/pull/1010
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/848396c762c894e666aaf3d0bcfe1e041b529ea6.patch";
|
||||
hash = "sha256-ir0Pxfr2c0oSuFGXQqHjkj7nzvlpTXCYbaI9qAiLun0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/umap/commit/30e39938f4627f327223245dfe2c908af6b7e304.patch";
|
||||
hash = "sha256-7Divrym05wIPa7evgrNYXGm44/EOWG8sIYV8fmtuzJ4=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, requests
|
||||
, rich
|
||||
, termcolor
|
||||
, testers
|
||||
, unidecode
|
||||
@ -24,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "woob";
|
||||
version = "3.5";
|
||||
version = "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -33,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "woob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Yb3AgUSqr9r2TIymiEUIhKThNC7yjQEkhi8GSI9fqNA=";
|
||||
hash = "sha256-M9AjV954H1w64YGCVxDEGGSnoEbmocG3zwltob6IW04=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -53,6 +54,7 @@ buildPythonPackage rec {
|
||||
pycountry
|
||||
pyyaml
|
||||
requests
|
||||
rich
|
||||
termcolor
|
||||
unidecode
|
||||
];
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, clang
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, llvmPackages
|
||||
, rustPlatform
|
||||
, testers
|
||||
, Security
|
||||
@ -22,9 +20,8 @@ let
|
||||
sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang cmake ];
|
||||
buildInputs = [ llvmPackages.libclang ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
nativeBuildInputs = [ cmake rustPlatform.bindgenHook ];
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
@ -33,8 +30,6 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
passthru.tests.version = testers.testVersion { inherit package; };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -22,14 +22,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.257";
|
||||
version = "2.3.259";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ve/g7hhm1ae8aQY/2XDle4/W22FsXxipaR3hZ9fs7IA=";
|
||||
hash = "sha256-TQSty1X0jD4Z5gZfl8ecpt4/7FLOjpNBXs5hVblwKvs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clj-kondo";
|
||||
version = "2023.04.14";
|
||||
version = "2023.05.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-SuhLt0FNZNRX803Doa2xT9a8n35WxDtOwxXj+dZ7YXc=";
|
||||
sha256 = "sha256-ZWGP8P/RJ5vBm6ijAcAlqDwlICrGFa+uieLG49JMkFI=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
70
pkgs/development/tools/misc/runme/default.nix
Normal file
70
pkgs/development/tools/misc/runme/default.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, runtimeShell
|
||||
, stdenv
|
||||
, testers
|
||||
, runme
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runme";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stateful";
|
||||
repo = "runme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gk15sqGQRL5v7Fo+tIYM4GM1FihoEAs23HK0cQN9hy4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-el+gM3GRN5KU4RlSAx02rn+22xj28IZq3erZUzPbUUw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/stateful/runme/internal/version.BuildDate=1970-01-01T00:00:00Z"
|
||||
"-X=github.com/stateful/runme/internal/version.BuildVersion=${version}"
|
||||
"-X=github.com/stateful/runme/internal/version.Commit=${src.rev}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace testdata/script/basic.txtar \
|
||||
--replace /bin/bash "${runtimeShell}"
|
||||
'';
|
||||
|
||||
# version test assumes `ldflags` is unspecified
|
||||
preCheck = ''
|
||||
unset ldflags
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd runme \
|
||||
--bash <($out/bin/runme completion bash) \
|
||||
--fish <($out/bin/runme completion fish) \
|
||||
--zsh <($out/bin/runme completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = runme;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Execute commands inside your runbooks, docs, and READMEs";
|
||||
homepage = "https://runme.dev";
|
||||
changelog = "https://github.com/stateful/runme/releases/tag/v${src.rev}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -13,6 +13,7 @@
|
||||
, gnugrep
|
||||
, gnused
|
||||
, ijs
|
||||
, libexif
|
||||
, libjpeg
|
||||
, liblouis
|
||||
, libpng
|
||||
@ -34,11 +35,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cups-filters";
|
||||
version = "1.28.15";
|
||||
version = "1.28.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-qQfsdp+7cu+/v5tUCyUKCOM7bjc6inw0P5hA+6TQR4s=";
|
||||
url = "https://github.com/OpenPrinting/cups-filters/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-Jwo3UqlgNoqpnUMftdNPQDmyrJQ8V22EBhLR2Bhcm7k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
|
||||
fontconfig
|
||||
ghostscript
|
||||
ijs
|
||||
libexif
|
||||
libjpeg
|
||||
liblouis # braille embosser support
|
||||
libpng
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
dep = { pname, version, hash, rev ? version, buildInputs ? [ ] }:
|
||||
dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }:
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
src = fetchFromGitHub {
|
||||
@ -27,14 +27,14 @@ let
|
||||
#
|
||||
# If that changes, we can always break them out, but they are essentially
|
||||
# part of the dbus-broker project, just in separate repositories.
|
||||
c-dvar = dep { pname = "c-dvar"; version = "v1.0.0"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; };
|
||||
c-ini = dep { pname = "c-ini"; version = "v1.0.0"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; };
|
||||
c-list = dep { pname = "c-list"; version = "v3.1.0"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; };
|
||||
c-dvar = dep { pname = "c-dvar"; version = "1.0.0"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; };
|
||||
c-ini = dep { pname = "c-ini"; version = "1.0.0"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; };
|
||||
c-list = dep { pname = "c-list"; version = "3.1.0"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; };
|
||||
# TODO: Fetch c-rbtree from a tag after its next release
|
||||
c-rbtree = dep { pname = "c-rbtree"; version = "unstable-2022-07-07"; rev = "431a4746705223673e43940ca1ad9b5f52473a4b"; hash = "sha256-ExSPgNqhTjSwRgYfZOAyoaehOpFNHKFqPYkcCfptkrs="; buildInputs = [ c-stdaux ]; };
|
||||
c-shquote = dep { pname = "c-shquote"; version = "v1.0.0"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; };
|
||||
c-stdaux = dep { pname = "c-stdaux"; version = "v1.2.0"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; };
|
||||
c-utf8 = dep { pname = "c-utf8"; version = "v1.0.0"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; };
|
||||
c-shquote = dep { pname = "c-shquote"; version = "1.0.0"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; };
|
||||
c-stdaux = dep { pname = "c-stdaux"; version = "1.2.0"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; };
|
||||
c-utf8 = dep { pname = "c-utf8"; version = "1.0.0"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; };
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfs-ganesha";
|
||||
version = "5.1";
|
||||
version = "5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nfs-ganesha";
|
||||
repo = "nfs-ganesha";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-yB8DyEWZVcdPMIVpTl687S1WuyBqAt7hszqVrJ9Kraw=";
|
||||
sha256 = "sha256-xUZ8HZb+QEw1t72dyE8rfp666w6rh8yMGYL4H2vJIwE=";
|
||||
};
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
@ -61,6 +61,6 @@ rustPlatform.buildRustPackage {
|
||||
changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "aarch64-linux" "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.141.0";
|
||||
version = "0.142.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-lz+5PF0G6JtxRFHJQV3ltuIuEwgFHfibG6Ylf7fg9Ak=";
|
||||
hash = "sha256-C+VcAtMkltkJ+IRIhZg1VXWiAtj8N0sOoEutvkXC+No=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xS8MiH9ij+lKpew02pFNpYDhLRVGRzBBy3uMhyiJ0+U=";
|
||||
vendorHash = "sha256-4u9TwtFDqr0wZ7/2pdSSofAO6qyN3mYHOk2UdU74fGI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.58.12";
|
||||
version = "0.58.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KNpmqx0+nK4Eo2h0D/mtMQ1lqBSmOmBUBQZrKPLBl5o=";
|
||||
hash = "sha256-sADeiFzVSk4Y0ZHvSoBVbtGp/YWO8ioYzZ+FXO9A7Tg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fyPq8/tc1Kzv3+BYEcFIpqBpRcMoQXzVTPao4NDCsXY=";
|
||||
vendorHash = "sha256-Jwg+c+61kCytOkrwzJJCOjIGrv832G7n/kUDLGIJ5xA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s3fs-fuse";
|
||||
version = "1.91";
|
||||
version = "1.92";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "s3fs-fuse";
|
||||
repo = "s3fs-fuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-41IgUgpVZiIzi3N5kgX7PAhgnd+i/FH1o8t5y3Uw14g=";
|
||||
sha256 = "sha256-CS6lxDIBwhcnEG6XehbyAI4vb72PmwQ7p+gC1bbJEzM=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl openssl libxml2 fuse ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub
|
||||
, clang, llvmPackages, pkg-config
|
||||
, pkg-config
|
||||
, dbus, fuse, sqlite
|
||||
}:
|
||||
|
||||
@ -20,9 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ=";
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
nativeBuildInputs = [ clang pkg-config ];
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ];
|
||||
buildInputs = [ dbus fuse sqlite ];
|
||||
|
||||
# The test are requiring extended permissions.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, rustPlatform, rustc, cargo, fetchFromGitHub, pkg-config, cmake, extra-cmake-modules, llvmPackages
|
||||
{ lib, stdenv, rustPlatform, rustc, cargo, fetchFromGitHub, pkg-config, cmake, extra-cmake-modules
|
||||
, withWayland ? true
|
||||
, withIndicator ? true, dbus, libdbusmenu
|
||||
, withXim ? true, xorg, cairo
|
||||
@ -94,18 +94,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
llvmPackages.clang
|
||||
llvmPackages.libclang
|
||||
llvmPackages.bintools
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
rustPlatform.bindgenHook
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
cargo
|
||||
];
|
||||
|
||||
RUST_BACKTRACE = 1;
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Riey/kime";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }:
|
||||
{ lib, stdenv, fetchgit, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }:
|
||||
|
||||
let
|
||||
version = "4.19";
|
||||
version = "4.20";
|
||||
|
||||
commonMeta = with lib; {
|
||||
description = "Various coreboot-related tools";
|
||||
@ -14,9 +14,10 @@ let
|
||||
generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
|
||||
sha256 = "sha256-Zcyy9GU1uZbgBmobdvgcjPH/PiffhLP5fYrXs+fPCkM=";
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = "465fbbe93ee01b4576689a90b7ddbeec23cdace2";
|
||||
sha256 = "sha256-DPaudCeK9SKu2eN1fad6a52ICs5d/GXCUFMdqAl65BE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, cmake
|
||||
, llvmPackages
|
||||
, expat
|
||||
, freetype
|
||||
, libxcb
|
||||
@ -45,15 +44,13 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = [ llvmPackages.libclang expat freetype fira-code fontconfig harfbuzz ]
|
||||
buildInputs = [ expat freetype fira-code fontconfig harfbuzz ]
|
||||
++ lib.optionals stdenv.isLinux [ libxcb ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]
|
||||
nativeBuildInputs = [ cmake pkg-config rustPlatform.bindgenHook ]
|
||||
++ lib.optionals stdenv.isLinux [ python3 ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
702
pkgs/tools/misc/wasm-tools/Cargo.lock
generated
702
pkgs/tools/misc/wasm-tools/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -5,13 +5,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-tools";
|
||||
version = "1.0.30";
|
||||
version = "1.0.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-Sd4oYHywXejLPDbNmQ73bWGw48QNQ8M+2l3CjC6D6Iw=";
|
||||
hash = "sha256-+K8yn1qpBUdBYE3SK6yZ4OBDWGhIPpaXmNSnQhvLfEk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xq";
|
||||
version = "0.2.42";
|
||||
version = "0.2.44";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-VR2ZUt0qvQBaFZr7Gui/LywsRrPubQlzYj1PQj05xhY=";
|
||||
sha256 = "sha256-szrt5msjAfiWFMBHVXxqXmLCpvKre8WM/zqCOHwBEP0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rX0fwJM8sHTuHIsmk9JpgWrTq1EA6Ksx7fFqWqY5R4k=";
|
||||
cargoHash = "sha256-T8H9Xnvfewf6B60AzBDn3gEps/0/dXiVl2g+eTw+OaQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pure rust implementation of jq";
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, llvmPackages
|
||||
, sqlite
|
||||
, installShellFiles
|
||||
, Security
|
||||
@ -23,15 +22,12 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
cargoSha256 = "sha256-qQ6yRI0rNxV/TRZHCR69h6kx6L2Wp75ziw+B2P8LZmE=";
|
||||
|
||||
nativeBuildInputs = with llvmPackages; [
|
||||
llvm
|
||||
clang
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/innernet-server.8.gz
|
||||
installManPage doc/innernet.8.gz
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apt";
|
||||
version = "2.6.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz";
|
||||
hash = "sha256-Q0Z9HKfebAlV/ZkZJUM+IvpmIwhw5fZsRJhnXQF3bCo=";
|
||||
hash = "sha256-QDwBSnBjtrNMh76nesSwIVKYupvD9NzIcIY3kofp1f0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,9 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, cryptsetup
|
||||
, pkg-config
|
||||
, clang
|
||||
, llvmPackages
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -19,14 +16,10 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config clang ];
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = [ cryptsetup ];
|
||||
|
||||
configurePhase = ''
|
||||
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-MPji87jYJjYtDAXO+v/Z4XRtCKo+ftsNvmlBrM9iMTk=";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,13 +4,13 @@ let
|
||||
generic = { pname, packageToBuild, description }:
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "rekor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/zNDruJsnLlqHud67S8/QpNEPLfFcboA+2SWLB1jzbM=";
|
||||
hash = "sha256-tPiojtSCpqJjLGRZ1rNno7TKhmZ3jBtdb4dWLfRmh14=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -23,7 +23,7 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iQBVMYt5hXSp7y0gzKCMae3gHCvS6CN+/mDWmt1yPh8=";
|
||||
vendorHash = "sha256-AIXoq/sYQRCR1pllwBhflAnanUD0aGo54drBOsaxiDQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, IOKit
|
||||
, nvidiaSupport ? false
|
||||
, makeWrapper
|
||||
, llvmPackages
|
||||
}:
|
||||
|
||||
assert nvidiaSupport -> stdenv.isLinux;
|
||||
@ -34,13 +33,11 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper;
|
||||
buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper;
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
buildFeatures = lib.optional nvidiaSupport "nvidia";
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
postInstall = lib.optionalString nvidiaSupport ''
|
||||
wrapProgram $out/bin/zenith \
|
||||
--suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zim-tools";
|
||||
version = "3.1.3";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = "zim-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-dFZd+vr/PnC7WKTFitwBe1zd/1TUnCznI/eS+Q0ZZPg=";
|
||||
sha256 = "sha256-E4E2ETuhlzBZKXMy2hNA66Vq1z2VzomgCsQp2y00XHQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
@ -12037,6 +12037,8 @@ with pkgs;
|
||||
|
||||
rund = callPackage ../development/tools/rund { };
|
||||
|
||||
runme = callPackage ../development/tools/misc/runme { };
|
||||
|
||||
runzip = callPackage ../tools/archivers/runzip { };
|
||||
|
||||
unzoo = callPackage ../tools/archivers/unzoo { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user