Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt
2024-12-20 00:27:50 +01:00
58 changed files with 1002 additions and 253 deletions
@@ -177,6 +177,8 @@ in
startLimitIntervalSec = 500;
startLimitBurst = 5;
environment.PATH = lib.mkForce null; # don't use default PATH, needed for tray icon menu links to work
serviceConfig = {
# only add configFile if an application or a setting other than the default port is set to allow configuration from web UI
ExecStart = escapeSystemdExecArgs (
+10 -6
View File
@@ -6,6 +6,7 @@ import ./make-test-python.nix (
# test is flaky on aarch64
broken = pkgs.stdenv.hostPlatform.isAarch64;
maintainers = [ lib.maintainers.devusb ];
timeout = 600;
};
nodes.sunshine =
@@ -58,20 +59,23 @@ import ./make-test-python.nix (
# initiate pairing from moonlight
moonlight.execute("moonlight pair sunshine --pin 1234 >&2 & disown")
moonlight.wait_for_console_text("Executing request")
moonlight.wait_for_console_text("Executing request.*pair")
# respond to pairing request from sunshine
sunshine.succeed("curl --insecure -u sunshine:sunshine -d '{\"pin\": \"1234\"}' https://localhost:47990/api/pin")
sunshine.succeed("curl --fail --insecure -u sunshine:sunshine -d '{\"pin\": \"1234\"}' https://localhost:47990/api/pin")
# close moonlight once pairing complete
moonlight.send_key("kp_enter")
# wait until pairing is complete
moonlight.wait_for_console_text("Executing request.*phrase=pairchallenge")
# hide icewm panel
sunshine.send_key("ctrl-alt-h")
# put words on the sunshine screen for moonlight to see
sunshine.execute("gxmessage 'hello world' -center -font 'sans 75' >&2 & disown")
sunshine.execute("gxmessage ' ABC' -center -font 'consolas 100' -fg '#FFFFFF' -bg '#000000' -borderless -geometry '2000x2000' -buttons \"\" >&2 & disown")
# connect to sunshine from moonlight and look for the words
moonlight.execute("moonlight --video-decoder software stream sunshine 'Desktop' >&2 & disown")
moonlight.wait_for_text("hello world")
moonlight.wait_for_console_text("Dropping window event during flush")
moonlight.wait_for_text("ABC")
'';
}
)
+2 -2
View File
@@ -112,13 +112,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "blender";
version = "4.3.1";
version = "4.3.2";
srcs = [
(fetchzip {
name = "source";
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
hash = "sha256-+pRZ9ZSe656pdzR60oZ5ayGJ6gvzPOMKyATKA381RKg=";
hash = "sha256-LCU2JpQbvQ+W/jC+H8J2suh+X5sTLOG9TcE2EeHqVh4=";
})
(fetchgit {
name = "assets";
@@ -223,9 +223,10 @@ let
name = "source.tar.zstd";
downloadToTemp = false;
passthru.unpack = true;
nativeBuildInputs = [ zstd ];
postFetch = ''
tar \
--use-compress-program="${lib.getExe zstd} -T$NIX_BUILD_CORES" \
--use-compress-program="zstd -T$NIX_BUILD_CORES" \
--sort=name \
--mtime="1970-01-01" \
--owner=root --group=root \
@@ -1,9 +1,9 @@
{
"chromium": {
"version": "131.0.6778.139",
"version": "131.0.6778.204",
"chromedriver": {
"hash_darwin": "sha256-QLYUD5SDHoPdiPHX46ps/oBhzDjwxBuQEh0hzbEY73Q=",
"hash_darwin_aarch64": "sha256-VZ4nS9H1J1R6OXqqOaFLHM2rD8dyUTTWur5X1CNm4sU="
"hash_darwin": "sha256-xxTu1aPNTfGpaPFC55NihzJbcjDL3fBXimQIGBPaU18=",
"hash_darwin_aarch64": "sha256-WyNiLNIPPUesDCYYs6Uc0aZDou0N60kZvL31DlqHMtw="
},
"deps": {
"depot_tools": {
@@ -19,8 +19,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a",
"hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=",
"rev": "52183f9e99a61056f9b78535f53d256f1516f2a0",
"hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -760,8 +760,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5",
"hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I="
"rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0",
"hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc="
}
}
},
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-buildx";
version = "0.18.0";
version = "0.19.3";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
hash = "sha256-mw66AF+JwavuB8r2qzo50rguqZaUfzCVmyYI6yk7ig8=";
hash = "sha256-0LK79CdZF3JGuxUgM3V4HhZ4rpVoXEQ9YG8vdAn+cyA=";
};
doCheck = false;
@@ -1,5 +1,5 @@
# shellcheck shell=bash
set -euo pipefail
set -e
export PATH="@binPath@:$PATH"
+4
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
python3Packages,
versionCheckHook,
}:
python3Packages.buildPythonApplication rec {
@@ -30,6 +31,7 @@ python3Packages.buildPythonApplication rec {
azure-mgmt-compute
azure-storage-blob
boto3
distutils
google-cloud-compute
google-cloud-storage
grpcio
@@ -41,6 +43,7 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = with python3Packages; [
mock
pytestCheckHook
versionCheckHook
];
disabledTests =
@@ -57,6 +60,7 @@ python3Packages.buildPythonApplication rec {
description = "Backup and Recovery Manager for PostgreSQL";
homepage = "https://www.pgbarman.org/";
changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS";
mainProgram = "barman";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ freezeboy ];
platforms = platforms.unix;
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bio-gappa";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "lczech";
repo = "gappa";
rev = "v${finalAttrs.version}";
hash = "sha256-VAp9e5Cu3tTeWSOTZ8kPG1eOyocYZiJsy/s+MWbCMLI=";
hash = "sha256-YuvJyLMfGUKXvJyMe/HadrCc6HRnn4bipepX2FOuGfM=";
fetchSubmodules = true;
};
@@ -1,12 +0,0 @@
diff --git a/scripts/meson-install.sh b/scripts/meson-install.sh
index 859ae81..05a1c58 100644
--- a/scripts/meson-install.sh
+++ b/scripts/meson-install.sh
@@ -7,5 +7,5 @@ fi
BOLT_DBDIR=$1
-echo "Creating database dir: ${BOLT_DBDIR}"
-mkdir -p "${DESTDIR}/${BOLT_DBDIR}"
+# echo "Creating database dir: ${BOLT_DBDIR}"
+# mkdir -p "${DESTDIR}/${BOLT_DBDIR}"
+4 -10
View File
@@ -22,26 +22,23 @@
stdenv.mkDerivation rec {
pname = "bolt";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "bolt";
repo = "bolt";
rev = version;
sha256 = "sha256-6m4Yrev9W5WV4/pptc8tJ4hc6QSC+eJ7BSt2mx33s9U=";
hash = "sha256-sDPipSIT2MJMdsOjOQSB+uOe6KXzVnyAqcQxPPr2NsU=";
};
patches = [
# meson install tries to create /var/lib/boltd
./0001-skip-mkdir.patch
# Test does not work on ZFS with atime disabled.
# Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167
(fetchpatch {
url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/c2f1d5c40ad71b20507e02faa11037b395fac2f8.diff";
revert = true;
sha256 = "6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I=";
hash = "sha256-6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I=";
})
];
@@ -59,16 +56,13 @@ stdenv.mkDerivation rec {
ninja
pkg-config
glib
] ++ lib.optional (!doCheck) python3;
];
buildInputs = [
polkit
systemd
];
# https://gitlab.freedesktop.org/bolt/bolt/-/issues/181
doCheck = false;
preCheck = ''
export LD_LIBRARY_PATH=${umockdev.out}/lib/
'';
@@ -0,0 +1,21 @@
--- old/ccx_2.22/src/Makefile 2024-08-06 01:13:21.031704000 +0800
+++ new/ccx_2.22/src/Makefile 2024-12-19 00:27:06.848862592 +0800
@@ -18,15 +18,10 @@
OCCXC = $(SCCXC:.c=.o)
OCCXMAIN = $(SCCXMAIN:.c=.o)
-DIR=../../../SPOOLES.2.2
+LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack
-LIBS = \
- $(DIR)/spooles.a \
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
-
-ccx_2.22: $(OCCXMAIN) ccx_2.22.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.22.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp
+ccx_2.22: $(OCCXMAIN) ccx_2.22.a
+ $(CC) $(CFLAGS) -c ccx_2.22.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp
ccx_2.22.a: $(OCCXF) $(OCCXC)
ar vr $@ $?
@@ -12,12 +12,12 @@
assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64);
stdenv.mkDerivation rec {
pname = "calculix";
version = "2.19";
pname = "calculix-ccx";
version = "2.22";
src = fetchurl {
url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2";
sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7";
hash = "sha256-OpTcx3WjH1cCKXNLNB1rBjAevcdZhj35Aci5vxhUwLw=";
};
nativeBuildInputs = [ gfortran ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
];
patches = [
./calculix.patch
./calculix-ccx.patch
];
postPatch = ''
@@ -43,15 +43,19 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
runHook preInstall
install -Dm0755 ccx_${version} $out/bin/ccx
runHook postInstall
'';
meta = with lib; {
homepage = "http://www.calculix.de/";
meta = {
homepage = "http://www.calculix.de";
description = "Three-dimensional structural finite element program";
mainProgram = "ccx";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ gebner ];
platforms = platforms.unix;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ gebner ];
platforms = lib.platforms.unix;
};
}
-23
View File
@@ -1,23 +0,0 @@
diff --git a/ccx_2.19/src/Makefile b/ccx_2.19/src/Makefile
index c503513..8a69a0c 100755
--- a/ccx_2.19/src/Makefile
+++ b/ccx_2.19/src/Makefile
@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
OCCXC = $(SCCXC:.c=.o)
OCCXMAIN = $(SCCXMAIN:.c=.o)
-DIR=../../../SPOOLES.2.2
+LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack
-LIBS = \
- $(DIR)/spooles.a \
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
-
-ccx_2.19: $(OCCXMAIN) ccx_2.19.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
+ccx_2.19: $(OCCXMAIN) ccx_2.19.a
+ $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
ccx_2.19.a: $(OCCXF) $(OCCXC)
ar vr $@ $?
+6 -6
View File
@@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "clockify";
version = "2.1.17.1354";
version = "2.2.9.2224";
src = fetchurl {
url = "https://web.archive.org/web/20240406052908/https://clockify.me/downloads/Clockify_Setup.AppImage";
hash = "sha256-G5VOAf6PrjHUsnk7IlXdqJ2D941cnggjuHkkgrOaVaA=";
url = "https://web.archive.org/web/20241218115559/https://clockify.me/downloads/Clockify_Setup.AppImage";
hash = "sha256-/L70C+sTFJPzXkt1NSak2wVTRtFy2zInIlmLPG5LqeY=";
};
extraInstallCommands =
@@ -22,13 +22,13 @@ appimageTools.wrapType2 rec {
install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/clockify.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
meta = {
description = "Free time tracker and timesheet app that lets you track work hours across projects";
homepage = "https://clockify.me";
license = licenses.unfree;
license = lib.licenses.unfree;
maintainers = [ ];
mainProgram = "clockify";
platforms = [ "x86_64-linux" ];
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcpuid";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "anrieff";
repo = "libcpuid";
rev = "v${version}";
hash = "sha256-OZfsEk6sTTvwgAetjilSWbkfC1nMQnPH3oL0IeuqObA=";
hash = "sha256-/28yo1V4/xYMirt2bNTB/l9Xl8NgRmxTitOW21TY8gE=";
};
nativeBuildInputs = [ autoreconfHook ];
+2 -2
View File
@@ -81,13 +81,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "4293";
version = "4367";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-ab45VNNJvzp6t8Bk2GSuTBsP4bWcyOT4d+TvaIHs5qo=";
hash = "sha256-N7uNIb6bkTsTx/kgbnc7mahYUIeV1ks4piwwgoXauRM=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
+8 -8
View File
@@ -147,8 +147,8 @@ let
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "45f097645efb11b6d09a5b4adbbfd7c312ac0126";
hash = "sha256-kZlH+Xpt38Ymc9TW7qRVyN7ISwed4ycA0M0808+UcXM=";
rev = "6423c65aa8be1b98f990cf207422505ac5a441a1";
hash = "sha256-DI3VhXEeok/wIFuM/l1hJJZlpxvyKY6Kmi97o3g0Ppk=";
fetchSubmodules = true;
};
postPatch =
@@ -246,7 +246,7 @@ let
src = fetchFromGitHub {
owner = "mudler";
repo = "go-piper";
rev = "9d0100873a7dbb0824dfea40e8cec70a1b110759";
rev = "e10ca041a885d4a8f3871d52924b47792d5e5aa0";
hash = "sha256-Yv9LQkWwGpYdOS0FvtP0vZ0tRyBAx27sdmziBR4U4n8=";
fetchSubmodules = true;
};
@@ -299,8 +299,8 @@ let
src = fetchFromGitHub {
owner = "ggerganov";
repo = "whisper.cpp";
rev = "a5abfe6a90495f7bf19fe70d016ecc255e97359c";
hash = "sha256-XSPO1Wtqlq1krwAH98jMIGWa1Npmnjd5oCJ0lc3D3H4=";
rev = "31aea563a83803c710691fed3e8d700e06ae6788";
hash = "sha256-YCYRx+DHhxazJ3ZAdmuqeYHOX5v6JEZhU9eo487yEtk=";
};
nativeBuildInputs = [
@@ -431,12 +431,12 @@ let
stdenv;
pname = "local-ai";
version = "2.22.1";
version = "2.23.0";
src = fetchFromGitHub {
owner = "go-skynet";
repo = "LocalAI";
rev = "v${version}";
hash = "sha256-vIjjGs3IIxnWlLsybQNWJHbWNnoInVh+otJ7vNODcik=";
hash = "sha256-7i2qW9yh++YQrEnjjxkHB7GJZSIIJQFJ9GyU2Rp9+kk=";
};
prepare-sources =
@@ -460,7 +460,7 @@ let
self = buildGo123Module.override { stdenv = effectiveStdenv; } {
inherit pname version src;
vendorHash = "sha256-tb2nVUCUdaOWHpJz4zMqgfJ4PYUqGwV/0lj76n36sUg=";
vendorHash = "sha256-bLeKh0aKSQrD5jTydG0ZLW5RCNb3oKvjCSeA9juI3B8=";
env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4";
+328 -65
View File
@@ -1,69 +1,332 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
# TODO: This format file is obsolete, consider migrating to JSON.
{ fetchNuGet }: [
(fetchNuGet { pname = "AutomaticGraphLayout"; version = "1.1.12"; hash = "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo="; })
(fetchNuGet { pname = "AutomaticGraphLayout.Drawing"; version = "1.1.12"; hash = "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0="; })
(fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; })
(fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; })
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; })
(fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.1.0"; hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; })
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; })
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; })
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; })
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; })
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; })
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; })
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; })
(fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; })
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; })
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; })
(fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; })
(fetchNuGet { pname = "DotUtils.StreamUtils.Sources"; version = "0.0.8"; hash = "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw="; })
(fetchNuGet { pname = "GuiLabs.Language.Xml"; version = "1.2.93"; hash = "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk="; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; })
(fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; })
(fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.5.0"; hash = "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw="; })
(fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; })
(fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.5.0"; hash = "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI="; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.5.0"; hash = "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
(fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; })
(fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; })
(fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.141"; hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI="; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; })
(fetchNuGet { pname = "Nullable"; version = "1.3.1"; hash = "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM="; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; })
(fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; })
(fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; })
(fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; })
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; })
{ fetchNuGet }:
[
(fetchNuGet {
pname = "AutomaticGraphLayout";
version = "1.1.12";
hash = "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo=";
})
(fetchNuGet {
pname = "AutomaticGraphLayout.Drawing";
version = "1.1.12";
hash = "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0=";
})
(fetchNuGet {
pname = "Avalonia";
version = "11.0.0";
hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=";
})
(fetchNuGet {
pname = "Avalonia";
version = "11.1.3";
hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=";
})
(fetchNuGet {
pname = "Avalonia.Angle.Windows.Natives";
version = "2.1.22045.20230930";
hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=";
})
(fetchNuGet {
pname = "Avalonia.AvaloniaEdit";
version = "11.1.0";
hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=";
})
(fetchNuGet {
pname = "Avalonia.BuildServices";
version = "0.0.28";
hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU=";
})
(fetchNuGet {
pname = "Avalonia.BuildServices";
version = "0.0.29";
hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=";
})
(fetchNuGet {
pname = "Avalonia.Controls.ColorPicker";
version = "11.1.3";
hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU=";
})
(fetchNuGet {
pname = "Avalonia.Controls.DataGrid";
version = "11.1.3";
hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc=";
})
(fetchNuGet {
pname = "Avalonia.Desktop";
version = "11.1.3";
hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w=";
})
(fetchNuGet {
pname = "Avalonia.Diagnostics";
version = "11.1.3";
hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo=";
})
(fetchNuGet {
pname = "Avalonia.FreeDesktop";
version = "11.1.3";
hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI=";
})
(fetchNuGet {
pname = "Avalonia.Native";
version = "11.1.3";
hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs=";
})
(fetchNuGet {
pname = "Avalonia.Remote.Protocol";
version = "11.0.0";
hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=";
})
(fetchNuGet {
pname = "Avalonia.Remote.Protocol";
version = "11.1.3";
hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=";
})
(fetchNuGet {
pname = "Avalonia.Skia";
version = "11.1.3";
hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM=";
})
(fetchNuGet {
pname = "Avalonia.Themes.Fluent";
version = "11.1.3";
hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8=";
})
(fetchNuGet {
pname = "Avalonia.Themes.Simple";
version = "11.1.3";
hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM=";
})
(fetchNuGet {
pname = "Avalonia.Win32";
version = "11.1.3";
hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc=";
})
(fetchNuGet {
pname = "Avalonia.X11";
version = "11.1.3";
hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw=";
})
(fetchNuGet {
pname = "DotUtils.StreamUtils.Sources";
version = "0.0.8";
hash = "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw=";
})
(fetchNuGet {
pname = "GuiLabs.Language.Xml";
version = "1.2.93";
hash = "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk=";
})
(fetchNuGet {
pname = "HarfBuzzSharp";
version = "7.3.0.2";
hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=";
})
(fetchNuGet {
pname = "HarfBuzzSharp.NativeAssets.Linux";
version = "7.3.0.2";
hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=";
})
(fetchNuGet {
pname = "HarfBuzzSharp.NativeAssets.macOS";
version = "7.3.0.2";
hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=";
})
(fetchNuGet {
pname = "HarfBuzzSharp.NativeAssets.WebAssembly";
version = "7.3.0.2";
hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c=";
})
(fetchNuGet {
pname = "HarfBuzzSharp.NativeAssets.Win32";
version = "7.3.0.2";
hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=";
})
(fetchNuGet {
pname = "MicroCom.Runtime";
version = "0.11.0";
hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=";
})
(fetchNuGet {
pname = "Microsoft.Build.Framework";
version = "17.5.0";
hash = "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw=";
})
(fetchNuGet {
pname = "Microsoft.Build.Tasks.Git";
version = "8.0.0";
hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=";
})
(fetchNuGet {
pname = "Microsoft.Build.Utilities.Core";
version = "17.5.0";
hash = "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI=";
})
(fetchNuGet {
pname = "Microsoft.NET.StringTools";
version = "17.5.0";
hash = "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.Platforms";
version = "1.1.0";
hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
})
(fetchNuGet {
pname = "Microsoft.SourceLink.Common";
version = "8.0.0";
hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=";
})
(fetchNuGet {
pname = "Microsoft.SourceLink.GitHub";
version = "8.0.0";
hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=";
})
(fetchNuGet {
pname = "Microsoft.Win32.Registry";
version = "5.0.0";
hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=";
})
(fetchNuGet {
pname = "Microsoft.Win32.SystemEvents";
version = "6.0.0";
hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=";
})
(fetchNuGet {
pname = "Nerdbank.GitVersioning";
version = "3.6.141";
hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI=";
})
(fetchNuGet {
pname = "NETStandard.Library";
version = "2.0.3";
hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=";
})
(fetchNuGet {
pname = "Nullable";
version = "1.3.1";
hash = "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM=";
})
(fetchNuGet {
pname = "SkiaSharp";
version = "2.88.8";
hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=";
})
(fetchNuGet {
pname = "SkiaSharp.NativeAssets.Linux";
version = "2.88.8";
hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=";
})
(fetchNuGet {
pname = "SkiaSharp.NativeAssets.macOS";
version = "2.88.8";
hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=";
})
(fetchNuGet {
pname = "SkiaSharp.NativeAssets.WebAssembly";
version = "2.88.8";
hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=";
})
(fetchNuGet {
pname = "SkiaSharp.NativeAssets.Win32";
version = "2.88.8";
hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=";
})
(fetchNuGet {
pname = "System.Buffers";
version = "4.5.1";
hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=";
})
(fetchNuGet {
pname = "System.Buffers";
version = "4.6.0";
hash = "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=";
})
(fetchNuGet {
pname = "System.Collections.Immutable";
version = "8.0.0";
hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=";
})
(fetchNuGet {
pname = "System.ComponentModel.Annotations";
version = "4.5.0";
hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=";
})
(fetchNuGet {
pname = "System.Configuration.ConfigurationManager";
version = "6.0.0";
hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=";
})
(fetchNuGet {
pname = "System.Drawing.Common";
version = "6.0.0";
hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=";
})
(fetchNuGet {
pname = "System.IO.Pipelines";
version = "6.0.0";
hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=";
})
(fetchNuGet {
pname = "System.Memory";
version = "4.6.0";
hash = "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=";
})
(fetchNuGet {
pname = "System.Numerics.Vectors";
version = "4.5.0";
hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=";
})
(fetchNuGet {
pname = "System.Numerics.Vectors";
version = "4.6.0";
hash = "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=";
})
(fetchNuGet {
pname = "System.Runtime.CompilerServices.Unsafe";
version = "6.1.0";
hash = "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=";
})
(fetchNuGet {
pname = "System.Security.AccessControl";
version = "5.0.0";
hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=";
})
(fetchNuGet {
pname = "System.Security.AccessControl";
version = "6.0.0";
hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.ProtectedData";
version = "6.0.0";
hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=";
})
(fetchNuGet {
pname = "System.Security.Permissions";
version = "6.0.0";
hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=";
})
(fetchNuGet {
pname = "System.Security.Principal.Windows";
version = "5.0.0";
hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=";
})
(fetchNuGet {
pname = "System.Text.Encoding.CodePages";
version = "6.0.0";
hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=";
})
(fetchNuGet {
pname = "System.Windows.Extensions";
version = "6.0.0";
hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=";
})
(fetchNuGet {
pname = "Tmds.DBus.Protocol";
version = "0.16.0";
hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98=";
})
]
@@ -15,13 +15,13 @@
}:
buildDotnetModule (finalAttrs: rec {
pname = "msbuild-structured-log-viewer";
version = "2.2.383";
version = "2.2.392";
src = fetchFromGitHub {
owner = "KirillOsenkov";
repo = "MSBuildStructuredLog";
rev = "v${version}";
hash = "sha256-re1owocdiPKwoORCPD+A0eiRi4Nk4i9a1l0XTQJcxqE=";
hash = "sha256-oMWFgELF/bIDQWOdrBAOLTluwH3rFO2vU0xCuRnrT1Y=";
};
dotnet-sdk = dotnetCorePackages.sdk_8_0;
+4 -4
View File
@@ -18,14 +18,14 @@
python3Packages.buildPythonApplication rec {
pname = "nixpkgs-review";
version = "2.12.0";
version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = "refs/tags/${version}";
hash = "sha256-yNdBqL3tceuoUHx8/j2y5ZTq1zeVDAm37RZtlCbC6rg=";
tag = version;
hash = "sha256-C2JAlCgH5OCMAZr/Rvi0H7xAwesnkVCJ3kZyyVYaLg4=";
};
build-system = [
@@ -76,7 +76,7 @@ python3Packages.buildPythonApplication rec {
versionCheckProgramArg = [ "--version" ];
meta = {
changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${src.tag}";
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
homepage = "https://github.com/Mic92/nixpkgs-review";
license = lib.licenses.mit;
@@ -62,7 +62,7 @@ done
fi
# packages in the nix store should have an empty metadata file
used_source="$(jq -r '.source // ""' "$version"/.nupkg.metadata)"
used_source="$(jq -r 'if has("source") then .source else "" end' "$version"/.nupkg.metadata)"
found=false
if [[ -z "$used_source" || -d "$used_source" ]]; then
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, cmake
, ninja
, tcl
@@ -24,6 +25,15 @@ stdenv.mkDerivation rec {
hash = "sha256-AGMZqTLLjXbzJFW/RSTsohAGV8sMxlUmdU/Y2oOzkk8=";
};
patches = [
# fix compilation on darwin against latest version of freetype
# https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/330
(fetchpatch {
url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.diff";
hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
})
];
nativeBuildInputs = [
cmake
ninja
+2 -2
View File
@@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "openvas-scanner";
version = "23.13.1";
version = "23.14.0";
src = fetchFromGitHub {
owner = "greenbone";
repo = "openvas-scanner";
rev = "refs/tags/v${version}";
hash = "sha256-MT5AtuJQeSUjN+jbqJ957+oy24wVAZ89bkZ4bMxIFNc=";
hash = "sha256-1IesoAK5Aq/JlM83WT0dodwmUvWv6RDqTyUg6LURle4=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openxr-loader";
version = "1.1.42";
version = "1.1.43";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenXR-SDK-Source";
rev = "release-${version}";
sha256 = "sha256-jHpCseldH02vcuoARHKGitaKi95atLfCPZxY6CVaM+4=";
sha256 = "sha256-Ze7r3qcYomcAIAoAO6FZDraKfFr/Wwrnv0HxmY6uE6w=";
};
nativeBuildInputs = [ cmake python3 pkg-config ];
+4 -4
View File
@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2024.1208.0";
version = "2024.1219.2";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-OgXKJ09OMqeD2ZdNBbEluEyR0bbBllprSAHaIXCtLSA=";
hash = "sha256-kzGerNcaop39zqv3+w5hkgLZzhH6PfCPhZfGk9f9/Z8=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-3W6F2ThYTOVKa9/zTA/6X0uMoPy1SYulIYfYw+D7FR8=";
hash = "sha256-kWcdynu3m8MehpNjkk10VN9/z8ixu/cZI9HuTY/79dk=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-gRUr7jf0+Xbfz8FurPk/o7F67TYisdNySNzVWEMb1es=";
hash = "sha256-qNkuiDA4LiWqwpYFrBDvV5VoOwO6Ei8jHGIgVKSErdo=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
+2 -2
View File
@@ -651,8 +651,8 @@
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2024.1202.0",
"hash": "sha256-OwsEEF4WSH7HQ5HOl3EB36RJ19stn966DtmfnOtpBJk="
"version": "2024.1219.1",
"hash": "sha256-KyZeNkTissfZAusvWYUdZ3+YujrcTfkZDyzt99i4fkg="
},
{
"pname": "ppy.osuTK.NS20",
+2 -2
View File
@@ -21,13 +21,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2024.1208.0";
version = "2024.1219.2";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = version;
hash = "sha256-cMPVtzoTxIUVZNNAqF+H0873ZsXGluFEXwNDp7zOq8c=";
hash = "sha256-uRaMVd3FH6094MxplLNG0JJnO+7s805TI0aeDN/rRVY=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pcaudiolib";
version = "1.2";
version = "1.3";
src = fetchFromGitHub {
owner = "espeak-ng";
repo = "pcaudiolib";
rev = finalAttrs.version;
hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE=";
hash = "sha256-bBiGvAySEwAv6Qj2iSawb9oZfMCGBDCDIP8AYdbtQQc=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "prowler";
version = "5.0.1";
version = "5.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "prowler-cloud";
repo = "prowler";
rev = "refs/tags/${version}";
hash = "sha256-yT6hyOmKkndJvtbxGQdzmW/miC8kz1yIo3DxvMPJ30Y=";
tag = version;
hash = "sha256-8sQodEh12aEcIgBMC9kvI/aBTqttCC0lcQUl+D+k+XA=";
};
pythonRelaxDeps = true;
+5 -5
View File
@@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "qtractor";
version = "1.4.0";
version = "1.5.0";
src = fetchurl {
url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
hash = "sha256-1BuytrG2y/cAa2v4nex2TM0v7SEsUuu1QzBs1DczhkA=";
hash = "sha256-p2Fuads2uTiEIXRS7sqe8Fa3XEKwW1ND/pPnUhFlLdY=";
};
nativeBuildInputs = [
@@ -71,13 +71,13 @@ stdenv.mkDerivation rec {
suil
];
meta = with lib; {
meta = {
description = "Audio/MIDI multi-track sequencer";
homepage = "https://qtractor.sourceforge.io";
changelog = "https://github.com/rncbc/qtractor/blob/v${version}/ChangeLog";
license = licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
mainProgram = "qtractor";
maintainers = [ ];
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
}
+3 -3
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "rubberband";
version = "3.3.0";
version = "4.0.0";
src = fetchurl {
url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2";
hash = "sha256-2e+J4rjvn4WxOsPC+uww4grPLJ86nIxFzmN/K8leV2w=";
url = "https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz2";
hash = "sha256-rwUDE+5jvBizWy4GTl3OBbJ2qvbRqiuKgs7R/i+AKOk=";
};
nativeBuildInputs = [ pkg-config meson ninja jdk_headless ];
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.118.8";
version = "1.119.3";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-kVV5d3ULRg/yGWZJSR2gP0X3gaGPM3Uy0ZkLed1Kb+U=";
hash = "sha256-O+DCMgrhlunqetL2GYbNSuSbfcyYNNP3kf9bL6P3uHQ=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-5pNYC1ubjxaU7KPd4lsEOyAe/OU95UID4JtFJ6Q+E3w=";
vendorHash = "sha256-DgW1RCyTDfbc7BiMeMVMWY1gHNdxiLxojAn0NGNeWqA=";
ldflags = [
"-s"
+2 -2
View File
@@ -55,7 +55,7 @@ let
];
buildInputs = glLibs ++ libs;
runpathPackages = glLibs ++ [ stdenv.cc.cc stdenv.cc.libc ];
version = "1.0.18";
version = "1.0.20";
in
stdenv.mkDerivation {
pname = "tana";
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
hash = "sha256-74jQkOTTRfyM7uy74xqx0sYZWy/vndBfLbwjcW8L1D0=";
hash = "sha256-fJiAqPppPoIN4gT54YMgbf/Fe9eVgRYHU6q6Yopl46I=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -22,7 +22,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "taskwarrior";
version = "3.2.0-unstable-2024-12-18";
version = "3.3.0";
src = fetchFromGitHub {
owner = "GothenburgBitFactory";
repo = "taskwarrior";
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps";
inherit (finalAttrs) src;
hash = "sha256-yaIjtwZuYqyiXHxq4NDuZC9aE+mYpovXygxWENf6v1o=";
hash = "sha256-mzmrbsUuIjUVuNEa33EgtOTl9r+0xYj2WkKqFjxX1oU=";
};
postPatch = ''
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "tidb";
version = "8.4.0";
version = "8.5.0";
src = fetchFromGitHub {
owner = "pingcap";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AVREHQnEBCU5Z9aiYWVi2jzZ5amb/Bc0jJogwGunU84=";
sha256 = "sha256-mrR4Rk+p1JaimvBVyEHc+syQwkvRDjQfGCuL5H0GqG8=";
};
vendorHash = "sha256-zRTFmXNTc2M24q8ClqsjNsok4RMi1Yyfe2ItE8I2Ww4=";
vendorHash = "sha256-yV97PyVkHWQSj+nFuxCvKkAbdwfszM1gslOvi8iihaE=";
ldflags = [
"-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}"
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tippecanoe";
version = "2.72.0";
version = "2.73.0";
src = fetchFromGitHub {
owner = "felt";
repo = "tippecanoe";
rev = finalAttrs.version;
hash = "sha256-5Ox/2K9cls8lZ+C/Fh5VQmgNEtbdMW0mh4fhBl6ecP8=";
hash = "sha256-IQEtfLRWe0/R6FSGzyar+qcpng0nm3LcyBb352TLZrs=";
};
buildInputs = [
+6
View File
@@ -0,0 +1,6 @@
{
upbound,
}:
upbound.override {
version-channel = "main";
}
+73 -24
View File
@@ -1,32 +1,81 @@
{ lib, buildGoModule, fetchFromGitHub }:
{
lib,
fetchurl,
installShellFiles,
versionCheckHook,
stdenvNoCC,
version-channel ? "stable",
}:
let
inherit (stdenvNoCC.hostPlatform) system;
sources =
if "${version-channel}" == "main" then import ./sources-main.nix else import ./sources-stable.nix;
arch = sources.archMap.${system};
buildGoModule rec {
pname = "upbound";
version = "0.34.0";
in
stdenvNoCC.mkDerivation {
pname = if "${version-channel}" == "main" then "upbound-main" else "upbound";
version = sources.version;
srcs = [
(fetchurl {
url = sources.fetchurlAttrSet.${system}.docker-credential-up.url;
sha256 = sources.fetchurlAttrSet.${system}.docker-credential-up.hash;
})
src = fetchFromGitHub {
owner = pname;
repo = "up";
rev = "v${version}";
hash = "sha256-npWCGR0/iXAF7efreWhpwqboXJ24lqk5TPaB7glwEFI=";
};
vendorHash = "sha256-f/RPyjrC5FsOjC5wnBtqEbLeVX7VeiVYFpRXcQ2lTc4=";
subPackages = [ "cmd/docker-credential-up" "cmd/up" ];
ldflags = [
"-s"
"-w"
"-X github.com/upbound/up/internal/version.version=v${version}"
(fetchurl {
url = sources.fetchurlAttrSet.${system}.up.url;
sha256 = sources.fetchurlAttrSet.${system}.up.hash;
})
];
meta = with lib; {
description =
"CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
sourceRoot = ".";
nativeBuildInputs = [ installShellFiles ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp ./${arch}/up $out/bin/up
chmod +x $out/bin/up
cp ./${arch}/docker-credential-up $out/bin/docker-credential-up
chmod +x $out/bin/docker-credential-up
runHook postInstall
'';
postInstall = ''
installShellCompletion --bash --name up <(echo complete -C up up)
'';
versionCheckProgramArg = "version";
nativeInstallCheckInputs = [
versionCheckHook
];
doCheck = false;
passthru.updateScript = [
./update.sh
"${version-channel}"
];
passthru.tests = {
versionCheck = versionCheckHook;
};
meta = {
description = "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
homepage = "https://upbound.io";
license = licenses.asl20;
maintainers = with maintainers; [ lucperkins ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [
lucperkins
jljox
];
mainProgram = "up";
platforms = sources.platformList;
};
}
+54
View File
@@ -0,0 +1,54 @@
# Generated by "update.sh main" - do not update manually!
{
version = "0.37.0-0.rc.0.38.g797e121";
platformList = [
"aarch64-linux"
"x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
archMap = {
aarch64-linux = "linux_arm64";
x86_64-linux = "linux_amd64";
x86_64-darwin = "darwin_amd64";
aarch64-darwin = "darwin_arm64";
};
fetchurlAttrSet = {
aarch64-linux.docker-credential-up = {
hash = "sha256-nZXniTuLzmV7tK/Pd4BjUzqYYH2OmQKC4yoCHOhZ3C8=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/linux_arm64.tar.gz";
};
x86_64-linux.docker-credential-up = {
hash = "sha256-LILaT+vn2CdKzNWxYOeda+Zid9V11I94+vwDGkGwxuQ=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/linux_amd64.tar.gz";
};
x86_64-darwin.docker-credential-up = {
hash = "sha256-7eUWveGIbimxbwOGtA6qrU7F8p8EpOCTHXN4vj74qqA=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/darwin_amd64.tar.gz";
};
aarch64-darwin.docker-credential-up = {
hash = "sha256-XTgSZjbHXyt1BXNeaHXqdi4gs8eeD/7rE657oAeQKv4=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/docker-credential-up/darwin_arm64.tar.gz";
};
aarch64-linux.up = {
hash = "sha256-cNk4uaXcdH3EucwGnGXGsPbmKGGO+ig3xfJ+fAcwEbo=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/linux_arm64.tar.gz";
};
x86_64-linux.up = {
hash = "sha256-3h+Jtl84UdWvs2cbrDsbtqlCCpvvYjzXZLmzDY/9aXE=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/linux_amd64.tar.gz";
};
x86_64-darwin.up = {
hash = "sha256-WzngxshyHnR1H7Rhkbw/wkN1i3TWyV8CcBTwLNVggdU=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/darwin_amd64.tar.gz";
};
aarch64-darwin.up = {
hash = "sha256-KLcxE4847DE6e0AznjlNZnS6GNhT1JJaCnYDecTZ6EQ=";
url = "https://cli.upbound.io/main/v0.37.0-0.rc.0.38.g797e121/bundle/up/darwin_arm64.tar.gz";
};
};
}
@@ -0,0 +1,54 @@
# Generated by "update.sh stable" - do not update manually!
{
version = "0.36.1";
platformList = [
"aarch64-linux"
"x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
archMap = {
aarch64-linux = "linux_arm64";
x86_64-linux = "linux_amd64";
x86_64-darwin = "darwin_amd64";
aarch64-darwin = "darwin_arm64";
};
fetchurlAttrSet = {
aarch64-linux.docker-credential-up = {
hash = "sha256-BnEQWK1Y4rCDEk5BgkUIeF0oK6C77AQZh6KWhS+MfqM=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/linux_arm64.tar.gz";
};
x86_64-linux.docker-credential-up = {
hash = "sha256-4A0Di92G/vi9NR/pH20E8aaSn/jYhduQbYH6aLL2R3E=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/linux_amd64.tar.gz";
};
x86_64-darwin.docker-credential-up = {
hash = "sha256-/i4VsDUk0B+htRv0UCjCLT1ByewO8UNHOMbbxqIfvvE=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/darwin_amd64.tar.gz";
};
aarch64-darwin.docker-credential-up = {
hash = "sha256-gaaaOfn8oOxjlYruGePFZ+e65cUgRJSlsr4iweVYdSE=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/docker-credential-up/darwin_arm64.tar.gz";
};
aarch64-linux.up = {
hash = "sha256-mxuDhdO0nZkozMsKiKcDPBscgrY0pSChJP5TUJz729E=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/linux_arm64.tar.gz";
};
x86_64-linux.up = {
hash = "sha256-oZ1RpPZAKzChRWKUhUcKPRXhqmf3FBXvpFCICMsWh+w=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/linux_amd64.tar.gz";
};
x86_64-darwin.up = {
hash = "sha256-a4QsXlfmmFhRYxC0yZ7yVIHmP8VUgggfOZSenMXGlKA=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/darwin_amd64.tar.gz";
};
aarch64-darwin.up = {
hash = "sha256-PPHlADbIiQ/CAF746lulvuHjwwo1V563K9Haf/7IjEI=";
url = "https://cli.upbound.io/stable/v0.36.1/bundle/up/darwin_arm64.tar.gz";
};
};
}
+83
View File
@@ -0,0 +1,83 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl
#set -euo pipefail
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
# value can be main | stable
# Ensure at least one argument is passed
if [[ $# -lt 1 ]]; then
echo "Error: No argument provided. Please specify 'main' or 'stable'."
exit 1
fi
# Check if the first argument is 'main' or 'stable'
if [[ "$1" == "main" || "$1" == "stable" ]]; then
echo "Valid input: $1"
else
echo "Error: Invalid input. Please specify 'main' or 'stable'."
exit 1
fi
channel=$1
baseUrl="https://cli.upbound.io/${channel}"
currentVersion=$(curl ${baseUrl}/current/version)
version="${currentVersion:1}"
declare -A archMapping
archMapping["aarch64-darwin"]="darwin_arm64"
archMapping["x86_64-darwin"]="darwin_amd64"
archMapping["aarch64-linux"]="linux_arm64"
archMapping["x86_64-linux"]="linux_amd64"
archMapBlock=
for key in "${!archMapping[@]}"; do
line=$(printf "$key = \"${archMapping[$key]}\"; ")
archMapBlock="$archMapBlock$line"
done
platformListBlock=
for key in "${!archMapping[@]}"; do
platformListBlock="$platformListBlock\"$key\" "
done
cmds=("docker-credential-up" "up")
fetchurlAttrSetBlock=
for cmd in "${cmds[@]}"; do
for key in "${!archMapping[@]}"; do
arch=${archMapping[$key]}
url="${baseUrl}/v${version}/bundle/$cmd/${arch}.tar.gz";
hash=$(nix-prefetch-url $url)
hash=$(nix hash convert "${hash}" --hash-algo sha256)
fetchurlAttrSetBlock="
${fetchurlAttrSetBlock}
$key.$cmd = {
hash = \"${hash}\";
url = ${url};
};"
done
done
OUT_FILE="$SCRIPT_DIR/sources-${channel}.nix"
cat >$OUT_FILE <<EOF
# Generated by "update.sh ${channel}" - do not update manually!
{
version = "${version}";
platformList = [
${platformListBlock}
];
archMap = {
${archMapBlock}
};
fetchurlAttrSet = {
${fetchurlAttrSetBlock}
};
}
EOF
nixfmt $OUT_FILE
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "yggdrasil";
version = "0.5.11";
version = "0.5.12";
src = fetchFromGitHub {
owner = "yggdrasil-network";
repo = "yggdrasil-go";
rev = "v${version}";
hash = "sha256-029bG3zHEJKjP8fvq+TxiAR/JiGqXzrK5gnxvyve9FA=";
hash = "sha256-NlNQnYmK//p35pj2MInD6RVsajM/bGDhOuzOZZYoWRw=";
};
vendorHash = "sha256-D65Sbc9W5qYO/GmSIvFRwPpGJlX7bzsp8yN6yb3prWY=";
vendorHash = "sha256-xZpUWIR3xTjhhNSwPoHx7GLUgcZJrWfF0FMExlluBmg=";
subPackages = [
"cmd/genkeys"
+203
View File
@@ -0,0 +1,203 @@
{
lib,
stdenv,
fetchurl,
tzdata,
substituteAll,
iana-etc,
apple-sdk_11,
xcbuild,
mailcap,
buildPackages,
pkgsBuildTarget,
threadsCross,
testers,
skopeo,
buildGo124Module,
}:
let
goBootstrap = buildPackages.callPackage ./bootstrap122.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo124Module; };
goarch =
platform:
{
"aarch64" = "arm64";
"arm" = "arm";
"armv5tel" = "arm";
"armv6l" = "arm";
"armv7l" = "arm";
"i686" = "386";
"mips" = "mips";
"mips64el" = "mips64le";
"mipsel" = "mipsle";
"powerpc64" = "ppc64";
"powerpc64le" = "ppc64le";
"riscv64" = "riscv64";
"s390x" = "s390x";
"x86_64" = "amd64";
"wasm32" = "wasm";
}
.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}");
# We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
version = "1.24rc1";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
hash = "sha256-r9iiP9Jg8qJG0XQEmgdrigW7C62T8SIHaNIZuL33U50=";
};
strictDeps = true;
buildInputs =
[ ]
++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
apple-sdk_11
xcbuild
];
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
postPatch = ''
patchShebangs .
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
inherit tzdata;
})
./remove-tools-1.11.patch
./go_no_vendor_checks-1.22.patch
];
GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name;
GOARCH = goarch stdenv.targetPlatform;
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
# Go will nevertheless build a for host system that we will copy over in
# the install phase.
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
GOHOSTARCH = goarch stdenv.buildPlatform;
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
CC_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}cc" else null;
CXX_FOR_TARGET = if isCross then "${targetCC}/bin/${targetCC.targetPrefix}c++" else null;
GOARM = toString (
lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]
);
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
# Wasi does not support CGO
CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
buildPhase = ''
runHook preBuild
export GOCACHE=$TMPDIR/go-cache
export PATH=$(pwd)/bin:$PATH
${lib.optionalString isCross ''
# Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
''}
ulimit -a
pushd src
./make.bash
popd
runHook postBuild
'';
preInstall =
''
# Contains the wrong perl shebang when cross compiling,
# since it is not used for anything we can deleted as well.
rm src/regexp/syntax/make_perl_groups.pl
''
+ (
if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
''
mv bin/*_*/* bin
rmdir bin/*_*
${lib.optionalString
(!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
''
rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
''
}
''
else
lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
rm -rf bin/*_*
${lib.optionalString
(!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS))
''
rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
''
}
''
);
installPhase = ''
runHook preInstall
mkdir -p $out/share/go
cp -a bin pkg src lib misc api doc go.env $out/share/go
mkdir -p $out/bin
ln -s $out/share/go/bin/* $out/bin
runHook postInstall
'';
disallowedReferences = [ goBootstrap ];
passthru = {
inherit goBootstrap skopeoTest;
tests = {
skopeo = testers.testVersion { package = skopeoTest; };
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "go version";
version = "go${finalAttrs.version}";
};
};
};
meta = with lib; {
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
description = "Go Programming language";
homepage = "https://go.dev/";
license = licenses.bsd3;
maintainers = teams.golang.members;
platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd;
mainProgram = "go";
};
})
@@ -0,0 +1,27 @@
{ callPackage }:
callPackage ./binary.nix {
version = "1.22.10";
hashes = {
# Use `print-hashes.sh ${version}` to generate the list below
darwin-amd64 = "dd2c4ac3702658c2c20e3a8b394da1917d86156b2cb4312c9d2f657f80067874";
darwin-arm64 = "21cf49415ffe0755b45f2b63e75d136528a32f7bb7bdd0166f51d22a03eb0a3f";
freebsd-386 = "f82f5d194114963693e0f51fd56d55d8417ca556438062f2b0df608473b62837";
freebsd-amd64 = "cce9da240870a4430c5cf1227bcf29d37575043ff16f7982a69f1139c6f564b5";
freebsd-arm64 = "abae388d0d42563a242db0d405172cb73e09236f68000ff90c2a327ec8c5764c";
freebsd-armv6l = "7c9c8fe30cbabbb4fb597f0f0ad1279fd2b320bc70831eba4c207b55ad46931d";
freebsd-riscv64 = "d6f25fd79e17b84d1b61bec3e2fdffc47377b28b51a04b6bdbeac0199313e059";
linux-386 = "2ae9f00e9621489b75494fa2b8abfc5d09e0cae6effdd4c13867957ad2e4deba";
linux-amd64 = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092";
linux-arm64 = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec";
linux-armv6l = "a7bbbc80fe736269820bbdf3555e91ada5d18a5cde2276aac3b559bc1d52fc70";
linux-loong64 = "0be34dbc69726b52414e0283736f997fee477379ebff66cebd7d8c35f4f64f9d";
linux-mips = "bb7d7e99db7ee70063cb57bb7395c392b8b5ed87f37d733a1c91de935c70bb91";
linux-mips64 = "c7f0571410297cb29e52d10fed7a2a21aeaeabb9539d0c04a6d778adf0fe7f1b";
linux-mips64le = "e66c440c03dd19bf8423034cbde7f6813321beb18d3fcf2ef234c13a25467952";
linux-mipsle = "b4e0061f62a9c1f874893aa4951a4883c19762a9dd64c5710554ec5a7aaf311a";
linux-ppc64 = "4192158cdedc6a124aa32a099cc6bebebabf1f4d380c46c5e36ea52c30a3888b";
linux-ppc64le = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981";
linux-riscv64 = "aef9b186c1b9b58c0472dbf54978f97682852a91b2e8d6bf354e59ba9c24438a";
linux-s390x = "4ab2286adb096576771801b5099760b1d625fd7b44080449151a4d9b21303672";
};
}
@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "sundials";
version = "7.1.1";
version = "7.2.0";
outputs = [
"out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
hash = "sha256-6n1u37UkSN39wexI+JpyH+bAolnBD471b2D83th6lLs=";
hash = "sha256-XGwKZqfifEW/tXsn91eUY4Vahfw5dv7R1cndiNwa46s=";
};
nativeBuildInputs = [
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "msgraph-sdk";
version = "1.14.0";
version = "1.15.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "microsoftgraph";
repo = "msgraph-sdk-python";
rev = "refs/tags/v${version}";
hash = "sha256-qCrBd1RIIjVJQyWf7srdFHNQc8TYh3zDtq/nepbk6tE=";
tag = "v${version}";
hash = "sha256-jGGBWakuGXY7zH7Gb5C/e7hJB//B+Ko/l0TyxGHz0N4=";
};
build-system = [ flit-core ];
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "coccinelle";
version = "1.2";
version = "1.3.0";
src = fetchFromGitHub {
repo = "coccinelle";
rev = finalAttrs.version;
owner = "coccinelle";
hash = "sha256-v51KQLMJENLrlstCsP3DAuJJFMyjFyOZPJ7cRW5ovws=";
hash = "sha256-be95cuFP6bAdpCT0Z9zBAx9cc3gYuuXAmHYaI/bmyTE=";
};
nativeBuildInputs = with ocamlPackages; [
+1 -4
View File
@@ -66,7 +66,6 @@
name,
buildInputs ? [ ],
propagatedBuildInputs ? [ ],
gcc ? stdenv.cc,
extraCmds ? "",
cleanupCmds ? "",
shell ? "${pkgs.bashInteractive}/bin/bash --norc",
@@ -80,9 +79,7 @@ mkDerivation {
"buildPhase"
"fixupPhase"
];
setupNew = replaceVars ../../stdenv/generic/setup.sh {
inherit gcc;
};
setupNew = ../../stdenv/generic/setup.sh;
buildPhase =
let
+6 -6
View File
@@ -13,22 +13,22 @@ let
name = repo;
owner = "tbsdtv";
repo = "linux_media";
rev = "36ce48448be5dd42669a5199f61e85da1a68cf60";
hash = "sha256-fbb1ITcWymLoybA7VkfdpJmuRHKCP1s0CqLn0Rl2E2I=";
rev = "cf8cf4c06090fe3c2dc2f665764abc580b8a1921";
hash = "sha256-YTITVsSktxAoWBsIN6jXZD11pxXaMrMl5N6VZYxfTi0=";
};
build = fetchFromGitHub rec {
name = repo;
owner = "tbsdtv";
repo = "media_build";
rev = "0f49c76b80838ded04bd64c56af9e1f9b8ac1965";
hash = "sha256-S5g7OTBJjzClLfy6C0PJwUtukrqoCiIjyU26Yy26hDo=";
rev = "f362ab16cb88cc1d3599408c22e3abc52aebe1fc";
hash = "sha256-xsZdrOgf+dA5B/GVWSnWUw0FInswPd1Kzg/qWE2JmqM=";
};
in
stdenv.mkDerivation {
pname = "tbs";
version = "20241026-${kernel.version}";
version = "20241213-${kernel.version}";
srcs = [
media
@@ -80,6 +80,6 @@ stdenv.mkDerivation {
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ ck3d ];
priority = -1;
broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.12";
broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.13";
};
}
+3 -3
View File
@@ -14,7 +14,7 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.41.2.9200-c6bbc1b53";
version = "1.41.3.9292-bc7397402";
pname = "plexmediaserver";
# Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "aarch64-linux" then
fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "sha256-VTWyeve+Uz3TdWQ06CmZ9w+Gk9jBHP7EuYi0N9DTB4Q=";
sha256 = "0xbkd8iplvzgm0jqgz6ncxwx0bhdkm0208z22cpjh1ynjqx5lvkq";
}
else
fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "sha256-HmgtnUsDzRIUThYdlZIzhiU02n9jSU7wtwnEA0+r1iQ=";
sha256 = "1a18xfc69yk99hw3q3nv4ibmgq6whk3ywwfq5r91v8fsb7l9cf58";
};
outputs = [
+3 -3
View File
@@ -20,14 +20,14 @@ stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
pname = "netpbm";
version = "11.8.2";
version = "11.8.1";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "4971";
sha256 = "sha256-liJIx2/TlIl9jcbyCzqhzuHAalmjJM3EtAceDIFa0rw=";
rev = "4966";
sha256 = "sha256-Vy7aKyMn3C2P3N9jdRayDu35+8jzvQv4rYIEsKdyWDU=";
};
nativeBuildInputs = [
+1
View File
@@ -192,6 +192,7 @@ mapAliases {
### C ###
caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
calculix = calculix-ccx; # Added 2024-12-18
calligra = kdePackages.calligra; # Added 2024-09-27
callPackage_i686 = pkgsi686Linux.callPackage;
cask = emacs.pkgs.cask; # Added 2022-11-12
+8 -1
View File
@@ -11188,6 +11188,11 @@ with pkgs;
go = buildPackages.go_1_23;
};
go_1_24 = callPackage ../development/compilers/go/1.24.nix { };
buildGo124Module = callPackage ../build-support/go/module.nix {
go = buildPackages.go_1_24;
};
### DEVELOPMENT / HARE
hareHook = callPackage ../by-name/ha/hare/hook.nix { };
@@ -18706,7 +18711,9 @@ with pkgs;
sieveshell = with python3.pkgs; toPythonApplication managesieve;
sunshine = callPackage ../servers/sunshine { };
sunshine = callPackage ../by-name/su/sunshine/package.nix {
boost = boost185;
};
jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
# TODO: remove once `udev` is `systemdMinimal` everywhere.