Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f5e5c08eb3
40 changed files with 217 additions and 124 deletions
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
let
|
||||
inherit (builtins) head tail length;
|
||||
inherit (lib.trivial) id mergeAttrs;
|
||||
inherit (lib.trivial) id mergeAttrs warn;
|
||||
inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName;
|
||||
inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl;
|
||||
in
|
||||
|
|
@ -1197,9 +1197,10 @@ rec {
|
|||
(x // y) // mask;
|
||||
|
||||
# DEPRECATED
|
||||
zipWithNames = zipAttrsWithNames;
|
||||
zipWithNames = warn
|
||||
"lib.zipWithNames is a deprecated alias of lib.zipAttrsWithNames." zipAttrsWithNames;
|
||||
|
||||
# DEPRECATED
|
||||
zip = builtins.trace
|
||||
"lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith;
|
||||
zip = warn
|
||||
"lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{ lib }:
|
||||
let
|
||||
inherit (lib.strings) toInt;
|
||||
inherit (lib.trivial) compare min id;
|
||||
inherit (lib.trivial) compare min id warn;
|
||||
inherit (lib.attrsets) mapAttrs;
|
||||
inherit (lib.lists) sort;
|
||||
in
|
||||
|
|
@ -848,8 +848,8 @@ rec {
|
|||
crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
|
||||
=> [ "13" "14" "23" "24" ]
|
||||
*/
|
||||
crossLists = builtins.trace
|
||||
"lib.crossLists is deprecated, use lib.cartesianProductOfSets instead"
|
||||
crossLists = warn
|
||||
"lib.crossLists is deprecated, use lib.cartesianProductOfSets instead."
|
||||
(f: foldl (fs: args: concatMap (f: map f args) fs) [f]);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -379,7 +379,7 @@ rec {
|
|||
if ! isString text then throw "literalExpression expects a string."
|
||||
else { _type = "literalExpression"; inherit text; };
|
||||
|
||||
literalExample = lib.warn "literalExample is deprecated, use literalExpression instead, or use literalMD for a non-Nix description." literalExpression;
|
||||
literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression;
|
||||
|
||||
/* Transition marker for documentation that's already migrated to markdown
|
||||
syntax. This is a no-op and no longer needed.
|
||||
|
|
|
|||
|
|
@ -561,7 +561,7 @@ rec {
|
|||
[""" "'" "<" ">" "&"];
|
||||
|
||||
# warning added 12-12-2022
|
||||
replaceChars = lib.warn "replaceChars is a deprecated alias of replaceStrings, replace usages of it with replaceStrings." builtins.replaceStrings;
|
||||
replaceChars = lib.warn "lib.replaceChars is a deprecated alias of lib.replaceStrings." builtins.replaceStrings;
|
||||
|
||||
# Case conversion utilities.
|
||||
lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
|
||||
|
|
@ -1133,7 +1133,7 @@ rec {
|
|||
"/prefix/nix-profiles-library-paths.patch"
|
||||
"/prefix/compose-search-path.patch" ]
|
||||
*/
|
||||
readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead"
|
||||
readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead."
|
||||
(rootPath: file:
|
||||
let
|
||||
lines = lib.splitString "\n" (readFile file);
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ in {
|
|||
else if lib.pathExists revisionFile then lib.fileContents revisionFile
|
||||
else default;
|
||||
|
||||
nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
|
||||
nixpkgsVersion = warn "lib.nixpkgsVersion is a deprecated alias of lib.version." version;
|
||||
|
||||
/* Determine whether the function is being called from inside a Nix
|
||||
shell.
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "listenbrainz-mpd";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "elomatreb";
|
||||
repo = "listenbrainz-mpd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DqxE+wEHDmOmh+iJa312uAWQcg/1ApOTZNLrhGq5KmY=";
|
||||
hash = "sha256-4FNFaVi+fxoXo2tl+bynHqh8yRt0Q4z/El/4m0GXZUY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/fd3XIBHwJ95bwirUbMldw2cAfdF2Sv8CPxrbM4WWBI=";
|
||||
cargoHash = "sha256-FS7OYzKx/lQh86QQ8Dk9v1JrWUxPHNz3kITiEJ3sNng=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ];
|
||||
|
||||
|
|
|
|||
|
|
@ -30,21 +30,21 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0qykchhd6cplyip4gp5s1fpv664xw2y5z0z7n6zwhwpfrld8piwb";
|
||||
x86_64-darwin = "0mris80k62yabaz2avh4q2vjpnqcwa77phx3icdif0c19w185pqw";
|
||||
aarch64-linux = "0rbj0l9wdbkxgzy9j9qvx0237g5nx4np0ank4x6jbxhlbs8xdw39";
|
||||
aarch64-darwin = "1j1wd1ssyrd6651k7ias22phcb358k6aigdirfzczam303cxr0hw";
|
||||
armv7l-linux = "1c6bikdhgd6w5njqza5xmhi7iz4kzydcfb2i7jqklb514knqxc8f";
|
||||
x86_64-linux = "0nffz9xqm1iny7sqi1pkmnfcski15qsycw9gxir18j51kfzz50wf";
|
||||
x86_64-darwin = "082m2wwd67ayjadlywqimnmdm8imw6lz0rd8rnwjd2sjksxnrsk8";
|
||||
aarch64-linux = "0wlm8ajm1xw8lpmnbkzkgvaakfa9gacwi7m2fdyc4822rq7fn09b";
|
||||
aarch64-darwin = "1rgcljj97f551yr0q5f0vxdkvbhxrbyqrw85gb6qfxpg5d0l7y4f";
|
||||
armv7l-linux = "1wpslrysi8a6rnx99lq16zx277lnmqjp02q6gxmkpcvrvw27m6yj";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.86.0";
|
||||
version = "1.86.1";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "05047486b6df5eb8d44b2ecd70ea3bdf775fd937";
|
||||
rev = "31c37ee8f63491495ac49e43b8544550fbae4533";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
|
|
@ -68,7 +68,7 @@ in
|
|||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "0d3g6csi2aplsy5j3v84m65mhlg0krpb2sndk0nh7gafyc5gnn28";
|
||||
sha256 = "1hq6i51d1dhpippc8gmhygw3kj9cx021y54ga58l5b80wvg2cf1y";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -108,14 +108,14 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation {
|
||||
pname = "darling";
|
||||
version = "unstable-2023-11-07";
|
||||
version = "unstable-2024-02-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darlinghq";
|
||||
repo = "darling";
|
||||
rev = "34351655a40d2090e70b3033a577b8cdea967633";
|
||||
rev = "25afbc76428c39c3909e9efcf5caef1140425211";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Jhr7Do15vms8bJ8AczVSkuWrC7gUR5ZvU9/PfCmGGcg=";
|
||||
hash = "sha256-T0g38loUFv3jHvUu3R3QH9hwP8JVe2al4g4VhXnBDMc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "sdk" ];
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keymapp";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
|
||||
hash = "sha256-BmCLF/4wjBDxToMW0OYqI6PZwqmctgBs7nBygmJ+YOU=";
|
||||
hash = "sha256-adFQCuHkorXixn/dId/vrCcnjQ2VDDQM049UrodjFgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sigi";
|
||||
version = "3.6.1";
|
||||
version = "3.6.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UL4V/5XvqaqO4R2ievw379D/rzHf/ITgvG3BcSbMeTQ=";
|
||||
hash = "sha256-JGQ9UbkS3Q1ohy6vtiUlPijuffH4Gb99cZCKreGqE/U=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wzTUK4AvJmBK7LX7CLCAeAXLDxMJA/3qs/KT1+pMaoI=";
|
||||
cargoHash = "sha256-W/ekk4tsYxG7FXzJW5i0Ii7nLgDHCSCjO3couN+/sMk=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# In case anything goes wrong.
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.15.21";
|
||||
version = "0.15.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jagNtaR7YAOdvy/yJrIRQfr8UQTrEoVrPLaGklt8mUk=";
|
||||
hash = "sha256-tjVrcxWXE/eOeVoXnoBHYXk4rA3QqcWDbK1MRZ+v7uE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, xxd
|
||||
, enableMpi ? false
|
||||
|
|
@ -18,6 +19,15 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Should be removable as soon as this upstream PR is merged: https://github.com/soedinglab/hh-suite/pull/357
|
||||
(fetchpatch {
|
||||
name = "fix-gcc13-build-issues.patch";
|
||||
url = "https://github.com/soedinglab/hh-suite/commit/cec47cba5dcd580e668b1ee507c9282fbdc8e7d7.patch";
|
||||
hash = "sha256-Msdmj9l8voPYXK0SSwUA6mEbFLBhTjjE/Kjp0VL4Kf4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake xxd ];
|
||||
cmakeFlags = lib.optional stdenv.hostPlatform.isx86 "-DHAVE_SSE2=1"
|
||||
++ lib.optional stdenv.hostPlatform.isAarch "-DHAVE_ARM8=1"
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cosmic-icons";
|
||||
version = "unstable-2024-01-23";
|
||||
version = "unstable-2024-02-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "49a1762c958196924afcf1eae52ee910c4b4bc9f";
|
||||
sha256 = "sha256-wL4f1rXWuFmeZCAAw0y+JQ3iesZcEC3XxWWrvrJ50oA=";
|
||||
rev = "edd405ed84186ee24307deb7da6f25efc85986e9";
|
||||
sha256 = "sha256-qz39vI9bRac9ZQg8FPrwv3/TW5zGlsvs2me5aE5vvZo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ just ];
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
|
||||
let
|
||||
openShiftVersion = "4.14.7";
|
||||
okdVersion = "4.14.0-0.okd-2023-12-01-225814";
|
||||
microshiftVersion = "4.14.7";
|
||||
openShiftVersion = "4.14.8";
|
||||
okdVersion = "4.14.0-0.okd-scos-2024-01-10-151818";
|
||||
microshiftVersion = "4.14.8";
|
||||
podmanVersion = "4.4.4";
|
||||
writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
|
||||
gitCommit = "6d23b6aa727bdefe4b5d1a77b2f9da7cec477a3e";
|
||||
gitHash = "sha256-NeCARhDmqIukBpnf6fkI0FTE4D9FUaWjBd7eG29eu9A=";
|
||||
gitCommit = "54a6f9a15155edb2bdb70128c7c535fc69841031";
|
||||
gitHash = "sha256-tjrlh31J3fDiYm2+PUnVVRIxxQvJKQVLcYEnMekD4Us=";
|
||||
in
|
||||
buildGoModule rec {
|
||||
version = "2.31.0";
|
||||
version = "2.32.0";
|
||||
pname = "crc";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
# Originally, this package was under the attribute `du-dust`, since `dust` was taken.
|
||||
# Since then, `dust` has been freed up, allowing this package to take that attribute.
|
||||
# However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
|
||||
pname = "du-dust";
|
||||
version = "0.9.0";
|
||||
|
||||
|
|
@ -8,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "bootandy";
|
||||
repo = "dust";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5X7gRMTUrG6ecZnwExBTadOJo/HByohTMDsgxFmp1HM=";
|
||||
hash = "sha256-5X7gRMTUrG6ecZnwExBTadOJo/HByohTMDsgxFmp1HM=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.12.28";
|
||||
version = "2.12.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4YW261qQtbfbX08zuGzr3qH470DaWUDIVaex7qYe2tI=";
|
||||
hash = "sha256-V0oQ43ZTgzXjp+jZvF0UxfjU7vhbvKuDG2rBvB1pEOk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w5R7eVrnpcKu0/V2gAeZ7RL6VyA57INcOU31Jhwf1so=";
|
||||
vendorHash = "sha256-OKNwYQCiB07cpnmQmJR0OJ3gX4VtXEcCPzsINEHj8Zg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "invidtui";
|
||||
version = "0.3.8";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkhz";
|
||||
repo = "invidtui";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-m2ygORf6GIJZXYYJKy6i12wDEkxQywtYdCutHeiyNYY=";
|
||||
hash = "sha256-3F/JWdYjb3Wtd2eBkEmId3SCVapu2gCgLFowK59RXRc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HQ6JHXiqawDwSV48/Czbao4opnuz1LqIBdcObrkCfNs=";
|
||||
vendorHash = "sha256-rwKx3h0X7RfIZ9lE/4TJoK0BR6f/lPcLNFbQjUtq/Tk=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
31
pkgs/by-name/pg/pget/package.nix
Normal file
31
pkgs/by-name/pg/pget/package.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "pget";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Code-Hex";
|
||||
repo = "pget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SDe9QH1iSRfMBSCfYiOJPXUbDvxH5cCCWvQq9uTWT9Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-p9sgvk5kfim3rApgp++1n05S9XrOWintxJfCeeySuBo=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X=main.version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The fast, resumable file download client";
|
||||
homepage = "https://github.com/Code-Hex/pget?tab=readme-ov-file";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Ligthiago ];
|
||||
mainProgram = "pget";
|
||||
};
|
||||
}
|
||||
|
|
@ -7,10 +7,10 @@
|
|||
inherit buildUnstable;
|
||||
}).overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.14.0+20240119git1a0826937";
|
||||
version = "1.14.0+20240130git6e173a1bb";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-bv5+6DVzBFt5XeKcLJFpUHB5T1RKCNi/CuXXpIn6e9k=";
|
||||
hash = "sha256-D4DjZYsvtlJXgoAHkYb7qPqbNfpidXHmEozEj6nPPqA=";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "unstable-2024-01-21";
|
||||
version = "unstable-2024-02-07";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "3e1183285a94a0930c9b09fd4fa73ac3a5d24fda";
|
||||
hash = "sha256-hhxcj/jVBOm7E63Z9sS3SnFjexQEXVtw3QU5n/4hkVI=";
|
||||
rev = "300a3d7b3ed399721cef59e9ed9efe8a1d4e0f6f";
|
||||
hash = "sha256-uwHXa4GhXNJHroQG8t3VQggvdCA3G4/1d/XVfsgeI7E=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
|
|
|||
|
|
@ -8,20 +8,25 @@
|
|||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.14.0";
|
||||
format = "setuptools";
|
||||
version = "1.14.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tb8BCpQtEj/0/dGSqTf+c0V0NwGZYx8y0oEHpoJWqhM=";
|
||||
hash = "sha256-+RupyR6W5fYR1n28anASGIXI6J53CU4WG1QC+HIZi/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
|
|
|
|||
|
|
@ -1,25 +1,44 @@
|
|||
[
|
||||
{
|
||||
"version": "latest",
|
||||
"buildId": "1.0.025241",
|
||||
"publishDate": "2023-11-30T02:51:40.8356813Z",
|
||||
"buildId": "1.0.025891",
|
||||
"publishDate": "2024-02-02T19:23:37.1915908Z",
|
||||
"files": {
|
||||
"linux-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient",
|
||||
"sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0"
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/linux/StaticSitesClient",
|
||||
"sha": "798b4032d1b6cd3f7057a6b7510c502dd69fa8cb4d27d47433542e8e80e9f87c"
|
||||
},
|
||||
"win-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe",
|
||||
"sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d"
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/windows/StaticSitesClient.exe",
|
||||
"sha": "097f9633c12b55e85e4ea9c053576a94b4f5847ce3a5a7671112c881878cfc4b"
|
||||
},
|
||||
"osx-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient",
|
||||
"sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd"
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/macOS/StaticSitesClient",
|
||||
"sha": "142310370774f91526c5d08ebde2f0b224b4f7f88bb6e514d25c1ef6f04fd8c8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"version": "stable",
|
||||
"buildId": "1.0.025891",
|
||||
"publishDate": "2024-02-02T19:23:37.1915908Z",
|
||||
"files": {
|
||||
"linux-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/linux/StaticSitesClient",
|
||||
"sha": "798b4032d1b6cd3f7057a6b7510c502dd69fa8cb4d27d47433542e8e80e9f87c"
|
||||
},
|
||||
"win-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/windows/StaticSitesClient.exe",
|
||||
"sha": "097f9633c12b55e85e4ea9c053576a94b4f5847ce3a5a7671112c881878cfc4b"
|
||||
},
|
||||
"osx-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/macOS/StaticSitesClient",
|
||||
"sha": "142310370774f91526c5d08ebde2f0b224b4f7f88bb6e514d25c1ef6f04fd8c8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"version": "backup",
|
||||
"buildId": "1.0.025241",
|
||||
"publishDate": "2023-11-30T02:51:40.8356813Z",
|
||||
"files": {
|
||||
|
|
@ -36,24 +55,5 @@
|
|||
"sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"version": "backup",
|
||||
"buildId": "1.0.025142",
|
||||
"publishDate": "2023-11-20T09:32:48.489649Z",
|
||||
"files": {
|
||||
"linux-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/linux/StaticSitesClient",
|
||||
"sha": "f36cce34f04b045e3ea5de5c201ce6663925d9680e3b5986b417534898b995b2"
|
||||
},
|
||||
"win-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/windows/StaticSitesClient.exe",
|
||||
"sha": "1e8932e2c4189d40657db888f82dfb030c2d41951421dd9a68712960e7c7fa7b"
|
||||
},
|
||||
"osx-x64": {
|
||||
"url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/macOS/StaticSitesClient",
|
||||
"sha": "891faef16ae06fc609f787ffce7d6a1816e24fddfcaef9bc10e3b50208fe29aa"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.110.0";
|
||||
version = "0.110.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5BMaOuiXz8SMfaB7qFvCyboGFKxzenkEVwj25Qh4MKw=";
|
||||
sha256 = "sha256-+OzBWooLpI4WnyBPRlwLGZVFrckXGeoDJilsEE00slk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xJnBMSfYwx6uHuMjyR9IWGHwt3fNajDr6DW8o+J+lj8=";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-cM4PiNbfE2sEQHzklBgsJdN/iVK0nT9iZ1F/Cb5tLtM=";
|
||||
hash = "sha256-3KZWXVwvzy3mZkh6pGZpeQQp2aU4V9TyBcJXU4Au4Rs=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/include/Treasures.h b/include/Treasures.h
|
||||
index 614078f..a00b4f6 100644
|
||||
--- a/include/Treasures.h
|
||||
+++ b/include/Treasures.h
|
||||
@@ -13,6 +13,8 @@
|
||||
#ifndef TREASURES_H
|
||||
#define TREASURES_H
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include "AssetsCollection.h"
|
||||
|
||||
extern "C" {
|
||||
|
|
@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
|
|||
rev = "r${rev}";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./add-cstdint-include-to-crossfire-server.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python39 ];
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
, openssl
|
||||
, swig
|
||||
, which
|
||||
, python3
|
||||
, armTrustedFirmwareAllwinner
|
||||
, armTrustedFirmwareAllwinnerH6
|
||||
, armTrustedFirmwareAllwinnerH616
|
||||
|
|
@ -44,6 +45,7 @@ let
|
|||
version ? null
|
||||
, src ? null
|
||||
, filesToInstall
|
||||
, pythonScriptsToInstall ? { }
|
||||
, installDir ? "$out"
|
||||
, defconfig
|
||||
, extraConfig ? ""
|
||||
|
|
@ -63,6 +65,10 @@ let
|
|||
] ++ extraPatches;
|
||||
|
||||
postPatch = ''
|
||||
${lib.concatMapStrings (script: ''
|
||||
substituteInPlace ${script} \
|
||||
--replace "#!/usr/bin/env python3" "#!${pythonScriptsToInstall.${script}}/bin/python3"
|
||||
'') (builtins.attrNames pythonScriptsToInstall)}
|
||||
patchShebangs tools
|
||||
patchShebangs scripts
|
||||
'';
|
||||
|
|
@ -110,12 +116,12 @@ let
|
|||
runHook preInstall
|
||||
|
||||
mkdir -p ${installDir}
|
||||
cp ${lib.concatStringsSep " " filesToInstall} ${installDir}
|
||||
cp ${lib.concatStringsSep " " (filesToInstall ++ builtins.attrNames pythonScriptsToInstall)} ${installDir}
|
||||
|
||||
mkdir -p "$out/nix-support"
|
||||
${lib.concatMapStrings (file: ''
|
||||
echo "file binary-dist ${installDir}/${builtins.baseNameOf file}" >> "$out/nix-support/hydra-build-products"
|
||||
'') filesToInstall}
|
||||
'') (filesToInstall ++ builtins.attrNames pythonScriptsToInstall)}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -128,7 +134,7 @@ let
|
|||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ];
|
||||
} // extraMeta;
|
||||
} // removeAttrs args [ "extraMeta" ]));
|
||||
} // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ]));
|
||||
in {
|
||||
inherit buildUBoot;
|
||||
|
||||
|
|
@ -154,6 +160,10 @@ in {
|
|||
"tools/mkenvimage"
|
||||
"tools/mkimage"
|
||||
];
|
||||
|
||||
pythonScriptsToInstall = {
|
||||
"tools/efivar.py" = (python3.withPackages (ps: [ ps.pyopenssl ]));
|
||||
};
|
||||
};
|
||||
|
||||
ubootA20OlinuxinoLime = buildUBoot {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@ let
|
|||
# NOTE: When updating these, please also take a look at the changes done to
|
||||
# kernel config in the xanmod version commit
|
||||
ltsVariant = {
|
||||
version = "6.1.74";
|
||||
hash = "sha256-PqCojvh7JwTcavtQHB8l/WxCTg94ndOy9KGVXsmGO/Y=";
|
||||
version = "6.1.76";
|
||||
hash = "sha256-0nBdUFRGMWM3IL/q8CYiDEUA/sIrYPMkzsBQen30o2E=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.6.13";
|
||||
hash = "sha256-RTfa9eIGYDqnffFnOFNaghKoGcHVy4rGYQkYumcw6Tk=";
|
||||
version = "6.6.15";
|
||||
hash = "sha256-KHn4Ntm1QStgJRWzwmPYXEbEcuZcF4pWJ964wc6J2Wk=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import ./generic.nix {
|
||||
version = "3.2.1";
|
||||
hash = "sha256-nXdyDJIU60Lx9cvpLuUp3E7MUnaZvvGDm+UKbXJRH0o=";
|
||||
version = "3.2.2";
|
||||
hash = "sha256-BCesNAYE3RyxfBAzK2/6+PcV1W+1ZEZQKVSLSq/pWC8=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import ./generic.nix {
|
||||
version = "2.17.8";
|
||||
hash = "sha256-DWAwepAxl90ay7MXPCz++BicaeSHYuZ06O8VeFZac+U=";
|
||||
version = "2.17.9";
|
||||
hash = "sha256-4bP6RyZ2YmhT8i1j+VnlrQYeG/V+G71ETQ7Yj5R++LE=";
|
||||
updateScriptArgs = "--lts=true --regex '2\.17.*'";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
|
||||
"ci-path": "/nix/store/ghfxriicygwcrxvm45r0cm9g0vshpw01-nixpkgs-check-by-name"
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"ci-path": "/nix/store/4kv4fyb6x5ivn0qncg7d9i5zhqhzy7bi-nixpkgs-check-by-name"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.22.2";
|
||||
version = "24.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L0Cf6Y762mHan4q3zfNKW2feQ+EzjO4GGfXVH0+LFd0=";
|
||||
hash = "sha256-a8XWJz8zcR7G03Df5f2+l6ZLTDbCp6GaJJQBMm6wNhY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, SDL2
|
||||
, makeWrapper
|
||||
, wget
|
||||
, which
|
||||
, Accelerate
|
||||
, CoreGraphics
|
||||
, CoreML
|
||||
|
|
@ -39,6 +40,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
patches = [ ./download-models.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
makeWrapper
|
||||
] ++ lib.optionals cudaSupport ( with cudaPackages ;[
|
||||
cuda_nvcc
|
||||
|
|
@ -60,6 +62,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
# A temporary hack for reducing the closure size, remove once cudaPackages
|
||||
# have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792
|
||||
cuda_cccl.dev # provides nv/target
|
||||
cuda_cudart.dev
|
||||
cuda_cudart.lib
|
||||
cuda_cudart.static
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "juicefs";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juicedata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dMzBgwd5tVxE6OFHf6QTZfoqgL/t2pX+OgI6Pki6PG8=";
|
||||
sha256 = "sha256-Sf68N5ZKveKM6xZEqF7Ah0KGgOx1cGZpJ2lYkUlgpI0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-orq03bwN1cbwHoZFXz92tcA2F0oivGR/C5EJDAPA+pk=";
|
||||
vendorHash = "sha256-ofUo/3EQPhXPNeD/3to5oFir/3eAaf9WBHR4DOzcxBQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@
|
|||
, cmake
|
||||
, pkg-config
|
||||
, cctools
|
||||
, makeWrapper
|
||||
, python3
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, vulkan-validation-layers
|
||||
}:
|
||||
let
|
||||
glslang = fetchFromGitHub {
|
||||
|
|
@ -32,27 +34,27 @@ let
|
|||
spirv-headers = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78";
|
||||
hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0=";
|
||||
rev = "d13b52222c39a7e9a401b44646f0ca3a640fbd47";
|
||||
hash = "sha256-bjiWGSmpEbydXtCLP8fRZfPBvdCzBoJxKXTx3BroQbg=";
|
||||
};
|
||||
|
||||
spirv-tools = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "a73e724359a274d7cf4f4248eba5be1e7764fbfd";
|
||||
hash = "sha256-vooJHtgVRlBNkQG4hulYOxIgHH4GMhXw7N4OEbkKJvU=";
|
||||
rev = "d87f61605b3647fbceae9aaa922fce0031afdc63";
|
||||
hash = "sha256-lB2i6wjehIFDOQdIPUvCy3zzcnJSsR5vNawPhGmb0es=";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amber";
|
||||
version = "unstable-2022-04-21";
|
||||
version = "unstable-2023-09-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed";
|
||||
hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA=";
|
||||
rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc";
|
||||
hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -62,6 +64,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
|
@ -69,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
# Tests are disabled so we do not have to pull in googletest and more dependencies
|
||||
cmakeFlags = [ "-DAMBER_SKIP_TESTS=ON" ];
|
||||
cmakeFlags = [ "-DAMBER_SKIP_TESTS=ON" "-DAMBER_DISABLE_WERROR=ON" ];
|
||||
|
||||
prePatch = ''
|
||||
cp -r ${glslang}/ third_party/glslang
|
||||
|
|
@ -79,14 +82,14 @@ stdenv.mkDerivation rec {
|
|||
cp -r ${spirv-headers}/ third_party/spirv-headers
|
||||
chmod u+w -R third_party
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "-Werror" ""
|
||||
substituteInPlace tools/update_build_version.py \
|
||||
--replace "not os.path.exists(directory)" "True"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 -t $out/bin amber image_diff
|
||||
wrapProgram $out/bin/amber \
|
||||
--suffix VK_LAYER_PATH : ${vulkan-validation-layers}/share/vulkan/explicit_layer.d
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mise";
|
||||
version = "2024.2.4";
|
||||
version = "2024.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SBfnfEY2ostzVWUWPB1f381XnzcNpkqeV+L9xRcRYaw=";
|
||||
hash = "sha256-dShe8h1aRDZPwzCKAhJag5xfylYqWJuCiB9A4afV8g0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q63h6ln1uswyvAhWlKhMLJGCZRJCbY3Rovu+jJ1O+0c=";
|
||||
cargoHash = "sha256-3yV26WZid5e7H9UsAaKLjSvL1MSQ+M5BjBR5Mt701Io=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdnf";
|
||||
version = "0.72.0";
|
||||
version = "0.73.0";
|
||||
|
||||
outputs = [ "out" "dev" "py" ];
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ou7cXJz4g8cx2KjeX+IFRA2m158PGKcb9jCXFuAOKqU=";
|
||||
hash = "sha256-zduxlroqo7aeQYhiTWmEK47YG/ll8hLH/d3xtXdcYhk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, boost, pkg-config, cmake, catch2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, pkg-config, cmake, catch2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grip-search";
|
||||
|
|
@ -17,8 +17,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ boost ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace src/general/config.h --replace "CUSTOM-BUILD" "${version}"
|
||||
patches = [
|
||||
# Can be removed after this upstream PR gets merged: https://github.com/sc0ty/grip/pull/6
|
||||
(fetchpatch {
|
||||
name = "include-cstdint.patch";
|
||||
url = "https://github.com/sc0ty/grip/commit/da37b3c805306ee4ea617ce3f1487b8ee9876e50.patch";
|
||||
hash = "sha256-Xh++oDn5qn5NPgng7gfeCkO5FN9OmW+8fGhDLpAJfR8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -231,6 +231,7 @@ mapAliases ({
|
|||
drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15
|
||||
dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
|
||||
dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
|
||||
du-dust = dust; # Added 2024-01-19
|
||||
dylibbundler = macdylibbundler; # Added 2021-04-24
|
||||
|
||||
### E ###
|
||||
|
|
|
|||
|
|
@ -31060,7 +31060,7 @@ with pkgs;
|
|||
|
||||
dunst = callPackage ../applications/misc/dunst { };
|
||||
|
||||
du-dust = callPackage ../tools/misc/dust {
|
||||
dust = callPackage ../by-name/du/dust/package.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue