Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e048c645c9
@ -63,7 +63,12 @@ in rec {
|
||||
|
||||
assertMacAddress = name: group: attr:
|
||||
optional (attr ? ${name} && ! isMacAddress attr.${name})
|
||||
"Systemd ${group} field `${name}' must be a valid mac address.";
|
||||
"Systemd ${group} field `${name}' must be a valid MAC address.";
|
||||
|
||||
assertNetdevMacAddress = name: group: attr:
|
||||
optional (attr ? ${name} && (! isMacAddress attr.${name} || attr.${name} != "none"))
|
||||
"Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";
|
||||
|
||||
|
||||
isPort = i: i >= 0 && i <= 65535;
|
||||
|
||||
|
||||
@ -104,6 +104,7 @@ in {
|
||||
'';
|
||||
|
||||
services.phpfpm.pools.engelsystem = {
|
||||
phpPackage = pkgs.php81;
|
||||
user = "engelsystem";
|
||||
settings = {
|
||||
"listen.owner" = config.services.nginx.user;
|
||||
|
||||
@ -171,7 +171,7 @@ let
|
||||
"batadv"
|
||||
])
|
||||
(assertByteFormat "MTUBytes")
|
||||
(assertMacAddress "MACAddress")
|
||||
(assertNetdevMacAddress "MACAddress")
|
||||
];
|
||||
|
||||
sectionVLAN = checkUnitConfig "VLAN" [
|
||||
@ -223,6 +223,7 @@ let
|
||||
"PortRange"
|
||||
"FlowLabel"
|
||||
"IPDoNotFragment"
|
||||
"Independent"
|
||||
])
|
||||
(assertInt "VNI")
|
||||
(assertRange "VNI" 1 16777215)
|
||||
@ -242,6 +243,7 @@ let
|
||||
(assertInt "FlowLabel")
|
||||
(assertRange "FlowLabel" 0 1048575)
|
||||
(assertValueOneOf "IPDoNotFragment" (boolValues + ["inherit"]))
|
||||
(assertValueOneOf "Independent" boolValues)
|
||||
];
|
||||
|
||||
sectionTunnel = checkUnitConfig "Tunnel" [
|
||||
|
||||
@ -326,8 +326,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "astro-vscode";
|
||||
publisher = "astro-build";
|
||||
version = "1.0.6";
|
||||
sha256 = "sha256-/gpZtOO8MA/MJ1o9eG4qmPqhWRZ5E+elA9Rr/kpOprI=";
|
||||
version = "2.1.1";
|
||||
sha256 = "sha256-UVZOpkOHbLiwA4VfTgXxuIU8EtJLnqRa5zUVha6xQJY=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog";
|
||||
|
||||
56
pkgs/applications/misc/cartridges/default.nix
Normal file
56
pkgs/applications/misc/cartridges/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ blueprint-compiler
|
||||
, desktop-file-utils
|
||||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, lib
|
||||
, libadwaita
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, stdenv
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cartridges";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kra-mo";
|
||||
repo = "cartridges";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-DaeAdxgp6/a3H2ppgVxRjYUbHGZcyIeREVPX6FxE7bc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
(python3.withPackages (p: with p; [
|
||||
pillow
|
||||
pygobject3
|
||||
pyyaml
|
||||
requests
|
||||
]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK4 + Libadwaita game launcher";
|
||||
longDescription = ''
|
||||
A simple game launcher for all of your games.
|
||||
It has support for importing games from Steam, Lutris, Heroic
|
||||
and more with no login necessary.
|
||||
You can sort and hide games or download cover art from SteamGridDB.
|
||||
'';
|
||||
homepage = "https://apps.gnome.org/app/hu.kramo.Cartridges/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.getchoo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
k3sVersion = "1.26.5+k3s1";
|
||||
k3sCommit = "7cefebeaac7dbdd0bfec131ea7a43a45cb125354";
|
||||
k3sRepoSha256 = "0iz8w24lhb3mgwnks79ky4nypdqbjn91zm4nrj1ar3abkb5i8bg3";
|
||||
k3sVendorSha256 = "sha256-yPzpt9OZfW7qY9gFgrRVgmk2l9OSMMF85OY79MDCKTs=";
|
||||
k3sVersion = "1.26.6+k3s1";
|
||||
k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26";
|
||||
k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y";
|
||||
k3sVendorSha256 = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
k3sRootVersion = "0.12.2";
|
||||
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
|
||||
|
||||
@ -272,15 +272,15 @@ rec {
|
||||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.23";
|
||||
version = "20.10.25";
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-fNaRpstyG90Jzq3+U2A42Jj+ixb+m7tXLioIcsegPbQ=";
|
||||
cliHash = "sha256-Wi/NHn8erqvKEVEJqkc99cO/sfPHptwMT44Savcuw2M=";
|
||||
mobyRev = "v${version}";
|
||||
mobyHash = "sha256-nBPw/M4VC9XeZ9S33HWdWSjY2J2mYpI/TPOzvLjSmJM=";
|
||||
runcRev = "v1.1.4";
|
||||
runcHash = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
|
||||
containerdRev = "v1.6.15";
|
||||
containerdHash = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA=";
|
||||
mobyHash = "sha256-trJjQMYF/Uog7nvUlELyUYbsTPGz8Rn21v1/V5xhu+A=";
|
||||
runcRev = "v1.1.5";
|
||||
runcHash = "sha256-r5as3hb0zt+XPfxAPeH+YIc/n6IRlscPOZMGfhVE5C4=";
|
||||
containerdRev = "v1.6.20";
|
||||
containerdHash = "sha256-Nd3S6hmvA8LBFUN4XaQJMApbmwGIp6GTnFQimnYagZg=";
|
||||
tiniRev = "v0.19.0";
|
||||
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
|
||||
};
|
||||
|
||||
@ -46,6 +46,13 @@ lib.optional (lib.versionAtLeast version "11.0")
|
||||
enableShared
|
||||
;
|
||||
|
||||
# For some reason libgcc_s.so has major-version "2" on m68k but
|
||||
# "1" everywhere else. Might be worth changing this to "*".
|
||||
libgcc_s-version-major =
|
||||
if targetPlatform.isM68k
|
||||
then "2"
|
||||
else "1";
|
||||
|
||||
in
|
||||
(pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
|
||||
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
|
||||
@ -75,9 +82,9 @@ in
|
||||
# move libgcc from lib to its own output (libgcc)
|
||||
mkdir -p $libgcc/lib
|
||||
mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/
|
||||
mv $lib/${targetPlatformSlash}lib/libgcc_s.so.1 $libgcc/lib/
|
||||
mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/
|
||||
ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/
|
||||
ln -s $libgcc/lib/libgcc_s.so.1 $lib/${targetPlatformSlash}lib/
|
||||
ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/
|
||||
''
|
||||
#
|
||||
# Nixpkgs ordinarily turns dynamic linking into pseudo-static linking:
|
||||
@ -134,7 +141,7 @@ in
|
||||
# another eliminates the ability to make these queries.
|
||||
#
|
||||
+ ''
|
||||
patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.1
|
||||
patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.${libgcc_s-version-major}
|
||||
'');
|
||||
}))))
|
||||
|
||||
|
||||
@ -4,7 +4,4 @@ callPackage ./generic.nix (args // {
|
||||
baseVersion = "2.19";
|
||||
revision = "3";
|
||||
sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU=";
|
||||
postPatch = ''
|
||||
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
||||
'';
|
||||
})
|
||||
|
||||
9
pkgs/development/libraries/botan/3.0.nix
Normal file
9
pkgs/development/libraries/botan/3.0.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ callPackage, fetchpatch, lib, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
baseVersion = "3.1";
|
||||
revision = "1";
|
||||
sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms=";
|
||||
# reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default.
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
})
|
||||
@ -4,10 +4,11 @@
|
||||
, sourceExtension ? "tar.xz"
|
||||
, extraConfigureFlags ? ""
|
||||
, extraPatches ? [ ]
|
||||
, badPlatforms ? [ ]
|
||||
, postPatch ? null
|
||||
, knownVulnerabilities ? [ ]
|
||||
, CoreServices
|
||||
, Security
|
||||
, CoreServices ? null
|
||||
, Security ? null
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -54,9 +55,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cryptographic algorithms library";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
maintainers = with maintainers; [ raskin thillux ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd2;
|
||||
inherit badPlatforms;
|
||||
inherit knownVulnerabilities;
|
||||
};
|
||||
passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";
|
||||
|
||||
@ -188,7 +188,8 @@ final: prev: {
|
||||
|
||||
graphite-cli = prev."@withgraphite/graphite-cli".override {
|
||||
name = "graphite-cli";
|
||||
nativeBuildInputs = [ pkgs.installShellFiles ];
|
||||
nativeBuildInputs = with pkgs; [ installShellFiles pkg-config ];
|
||||
buildInputs = with pkgs; [ cairo pango pixman ];
|
||||
# 'gt completion' auto-detects zshell from environment variables:
|
||||
# https://github.com/yargs/yargs/blob/2b6ba3139396b2e623aed404293f467f16590039/lib/completion.ts#L45
|
||||
postInstall = ''
|
||||
|
||||
@ -30,7 +30,7 @@ let
|
||||
aarch64-linux = "aarch64-unknown-linux-musl";
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
buck2-version = "2023-07-15";
|
||||
buck2-version = "2023-07-18";
|
||||
src =
|
||||
let
|
||||
hashes = builtins.fromJSON (builtins.readFile ./hashes.json);
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ "x86_64-linux": "sha256-xd8MZF1xpVYqEDoL3nUBptiFMn9UkgC+zIgfDkDxwfM="
|
||||
, "x86_64-darwin": "sha256-d8GD7SwCM1gcWILkmSLRY7nq2w9+AMxgbGiWwAK0BAo="
|
||||
, "aarch64-linux": "sha256-zBVgIgQ+tlBUuHwsZB5JmQJtWZ5soKP6//NxkU96xmo="
|
||||
, "aarch64-darwin": "sha256-jswrwf37/0Rec551mORXYf+s45Nx16OeaRjRS9ROR4E="
|
||||
{ "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh"
|
||||
, "x86_64-linux": "sha256-vYEE1VXzT9qT2ImYYuWPCw/1mTrzngrUzxMBNldaUEo="
|
||||
, "x86_64-darwin": "sha256-0S82F2m6CX7ra/uByBuaGMVXP1ECN7Ydi9VEyrxYdTs="
|
||||
, "aarch64-linux": "sha256-zghI4zvm/MN8plIB+nuv/tfd8DJ7mEXMc39PW55ieds="
|
||||
, "aarch64-darwin": "sha256-euzixGUDb3W9B86HYPAgcNiTu3jxUVULAfNMKkFz5gU="
|
||||
}
|
||||
|
||||
@ -22,16 +22,13 @@ NFILE=pkgs/development/tools/build-managers/buck2/default.nix
|
||||
HFILE=pkgs/development/tools/build-managers/buck2/hashes.json
|
||||
rm -f "$HFILE" && touch "$HFILE"
|
||||
|
||||
marker="{"
|
||||
printf "{ \"_comment\": \"@generated by pkgs/development/tools/build-managers/buck2/update.sh\"\n" >> "$HFILE"
|
||||
for arch in "${ARCHS[@]}"; do
|
||||
IFS=: read -r arch_name arch_target <<< "$arch"
|
||||
sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/buck2-${arch_target}.zst")"
|
||||
srihash="$(nix hash to-sri --type sha256 "$sha256hash")"
|
||||
|
||||
echo "${marker} \"$arch_name\": \"$srihash\"" >> "$HFILE"
|
||||
marker=","
|
||||
echo ", \"$arch_name\": \"$srihash\"" >> "$HFILE"
|
||||
done
|
||||
|
||||
echo "}" >> "$HFILE"
|
||||
|
||||
sed -i \
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opensbi";
|
||||
version = "1.3";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riscv-software-src";
|
||||
repo = "opensbi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Dr16fVUGLYGnGYHkjAyqpJxt8p95F0CJIU9ESGWKGWo=";
|
||||
hash = "sha256-JNkPvmKYd5xbGB2lsZKWrpI6rBIckWbkLYu98bw7+QY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -134,6 +134,7 @@ let
|
||||
pkgs.pkgsLLVM.stdenv
|
||||
pkgs.pkgsStatic.bash
|
||||
pkgs.pkgsCross.arm-embedded.stdenv
|
||||
pkgs.pkgsCross.m68k.stdenv
|
||||
pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc
|
||||
#pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc
|
||||
pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iperf";
|
||||
version = "3.13";
|
||||
version = "3.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
|
||||
sha256 = "sha256-vuQnrrE9ai7iIHPyMmH2NxLYK++qg6yMtNtdpMK9yGU=";
|
||||
hash = "sha256-cj/MQwoCe8aVJij6KjrHdYSh0L0ygnXlc/ybIGwVUAQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ];
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://software.es.net/iperf/";
|
||||
homepage = "https://software.es.net/iperf/";
|
||||
description = "Tool to measure IP bandwidth using UDP or TCP";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
|
||||
@ -399,6 +399,8 @@ with pkgs;
|
||||
|
||||
caroline = callPackage ../development/libraries/caroline { };
|
||||
|
||||
cartridges = callPackage ../applications/misc/cartridges { };
|
||||
|
||||
castget = callPackage ../applications/networking/feedreaders/castget { };
|
||||
|
||||
castxml = callPackage ../development/tools/castxml { };
|
||||
@ -20351,6 +20353,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
};
|
||||
|
||||
# may add CoreServices and Security again, when MacOS uses Clang 14.0+ by default.
|
||||
botan3 = callPackage ../development/libraries/botan/3.0.nix { };
|
||||
|
||||
box2d = callPackage ../development/libraries/box2d { };
|
||||
|
||||
boxfort = callPackage ../development/libraries/boxfort { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user