Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bc9cc8ad2f
54 changed files with 1405 additions and 870 deletions
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
let
|
||||
inherit (builtins) head tail length;
|
||||
inherit (lib.trivial) flip id mergeAttrs pipe;
|
||||
inherit (lib.trivial) id mergeAttrs;
|
||||
inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;
|
||||
inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -15,22 +15,15 @@
|
|||
{ lib }:
|
||||
let
|
||||
inherit (lib)
|
||||
isInt
|
||||
attrNames
|
||||
isList
|
||||
isAttrs
|
||||
substring
|
||||
addErrorContext
|
||||
attrValues
|
||||
concatLists
|
||||
concatStringsSep
|
||||
const
|
||||
elem
|
||||
generators
|
||||
head
|
||||
id
|
||||
isDerivation
|
||||
isFunction
|
||||
mapAttrs
|
||||
trace;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -9,10 +9,6 @@ let
|
|||
pathExists
|
||||
;
|
||||
|
||||
inherit (lib.strings)
|
||||
hasPrefix
|
||||
;
|
||||
|
||||
inherit (lib.filesystem)
|
||||
pathType
|
||||
;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib }:
|
||||
|
||||
lib.mapAttrs (lname: lset: let
|
||||
defaultLicense = rec {
|
||||
defaultLicense = {
|
||||
shortName = lname;
|
||||
free = true; # Most of our licenses are Free, explicitly declare unfree additions as such!
|
||||
deprecated = false;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ let
|
|||
isBool
|
||||
isFunction
|
||||
isList
|
||||
isPath
|
||||
isString
|
||||
length
|
||||
mapAttrs
|
||||
|
|
|
|||
|
|
@ -5,22 +5,16 @@
|
|||
let
|
||||
inherit (builtins)
|
||||
match
|
||||
readDir
|
||||
split
|
||||
storeDir
|
||||
tryEval
|
||||
;
|
||||
inherit (lib)
|
||||
boolToString
|
||||
filter
|
||||
getAttr
|
||||
isString
|
||||
pathExists
|
||||
readFile
|
||||
;
|
||||
inherit (lib.filesystem)
|
||||
pathType
|
||||
pathIsDirectory
|
||||
pathIsRegularFile
|
||||
;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,21 +27,6 @@ rec {
|
|||
let removeFunctions = a: lib.filterAttrs (_: v: !builtins.isFunction v) a;
|
||||
in a: b: removeFunctions a == removeFunctions b;
|
||||
|
||||
/*
|
||||
Try to convert an elaborated system back to a simple string. If not possible,
|
||||
return null. So we have the property:
|
||||
|
||||
sys: _valid_ sys ->
|
||||
sys == elaborate (toLosslessStringMaybe sys)
|
||||
|
||||
NOTE: This property is not guaranteed when `sys` was elaborated by a different
|
||||
version of Nixpkgs.
|
||||
*/
|
||||
toLosslessStringMaybe = sys:
|
||||
if lib.isString sys then sys
|
||||
else if equals sys (elaborate sys.system) then sys.system
|
||||
else null;
|
||||
|
||||
/* List of all Nix system doubles the nixpkgs flake will expose the package set
|
||||
for. All systems listed here must be supported by nixpkgs as `localSystem`.
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,22 @@ let
|
|||
expr = lib.sort lib.lessThan x;
|
||||
expected = lib.sort lib.lessThan y;
|
||||
};
|
||||
|
||||
/*
|
||||
Try to convert an elaborated system back to a simple string. If not possible,
|
||||
return null. So we have the property:
|
||||
|
||||
sys: _valid_ sys ->
|
||||
sys == elaborate (toLosslessStringMaybe sys)
|
||||
|
||||
NOTE: This property is not guaranteed when `sys` was elaborated by a different
|
||||
version of Nixpkgs.
|
||||
*/
|
||||
toLosslessStringMaybe = sys:
|
||||
if lib.isString sys then sys
|
||||
else if lib.systems.equals sys (lib.systems.elaborate sys.system) then sys.system
|
||||
else null;
|
||||
|
||||
in
|
||||
lib.runTests (
|
||||
# We assert that the new algorithmic way of generating these lists matches the
|
||||
|
|
@ -55,11 +71,11 @@ lib.runTests (
|
|||
};
|
||||
|
||||
test_toLosslessStringMaybe_example_x86_64-linux = {
|
||||
expr = lib.systems.toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux");
|
||||
expr = toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux");
|
||||
expected = "x86_64-linux";
|
||||
};
|
||||
test_toLosslessStringMaybe_fail = {
|
||||
expr = lib.systems.toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux" // { something = "extra"; });
|
||||
expr = toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux" // { something = "extra"; });
|
||||
expected = null;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ rec {
|
|||
# nixos/doc/manual/development/option-types.xml!
|
||||
types = rec {
|
||||
|
||||
raw = mkOptionType rec {
|
||||
raw = mkOptionType {
|
||||
name = "raw";
|
||||
description = "raw value";
|
||||
descriptionClass = "noun";
|
||||
|
|
|
|||
1891
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
1891
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -9,13 +9,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "0.9.42";
|
||||
version = "0.9.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W7mD/PLrub5u9GIN8qiTWNsTfirx0aBF2Lu+2PMoxOg=";
|
||||
hash = "sha256-h+9b+KQgdYowHYGr0nPsqibcwOPmBVo9tKi/uEbLhqo=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
|
|
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"binary-merkle-tree-4.0.0-dev" = "sha256-PEPmG+39YqPQOzT8u1SNTCrVwNWErifBCVz+l8TvdyE=";
|
||||
"binary-merkle-tree-4.0.0-dev" = "sha256-/8bGqnM/yqtCgVWkIaVEySZSV3XGYuiA3JuyHYTp2lw=";
|
||||
"sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@ let
|
|||
else "Linux/X11 32-bit"
|
||||
else if stdenv.isDarwin then "Mac OSX"
|
||||
else throw "unsupported platform";
|
||||
in stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pixelorama";
|
||||
version = "0.10.3";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orama-Interactive";
|
||||
repo = "Pixelorama";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RFE7K8NMl0COzFEhUqWhhYd5MGBsCDJf0T5daPu/4DI=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-r4iQJBxXzIbQ7n19Ah6szuIfALmuKlHKcvKsxEzOttk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -56,4 +56,4 @@ in stdenv.mkDerivation rec {
|
|||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ felschr ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -880,8 +880,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-eslint";
|
||||
publisher = "dbaeumer";
|
||||
version = "2.4.0";
|
||||
sha256 = "sha256-7MUQJkLPOF3oO0kpmfP3bWbS3aT7J0RF7f74LW55BQs=";
|
||||
version = "2.4.2";
|
||||
sha256 = "sha256-eIjaiVQ7PNJUtOiZlM+lw6VmW07FbMWPtY7UoedWtbw=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog";
|
||||
|
|
@ -1159,8 +1159,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
publisher = "JakeBecker";
|
||||
version = "0.14.7";
|
||||
sha256 = "sha256-RkwgQqasBKMA+0293QhbZhgyGSqhJSic5DuIpBB+OEA=";
|
||||
version = "0.15.1";
|
||||
sha256 = "sha256-u7Vrj55u5BVZ9AAjarKV9veq2kTgEqeQvhV1j+HSIxU=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
, discord-rpc
|
||||
, doxygen
|
||||
, enet
|
||||
, fetchurl
|
||||
, ffmpeg
|
||||
, fmt
|
||||
, glslang
|
||||
|
|
@ -47,7 +48,13 @@
|
|||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
let
|
||||
tzinfoVersion = "220816";
|
||||
tzinfo = fetchurl {
|
||||
url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${tzinfoVersion}/${tzinfoVersion}.zip";
|
||||
hash = "sha256-yv8ykEYPu9upeXovei0u16iqQ7NasH6873KnQy4+KwI=";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "yuzu-${branch}";
|
||||
|
||||
inherit version src;
|
||||
|
|
@ -141,6 +148,10 @@ stdenv.mkDerivation {
|
|||
"-DTITLE_BAR_FORMAT_IDLE=yuzu | ${branch} ${version} (nixpkgs) {}"
|
||||
"-DTITLE_BAR_FORMAT_RUNNING=yuzu | ${branch} ${version} (nixpkgs) | {}"
|
||||
)
|
||||
|
||||
# provide pre-downloaded tz data
|
||||
mkdir -p build/externals/nx_tzdb
|
||||
ln -sf ${tzinfo} build/externals/nx_tzdb/${tzinfoVersion}.zip
|
||||
'';
|
||||
|
||||
# This must be done after cmake finishes as it overwrites the file
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-05-30
|
||||
# Last updated: 2023-06-22
|
||||
{
|
||||
compatList = {
|
||||
rev = "a6be5914e4e5891aafdd5dd55e84649b893cbeac";
|
||||
rev = "2288f79cad3be4c2c3148435372958aebea33156";
|
||||
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
|
||||
};
|
||||
|
||||
mainline = {
|
||||
version = "1452";
|
||||
hash = "sha256:1dmk0asrhvkd3cnng4bw294shcy9j3dd4kcsycam2vdvr08v5yb8";
|
||||
version = "1475";
|
||||
hash = "sha256:1948lqk89k7b48skcikjx3i3f8nwb6n6sh2bf00qqbchr8i27gpm";
|
||||
};
|
||||
|
||||
ea = {
|
||||
version = "3621";
|
||||
distHash = "sha256:0p8rxpwn9f269008skj7dy6qinpax93jhp33769akrprbh7f22if";
|
||||
fullHash = "sha256:1ph8frqifk42ypa0fw604k1z4kjisl35cai830cg4zhvd0vv7rn5";
|
||||
version = "3702";
|
||||
distHash = "sha256:178mfg7rxr1372favkkizdcjv1ckfkzmjqfpw6ja3c5kv0psv19j";
|
||||
fullHash = "sha256:00ls667l8zaj8597saw6drd28x4k02iqh3l7rxjjxkcqny6qv6p8";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.55";
|
||||
version = "1.0.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L3Yzt+2fWhuYCQHdQovsMpaDHhvgd6iFPAOcihUnnK0=";
|
||||
sha256 = "sha256-cG/JNZalIzhXyBH7OaiK4fedCQ05EvPUZFon5ajjOCE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3chTr4p9hDctSFJ4BekBw3vzdeLnEHE+2JL2HWrYdqQ=";
|
||||
vendorHash = "sha256-FL6zVyDkVxHZSrnL/7M4yqgl+oqVz/ekIfmrwWrMvk8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"version" = "1.11.33";
|
||||
"version" = "1.11.34";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "2rDGVoWxzpdHTo+KS9jZUUscPqv+EkuOv9ElZoVq9F4=";
|
||||
"desktopYarnHash" = "09qcp69jgl5dcwhpvwcx8q60m2xr1paq0dih8a3zyjydrq9kggda";
|
||||
"webSrcHash" = "eAmLnAKbRGQl2NtFmtwRKXozy9V3WzsMQ5Rd5flXSEM=";
|
||||
"webYarnHash" = "0x7dns0wjdyxyhdg136sn4g3amqim2490qksbaczalgymx4g1k53";
|
||||
"desktopSrcHash" = "rq8PdRP290MLBuw8h67Zw86Ee62l1VYGNW4Ph7XGVSQ=";
|
||||
"desktopYarnHash" = "1ry6w9n91ma8s461rj32g11li0gpn8s65mrw2wkj8k0na52qpx57";
|
||||
"webSrcHash" = "28GQiU8h72kD5w5QwOOPxX2Ti0Kv+GVBDDUQYtG0bZ8=";
|
||||
"webYarnHash" = "1x7vlc0iqqw8jp6yha54lyk9wglpidm4p32wwgifc8vzqjr9a2ii";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,15 +3,12 @@
|
|||
systemd}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spice-vdagent";
|
||||
version = "0.21.0";
|
||||
version = "0.22.1";
|
||||
src = fetchurl {
|
||||
url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx";
|
||||
hash = "sha256-k7DRWspHYsx9N5sXmnEBFJ267WK3IRL/+ys+kLEWh6A=";
|
||||
};
|
||||
|
||||
# FIXME: May no longer be needed with spice-vdagent versions over 0.21.0
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
|
|||
"ARGON2_VERSION=${version}"
|
||||
"LIBRARY_REL=lib"
|
||||
"PKGCONFIG_REL=lib"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isStatic [
|
||||
"LIBRARIES=$(LIB_ST)"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnatpmp";
|
||||
version = "20150609";
|
||||
version = "20230423";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
|
||||
sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
|
||||
url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -1,22 +1,31 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchurl
|
||||
, alcotest
|
||||
, mdx
|
||||
, thread-table
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "domain-local-await";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-multicore/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "2DCJsI3nGPtbXnU8jRvzR1iNAkNuekVy4Lid1qnHXDo=";
|
||||
sha256 = "LQxshVpk9EnO2adGXBamF8Hw8CVTAzJ7W4yKIkSmLm4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
thread-table
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
mdx
|
||||
];
|
||||
|
||||
|
|
|
|||
37
pkgs/development/ocaml-modules/thread-table/default.nix
Normal file
37
pkgs/development/ocaml-modules/thread-table/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, buildDunePackage
|
||||
, alcotest
|
||||
, mdx
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "thread-table";
|
||||
version = "0.1.0";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-multicore/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "d84BwC9W5udWJgYuaQwmA1e2d6uk0v210M7nK72VjXs=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
mdx
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mdx.bin
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ocaml-multicore/ocaml-${pname}";
|
||||
changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/${version}/CHANGES.md";
|
||||
description = "A lock-free thread-safe integer keyed hash table";
|
||||
license = with lib.licenses; [ isc ];
|
||||
maintainers = with lib.maintainers; [ toastal ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-pika";
|
||||
version = "9.1.2";
|
||||
version = "9.1.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "mosquito";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-iyy6HaB3S/CPYuo62SThe3m96eg9rPTMaKg2KWt0Kf0=";
|
||||
hash = "sha256-QCM/9Vt9/uXylaU8xymXJEjVd6sFRcVhpr2CGjB0AoY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.38.0";
|
||||
version = "3.39.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jk5q5ymnwyQ3t6fP8E1dPM4jkaUllvZqo9RiX8+SnvI=";
|
||||
hash = "sha256-ixESPQqXQ7HDiYm8rJ8oZ/xaRHO4spUGMyRdov4vJr8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-batch";
|
||||
version = "13.0.0";
|
||||
version = "14.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-6Sld5wQE0nbtoN0iU9djl0Oavl2PGMH8oZnEm41q4wo=";
|
||||
hash = "sha256-FlsembhvghAkxProX7NIadQHqg67DKS5b7JthZwmyTQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "2.14.1";
|
||||
version = "2.15.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kLCCCUbre/Bi0DFv/+PVHvw1NXn2HhQx5kYtEaOqP58=";
|
||||
hash = "sha256-cAa95KvmeU/rIqlUEXi+lKJPXKAdDEQGmMTo4RbWPPM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.21.0";
|
||||
version = "3.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1qWjg4EfN6KDxPX2jVQ/hCI2y3yCVHTpt57cUmObkQw=";
|
||||
hash = "sha256-Dngt/vwFgRUS3pOaanlx+qOQfSzKr4/KVZ51pLXCMMA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.20.0";
|
||||
version = "1.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s4l3DZdKfyC1Eu3PwLQHQpdcIw4yvEURxRjgxJlaXsg=";
|
||||
hash = "sha256-9F7bgkVL1hE9YeL8JxOAHNJ2iw6ey7UBOQU95DPDIis=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.26";
|
||||
version = "0.27.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "dr-prodigy";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-4kRIhIjOQB23ihZBs6J6/ZriLiMD87m/xOqMXga5Ypw=";
|
||||
hash = "sha256-RnN2aDBQZu5rNDmRuk80PbeoWN3EUhmlAs3hIXrpJMs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-mypy-plugins";
|
||||
version = "1.10.1";
|
||||
version = "1.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "typeddjango";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM=";
|
||||
hash = "sha256-UlNjqloAl0Qmy3EQ73e+KmsHeJN3eBkkBJxCehpOs48=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-benedict";
|
||||
version = "0.30.2";
|
||||
version = "0.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
owner = "fabiocaccamo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MT1oZqzYFK37z6YpRZ9LBg0ynCaq2UrrQzlDDb3YIvo=";
|
||||
hash = "sha256-fFxFpVKA6CdKwYRQCZb7iDrhLVmzaCr009Cv7CvMDyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-pkcs12";
|
||||
version = "1.16";
|
||||
version = "1.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "m-click";
|
||||
repo = "requests_pkcs12";
|
||||
rev = version;
|
||||
hash = "sha256-Uva9H2ToL7qpcXH/gmiBPKw+2gfmOxMKwxh4b43xFcA=";
|
||||
hash = "sha256-jZWaTcPM4EO8e+eVpYU8fQ4H53OzlaMUsT/d2DWuU+0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tinydb";
|
||||
version = "4.7.1";
|
||||
version = "4.8.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "msiemens";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nKsTMakCOBVHDDp8AX/xDkvHpCMBoIb0pa24F4VX/14=";
|
||||
hash = "sha256-sdWcpkjC8LtOI1k0Wyk4vLXBcwYe1vuQON9J7P8JPxA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trytond";
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+G3ELH0KnBGA1YJk67ID7VedmCN0vrhGBN+WA8aEcNg=";
|
||||
hash = "sha256-iz5XGEhIDnrIjnm0rBpUiGfgv4PWUCSQb+noPQqUsjc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, gobject-introspection
|
||||
, xapp
|
||||
, polkit
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -53,6 +54,10 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
pythonImportsCheck = [ "xapp" ];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
ignoredVersions = "^master.*";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/linuxmint/python-xapp";
|
||||
description = "Cross-desktop libraries and common resources for python";
|
||||
|
|
|
|||
|
|
@ -30,4 +30,5 @@ lib.makeScope pkgs.newScope (self:
|
|||
s6-man-pages = callPackage ./s6-man-pages { };
|
||||
s6-networking-man-pages = callPackage ./s6-networking-man-pages { };
|
||||
s6-portable-utils-man-pages = callPackage ./s6-portable-utils-man-pages { };
|
||||
s6-rc-man-pages = callPackage ./s6-rc-man-pages { };
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
{ lib, buildManPages }:
|
||||
|
||||
buildManPages {
|
||||
pname = "s6-rc-man-pages";
|
||||
version = "0.5.4.1.2";
|
||||
sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As=";
|
||||
description = "mdoc(7) versions of the documentation for the s6-rc service manager";
|
||||
maintainers = [ lib.maintainers.qyliss ];
|
||||
}
|
||||
|
|
@ -17,15 +17,15 @@
|
|||
platforms = {
|
||||
"aarch64-darwin" = {
|
||||
platformStr = "osx-arm64";
|
||||
hash = "sha512-MDuyFxtjlojXyrOdgJxVY3IDMLnrDvA4rO7ujOlE5KH082GXfonNOFZSpa64M8jMPJhJ4sopHKgZVvKKygzjPg==";
|
||||
hash = "sha512-Jpj/jmDoc01f1LqcdtszZHOG87jy7p3INajhN0taVzVX6l7WnrxY9Y8VLffBffWuNJ9LZjpGVDLt4/JqyALWrw==";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
platformStr = "osx-x64";
|
||||
hash = "sha512-fD48QFYIzq3/EvZR3o3VFCxIz3VZGSDJUo/ZwfZnFu7xt/xkQSBL+2zXOh9XZaBg42Xq3x9eFZQ00V8AbqJdKA==";
|
||||
hash = "sha512-mHOEnSxcA3x2LK3rhte5eMP97mf0q8BkbS54gGFGz91ufigWmTRrSlGVr3An/1iLlA5/k+AHJU4olWbL2Qlr0A==";
|
||||
};
|
||||
"x86_64-linux" = {
|
||||
platformStr = "linux-x64";
|
||||
hash = "sha512-PhgS2ivRn8Yhlr7+gbQd+rGSMDLGsxURh8lOE30Xk7zEubukjekxDsaPqM1tOS95k7TWM9xXyVVfmsJplrl+nw==";
|
||||
hash = "sha512-d2Ym8kofv/ik4m94D0gz3LcOQxWIDaGmXTmv4XX2zYztH/4wXC2JRr8vIpqwwX86gy3apUmTc3rCyc5Zrz2Sig==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "azure-functions-core-tools";
|
||||
version = "4.0.4915";
|
||||
version = "4.0.5095";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.${platformInfo.platformStr}.${version}.zip";
|
||||
|
|
|
|||
|
|
@ -28,34 +28,34 @@
|
|||
}:
|
||||
|
||||
let
|
||||
openrct2-version = "0.4.4";
|
||||
openrct2-version = "0.4.5";
|
||||
|
||||
# Those versions MUST match the pinned versions within the CMakeLists.txt
|
||||
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
|
||||
objects-version = "1.3.8";
|
||||
openmsx-version = "1.1.0";
|
||||
opensfx-version = "1.0.2";
|
||||
objects-version = "1.3.11";
|
||||
openmsx-version = "1.3.0";
|
||||
opensfx-version = "1.0.3";
|
||||
title-sequences-version = "0.4.0";
|
||||
|
||||
openrct2-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${openrct2-version}";
|
||||
sha256 = "sha256-kCGX+L3bXAG9fUjv04T9wV+R20kmmuREHY8h0w+CESg=";
|
||||
sha256 = "sha256-TMtaEqui3gUd+j3LwF7VsHiBtbYZMu6Rvo1aMkkU9LY=";
|
||||
};
|
||||
|
||||
objects-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "objects";
|
||||
rev = "v${objects-version}";
|
||||
sha256 = "sha256-7fKv2dSsWJ/YIneyVeuPMjdNI/kgJ7zkMoAgV/s240w=";
|
||||
sha256 = "sha256-fA2Kz4GALu6IP7ulbwpAFt3dz6NCPgyB0CWy5uOLBQY=";
|
||||
};
|
||||
|
||||
openmsx-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenMusic";
|
||||
rev = "v${openmsx-version}";
|
||||
sha256 = "sha256-SqTYJSst1tgVot/c4seuPQVoxnqWiM2Jb/pP3mHtkKs=";
|
||||
sha256 = "sha256-bp+uwTy2ZFMCK8Dq4YVACpQSwo8v1te+NQGwdqViIjU=";
|
||||
};
|
||||
|
||||
opensfx-src = fetchFromGitHub {
|
||||
|
|
@ -139,12 +139,7 @@ stdenv.mkDerivation {
|
|||
(versionCheck "OBJECTS" objects-version) +
|
||||
(versionCheck "OPENMSX" openmsx-version) +
|
||||
(versionCheck "OPENSFX" opensfx-version) +
|
||||
(versionCheck "TITLE_SEQUENCE" title-sequences-version)) +
|
||||
|
||||
# Fixup FS rights for the cmake setup-hook in the OPENMSX subsystem
|
||||
''
|
||||
chmod -R +w ./data/assetpack/openrct2.music.alternative.parkap/musictools
|
||||
'';
|
||||
(versionCheck "TITLE_SEQUENCE" title-sequences-version));
|
||||
|
||||
preFixup = "ln -s $out/share/openrct2 $out/bin/data";
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ let
|
|||
CHT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
|
||||
INTEL_SOC_PMIC_CHTDC_TI = whenAtLeast "5.10" yes;
|
||||
CHT_DC_TI_PMIC_OPREGION = whenAtLeast "5.10" yes;
|
||||
MFD_TPS68470 = whenBetween "5.10" "5.13" yes;
|
||||
TPS68470_PMIC_OPREGION = whenAtLeast "5.10" yes;
|
||||
};
|
||||
|
||||
|
|
@ -128,11 +129,11 @@ let
|
|||
memory = {
|
||||
DAMON = whenAtLeast "5.15" yes;
|
||||
DAMON_VADDR = whenAtLeast "5.15" yes;
|
||||
DAMON_PADDR = whenAtLeast "5.15" yes;
|
||||
DAMON_SYSFS = whenAtLeast "5.15" yes;
|
||||
DAMON_PADDR = whenAtLeast "5.16" yes;
|
||||
DAMON_SYSFS = whenAtLeast "5.18" yes;
|
||||
DAMON_DBGFS = whenAtLeast "5.15" yes;
|
||||
DAMON_RECLAIM = whenAtLeast "5.15" yes;
|
||||
DAMON_LRU_SORT = whenAtLeast "5.15" yes;
|
||||
DAMON_RECLAIM = whenAtLeast "5.16" yes;
|
||||
DAMON_LRU_SORT = whenAtLeast "6.0" yes;
|
||||
};
|
||||
|
||||
memtest = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microcode-intel";
|
||||
version = "20230512";
|
||||
version = "20230613";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "Intel-Linux-Processor-Microcode-Data-Files";
|
||||
rev = "microcode-${version}";
|
||||
hash = "sha256-Ay907cXbT+LlE4foK4TODcDB5Rx/Zo7HY17erem71rw=";
|
||||
hash = "sha256-tP59wfZHCLwPb2FkHaa+0D4RW1Zmu9vKaIgbveP/nLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ iucode-tool libarchive ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildGoModule rec {
|
|||
substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty"
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-jkBGFO18m5OyyMr8M7qeQHcHc9koLudGU5t8vFUBjuE=";
|
||||
vendorSha256 = "sha256-q3Jsc1wP7ahKSaOrcLiuatWRrXnpgPjqzdjr2dydSVs=";
|
||||
|
||||
subPackages = [ "cmd/photoprism" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }:
|
||||
|
||||
let
|
||||
version = "230603-378d4746a";
|
||||
version = "230615-90a18f6e7";
|
||||
pname = "photoprism";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lywVP4Vvq88g+Yk4BuzOaB+9EbWrxGgIF4lOPW33E1U=";
|
||||
sha256 = "sha256-DRrztxaSktt0R/5uMhn/BS2/d2MGbC2Knc2+/DwRycM=";
|
||||
};
|
||||
|
||||
libtensorflow = pkgs.callPackage ./libtensorflow.nix { };
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ buildNpmPackage {
|
|||
cd frontend
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-lZpgv3YFF+b9nPJlbG2KdGYC5UMy+VnYqRgz7JLj85g=";
|
||||
npmDepsHash = "sha256-YeQhX2s/pbGsiKPAnyfC530WtxkocdIcbl0abI6REZ4=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dex";
|
||||
|
|
@ -11,8 +16,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3 ];
|
||||
nativeBuildInputs = [ python3.pkgs.sphinx ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ sphinx ];
|
||||
buildInputs = [ python3 ];
|
||||
makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -20,5 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/jceb/dex";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, libuuid, autoreconfHook }:
|
||||
{ lib, stdenv, fetchurl, libuuid, autoreconfHook, e2fsprogs, acl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reiserfsprogs";
|
||||
version = "3.6.24";
|
||||
version = "3.6.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y";
|
||||
hash = "sha256-DpW2f6d0ajwtWRRem5wv60pr5ShT6DtJexgurlCOYuM=";
|
||||
};
|
||||
|
||||
patches = [ ./reiserfsprogs-ar-fix.patch ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ libuuid ];
|
||||
buildInputs = [ libuuid e2fsprogs acl ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu90" "-D_GNU_SOURCE" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
--- reiserfsprogs-3.6.24/configure.ac.orig 2018-11-29 17:16:52.313624894 +0300
|
||||
+++ reiserfsprogs-3.6.24/configure.ac 2018-11-29 17:16:54.480669132 +0300
|
||||
@@ -21,6 +21,7 @@
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_RANLIB
|
||||
+AM_PROG_AR
|
||||
|
||||
dnl Checks for libraries.
|
||||
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.10.3";
|
||||
version = "1.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AqIPdKdNKLnAHIlqgs8zzm7j+iwNvDFWslvp8RjQPnI=";
|
||||
hash = "sha256-vwStqrw/fPYUpBhBsLX0MPXtBtP5LwU0AYmUbP+Ywgo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -19,32 +19,33 @@ in
|
|||
|
||||
openssh_hpn = common rec {
|
||||
pname = "openssh-with-hpn";
|
||||
version = "9.2p1";
|
||||
version = "9.3p1";
|
||||
extraDesc = " with high performance networking patches";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
|
||||
hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y=";
|
||||
hash = "sha256-6bq6dwGnalHz2Fpiw4OjydzZf6kAuFm8fbEUwYaK+Kg=";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/700625bcd86b74cf3fb9536aeea250d7f8cd1fd5/security/openssh-portable/files/extra-patch-hpn"; in
|
||||
[
|
||||
./ssh-keysign-8.5.patch
|
||||
|
||||
# HPN Patch from FreeBSD ports
|
||||
(fetchpatch {
|
||||
name = "ssh-hpn-wo-channels.patch";
|
||||
url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn";
|
||||
inherit url;
|
||||
stripLen = 1;
|
||||
excludes = [ "channels.c" ];
|
||||
sha256 = "sha256-kSj0oE7gNHfIciy0/ErhdfrbmfjQmd8hduyiRXFnVZA=";
|
||||
hash = "sha256-hYB3i0ifNOgGLYwElMJFcT+ktczLKciq3qw1tTHZHcc=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "ssh-hpn-channels.patch";
|
||||
url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn";
|
||||
inherit url;
|
||||
extraPrefix = "";
|
||||
includes = [ "channels.c" ];
|
||||
sha256 = "sha256-pDLUbjv5XIyByEbiRAXC3WMUPKmn15af1stVmcvr7fE=";
|
||||
hash = "sha256-pDLUbjv5XIyByEbiRAXC3WMUPKmn15af1stVmcvr7fE=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -53,7 +54,6 @@ in
|
|||
extraConfigureFlags = [ "--with-hpn" ];
|
||||
extraMeta = {
|
||||
maintainers = with lib.maintainers; [ abbe ];
|
||||
knownVulnerabilities = [ "CVE-2023-28531" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-06-22";
|
||||
version = "2023-06-23";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-l9JM6j0UqMqEKpH4cTM5sqlGwIDFjjCNxOk40mdI2aY=";
|
||||
hash = "sha256-bTTf4p8FVYnXZxTS8FOtCasMXZVlQl+PQb0RS10WvN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress";
|
||||
version = "1.0.4";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.seas.harvard.edu/~apw/stress/stress-${version}.tar.gz";
|
||||
sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "resurrecting-open-source-projects";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system";
|
||||
license = licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -36,18 +36,17 @@ let
|
|||
in
|
||||
with localPython.pkgs; buildPythonApplication rec {
|
||||
pname = "awsebcli";
|
||||
version = "3.20.6";
|
||||
version = "3.20.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9n6nObYoZlOKgQvSdNqHLRr+RlDoKfR3fgD7Xa9wPzM=";
|
||||
hash = "sha256-hnLWqc4UzUnvz4wmKZ8JcEWUMPmh2BdQS1IAyxC+yb4=";
|
||||
};
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "six>=1.11.0,<1.15.0" "six==1.16.0" \
|
||||
--replace "requests>=2.20.1,<=2.26" "requests<3" \
|
||||
--replace "pathspec==0.10.1" "pathspec>=0.10.0,<1" \
|
||||
--replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \
|
||||
--replace "termcolor == 1.1.0" "termcolor>=2.0.0,<3"
|
||||
|
|
|
|||
|
|
@ -24265,6 +24265,7 @@ with pkgs;
|
|||
s6-portable-utils
|
||||
s6-portable-utils-man-pages
|
||||
s6-rc
|
||||
s6-rc-man-pages
|
||||
sdnotify-wrapper
|
||||
skalibs
|
||||
skalibs_2_10
|
||||
|
|
|
|||
|
|
@ -1603,6 +1603,8 @@ let
|
|||
|
||||
theora = callPackage ../development/ocaml-modules/theora { };
|
||||
|
||||
thread-table = callPackage ../development/ocaml-modules/thread-table { };
|
||||
|
||||
timed = callPackage ../development/ocaml-modules/timed { };
|
||||
|
||||
tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue