gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 3f62a1ca1a into haskell-updates

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-05-28 00:23:54 +00:00
committed by GitHub
parent 2e009b167d 3f62a1ca1a
commit a1a82570eb
104 changed files with 1356 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/fileset/default.nix
+1 -1
View File
@@ -703,7 +703,7 @@ in
# Type
```
union :: FileSet -> FileSet -> FileSet
difference :: FileSet -> FileSet -> FileSet
```
# Examples
nixos/modules/services/networking/adguardhome.nix
+1 -1
View File
@@ -36,7 +36,7 @@ let
null;
configFile = (settingsFormat.generate "AdGuardHome.yaml" settings).overrideAttrs (_: {
checkPhase = "${cfg.package}/bin/adguardhome -c $out --check-config";
checkPhase = "${cfg.package}/bin/AdGuardHome -c $out --check-config";
});
in
{
nixos/modules/virtualisation/docker.nix
+1 -1
View File
@@ -355,7 +355,7 @@ in
# the `--runtime=nvidia` approach to expose
# GPU's. Starting with Docker > 25, CDI can be used
# instead, removing the need for runtime wrappers.
path = lib.getExe' pkgs.nvidia-docker "nvidia-container-runtime.legacy";
path = lib.getExe' (lib.getOutput "tools" config.hardware.nvidia-container-toolkit.package) "nvidia-container-runtime";
};
};
};
nixos/tests/shadps4.nix
+15 -41
View File
@@ -21,13 +21,16 @@
in
pkgs.runCommand "OpenOrbis-PNG-Sample"
{
nativeBuildInputs = with pkgs; [ unzip ];
nativeBuildInputs = with pkgs; [
unzip
liborbispkg-pkgtool
];
meta.license = lib.licenses.gpl3Only;
}
''
unzip ${sample-packages} samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg
mkdir $out
mv samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg $out/OpenOrbis-PNG-Sample.pkg
mkdir -p $out/OpenOrbis-PNG-Sample
pkgtool pkg_extract samples/IV0000-BREW00086_00-IPNGDRAWEX000000.pkg $out/OpenOrbis-PNG-Sample
'';
systemPackages = with pkgs; [
@@ -90,53 +93,24 @@
machine.wait_for_text("Play Time")
machine.screenshot("0002-shadps4-started")
with subtest("installing example works"):
with subtest("running example works"):
# Ensure that chosen openorbis logo colour isn't present already
assert (
check_for_color(openorbisColor)(True) == False
), "openorbisColor {} was present on the screen before we launched anything!".format(openorbisColor)
machine.succeed("xdotool mousemove 20 30 click 1") # click on "File"
machine.wait_for_text("Install Packages")
machine.wait_for_text("Boot Game")
machine.send_key("down")
machine.send_key("ret")
# Pick the PNG sample (hello world runs too, but text-only output is currently broken)
machine.wait_for_text("Look in")
machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample.pkg\n")
# Install to default dir
machine.wait_for_text("which directory")
machine.send_key("ret")
# Wait for installation getting done & return to main window
machine.wait_for_text("successfully installed")
machine.send_key("ret")
# Sample should now be listed
machine.wait_for_text("OpenOrbis PNG Sample")
machine.screenshot("0003-shadps4-sample-installed")
with subtest("emulation works-ish"):
# Ensure that selection colours isn't present already
assert (
check_for_color(selectionColor)(True) == False
), "selectionColor {} was present on the screen before we selected anything!".format(selectionColor)
# Select first installed app
machine.succeed("xdotool mousemove 20 150 click 1")
# Waiting for selection to be confirmed
with machine.nested("Waiting for the screen to have selectionColor {} on it:".format(selectionColor)):
retry(check_for_color(selectionColor))
# Ensure that chosen openorbis logo colour isn't present already
assert (
check_for_color(openorbisColor)(True) == False
), "openorbisColor {} was present on the screen before we selected anything!".format(openorbisColor)
# Click launch button
machine.succeed("xdotool mousemove 40 60 click 1")
machine.wait_for_console_text("Entering draw loop...")
machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin\n")
# Look for logo
with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)):
retry(check_for_color(openorbisColor))
machine.screenshot("0004-shadps4-sample-running")
machine.screenshot("0003-shadps4-sample-running")
'';
}
pkgs/applications/blockchains/sparrow/default.nix
+24 -17
View File
@@ -7,7 +7,7 @@
makeDesktopItem,
copyDesktopItems,
autoPatchelfHook,
openjdk,
jdk23,
gtk3,
gsettings-desktop-schemas,
writeScript,
@@ -15,20 +15,22 @@
gnugrep,
tor,
zlib,
openimajgrabber,
hwi,
imagemagick,
gzip,
gnupg,
libusb1,
pcsclite,
}:
let
pname = "sparrow";
version = "2.0.0";
version = "2.2.1";
openjdk = jdk23.override { enableJavaFX = true; };
src = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
sha256 = "sha256-Z4rA3KObPAOuJeI+TzyYaXDyptAxBAWzYJDTplUvw50=";
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/sparrowwallet-${version}-x86_64.tar.gz";
hash = "sha256-m6FHcz62MbEQFfLeDyW0ziqoB4YVYOOL/IB5AgunXrQ=";
# nativeBuildInputs, downloadToTemp, and postFetch are used to verify the signed upstream package.
# The signature is not a self-contained file. Instead the SHA256 of the package is added to a manifest file.
@@ -46,7 +48,7 @@ let
mkdir -m 700 -p $GNUPGHOME
ln -s ${manifest} ./manifest.txt
ln -s ${manifestSignature} ./manifest.txt.asc
ln -s $downloadedFile ./${pname}-${version}-x86_64.tar.gz
ln -s $downloadedFile ./sparrowwallet-${version}-x86_64.tar.gz
gpg --import ${publicKey}
gpg --verify manifest.txt.asc manifest.txt
sha256sum -c --ignore-missing manifest.txt
@@ -57,12 +59,12 @@ let
manifest = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt";
sha256 = "sha256-qjkKw3WmbRBf+yqcSIYVWmYz8M3u2JxnBriR0Ec/C7A=";
hash = "sha256-rbLTZAkqesmS1pg5wbnbTbnTuFnpWuDID0aCAwwM65w=";
};
manifestSignature = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt.asc";
sha256 = "sha256-CRrEzWqFVFQGWsh2+rjSuGHuFmf+y6SetCi2G89jZ/0=";
hash = "sha256-Ct2PVjH5WEa+XqJtUNHlmMhlEN/r/Z+Y73vsHfMo5Qg=";
};
publicKey = ./publickey.asc;
@@ -70,6 +72,7 @@ let
launcher = writeScript "sparrow" ''
#! ${bash}/bin/bash
params=(
-Dsun.security.smartcardio.library=${pcsclite.lib}/lib/libpcsclite.so.1
--module-path @out@/lib:@jdkModules@/modules
--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls
--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls
@@ -145,6 +148,7 @@ let
autoPatchelfHook
(lib.getLib stdenv.cc.cc)
zlib
libusb1
];
buildPhase = ''
@@ -177,7 +181,10 @@ let
rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_armel
rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_armhf
rm -fR com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x86
rm com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x64/OpenIMAJGrabber.so
rm -fR openpnp.capture.java/darwin-aarch64
rm -fR openpnp.capture.java/darwin-x86-64
rm -fR openpnp.capture.java/linux-aarch64
rm -fR openpnp.capture.java/win32-x86-64
rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_arm32_armel
rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_armel
rm -fR com.nativelibs4java.bridj/org/bridj/lib/linux_armhf
@@ -187,7 +194,9 @@ let
rm -fR com.sparrowwallet.merged.module/linux-aarch64
rm -fR com.sparrowwallet.merged.module/linux-arm
rm -fR com.sparrowwallet.merged.module/linux-x86
rm com.sparrowwallet.sparrow/native/linux/x64/hwi
rm -fR com.fazecast.jSerialComm/OpenBSD
rm -fR com.fazecast.jSerialComm/Android
rm -fR com.fazecast.jSerialComm/Solaris
ls | xargs -d " " -- echo > ../manifest.txt
find . | grep "\.so$" | xargs -- chmod ugo+x
@@ -196,21 +205,19 @@ let
# Replace the embedded Tor binary (which is in a Tar archive)
# with one from Nixpkgs.
gzip -c ${torWrapper} > tor.gz
cp tor.gz modules/kmp.tor.binary.linuxx64/kmptor/linux/x64/tor.gz
cp tor.gz modules/io.matthewnelson.kmp.tor.resource.exec.tor/io/matthewnelson/kmp/tor/resource/exec/tor/native/linux-libc/x86_64/tor.gz
'';
installPhase = ''
mkdir -p $out
cp manifest.txt $out/
cp -r modules/ $out/
ln -s ${openimajgrabber}/lib/OpenIMAJGrabber.so $out/modules/com.github.sarxos.webcam.capture/com/github/sarxos/webcam/ds/buildin/lib/linux_x64/OpenIMAJGrabber.so
ln -s ${hwi}/bin/hwi $out/modules/com.sparrowwallet.sparrow/native/linux/x64/hwi
'';
};
in
stdenvNoCC.mkDerivation rec {
inherit version src;
pname = "sparrow-unwrapped";
pname = "sparrow";
nativeBuildInputs = [
makeWrapper
copyDesktopItems
@@ -264,8 +271,8 @@ stdenvNoCC.mkDerivation rec {
mkdir -p $out/share/icons
ln -s ${sparrow-icons}/hicolor $out/share/icons
mkdir -p $out/etc/udev/rules.d
cp ${hwi}/lib/python*/site-packages/hwilib/udev/*.rules $out/etc/udev/rules.d
mkdir -p $out/etc/udev/
ln -s ${sparrow-modules}/modules/com.sparrowwallet.lark/udev $out/etc/udev/rules.d
runHook postInstall
'';
pkgs/applications/blockchains/sparrow/fhsenv.nix
-33
View File
@@ -1,33 +0,0 @@
{
buildFHSEnv,
sparrow-unwrapped,
}:
buildFHSEnv {
pname = "sparrow-desktop";
inherit (sparrow-unwrapped) version;
runScript = "${sparrow-unwrapped}/bin/sparrow-desktop";
targetPkgs =
pkgs: with pkgs; [
sparrow-unwrapped
pcsclite
];
multiPkgs =
pkgs: with pkgs; [
pcsclite
];
extraInstallCommands = ''
mkdir -p $out/share
ln -s ${sparrow-unwrapped}/share/applications $out/share
ln -s ${sparrow-unwrapped}/share/icons $out/share
mkdir -p $out/etc/udev
ln -s ${sparrow-unwrapped}/etc/udev/rules.d $out/etc/udev/rules.d
'';
meta = sparrow-unwrapped.meta;
}
pkgs/applications/blockchains/sparrow/openimajgrabber.nix
-44
View File
@@ -1,44 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
libv4l,
}:
stdenv.mkDerivation rec {
pname = "openimajgrabber";
version = "1.3.10";
src = fetchFromGitHub {
owner = "openimaj";
repo = "openimaj";
rev = "openimaj-${version}";
sha256 = "sha256-Y8707ovE7f6Fk3cJ+PtwvzNpopgH5vlF55m2Xm4hjYM=";
};
buildInputs = [ libv4l ];
# These build instructions come from build.sh
buildPhase = ''
pushd hardware/core-video-capture/src-native/linux
g++ -fPIC -g -c OpenIMAJGrabber.cpp
g++ -fPIC -g -c capture.cpp
g++ -shared -Wl,-soname,OpenIMAJGrabber.so -o OpenIMAJGrabber.so OpenIMAJGrabber.o capture.o -lv4l2 -lrt -lv4lconvert
popd
'';
installPhase = ''
mkdir -p $out/lib
cp hardware/core-video-capture/src-native/linux/OpenIMAJGrabber.so $out/lib
'';
meta = with lib; {
description = "Collection of libraries and tools for multimedia (images, text, video, audio, etc.) content analysis and content generation. This package only builds the OpenIMAJGrabber for Linux";
homepage = "http://www.openimaj.org";
license = licenses.bsd0;
maintainers = with maintainers; [
emmanuelrosa
_1000101
];
platforms = platforms.linux;
};
}
pkgs/applications/editors/geany/with-vte.nix
+2
View File
@@ -25,6 +25,8 @@ symlinkJoin {
'';
meta = {
# can't just "inherit (geany) meta;" because:
# error: derivation '/nix/store/...-geany-with-vte-2.0.drv' does not have wanted outputs 'man'
inherit (geany.meta)
description
longDescription
pkgs/applications/editors/vim/plugins/generated.nix
+13
View File
@@ -10596,6 +10596,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
nvim-k8s-crd = buildVimPlugin {
pname = "nvim-k8s-crd";
version = "2025-05-26";
src = fetchFromGitHub {
owner = "anasinnyk";
repo = "nvim-k8s-crd";
rev = "d57f9c6b0ad1e8ab894f2afd6db90c948ca51a8c";
sha256 = "1gx80lclc8jh2k288hswz8b03zlamkb5z8zdl03nchxrm6xr5x05";
};
meta.homepage = "https://github.com/anasinnyk/nvim-k8s-crd/";
meta.hydraPlatforms = [ ];
};
nvim-lastplace = buildVimPlugin {
pname = "nvim-lastplace";
version = "2023-07-27";
pkgs/applications/editors/vim/plugins/overrides.nix
+7
View File
@@ -4083,4 +4083,11 @@ in
--replace-fail "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'"
'';
};
nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs {
dependencies = with self; [
plenary-nvim
nvim-lspconfig
];
};
}
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -813,6 +813,7 @@ https://github.com/nvim-java/nvim-java-refactor/,HEAD,
https://github.com/nvim-java/nvim-java-test/,HEAD,
https://github.com/mfussenegger/nvim-jdtls/,,
https://github.com/gennaro-tedesco/nvim-jqx/,,
https://github.com/anasinnyk/nvim-k8s-crd/,HEAD,
https://github.com/ethanholz/nvim-lastplace/,HEAD,
https://github.com/kosayoda/nvim-lightbulb/,,
https://github.com/josa42/nvim-lightline-lsp/,,
pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+2 -2
View File
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "calva";
publisher = "betterthantomorrow";
version = "2.0.512";
hash = "sha256-JGk3TXeJhDMoPOVrDgxlNCAX0YCcaU7+ww2m6bPxnwo=";
version = "2.0.516";
hash = "sha256-0RBydQ2+ec6Swj/DGYVen3g8a6SqhIKLZ9m1Bohjqco=";
};
nativeBuildInputs = [
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -4498,8 +4498,8 @@ let
mktplcRef = {
publisher = "sonarsource";
name = "sonarlint-vscode";
version = "4.22.0";
hash = "sha256-E50BmbYgm9w+jpr8m8BdZcOuCtPhpmhXTBhbx/tsips=";
version = "4.23.0";
hash = "sha256-ki9Dbj8g6rArjJxVm5OhB2mYFR/PUA96szNyWBtbfxc=";
};
meta.license = lib.licenses.lgpl3Only;
};
pkgs/applications/emulators/libretro/cores/scummvm.nix
+3 -3
View File
@@ -25,13 +25,13 @@ let
in
mkLibretroCore {
core = "scummvm";
version = "0-unstable-2025-04-05";
version = "0-unstable-2025-05-23";
src = fetchFromGitHub {
owner = "libretro";
repo = "scummvm";
rev = "9d31b31c179fd4a43f7cfc383a3435a9070c6aa8";
hash = "sha256-E5e30Iowwr8pnryncnzlPjBhpIEuKqAHxHk+HwagEnE=";
rev = "e566a6432fd1951417bf78280cc7c741957fc419";
hash = "sha256-K78lyq1v3v55CCFLVAJStvfPltfkoGE9tj39gwPgZ44=";
};
extraBuildInputs = [
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+825 -825
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/139-relax-apple-sdk.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 769ac0379045..160734dd386d 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
)
def mac_sdk_min_version():
- return "15.4"
+ return "15.2"
@depends(
"--with-macos-sdk",
pkgs/applications/networking/browsers/firefox/common.nix
+4 -2
View File
@@ -310,12 +310,14 @@ buildStdenv.mkDerivation {
./no-buildconfig-ffx121.patch
]
++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.patch ]
++ [
++ lib.optionals (lib.versionAtLeast version "139") [ ./139-relax-apple-sdk.patch ]
++ lib.optionals (lib.versionOlder version "139") [
# Fix for missing vector header on macOS
# https://bugzilla.mozilla.org/show_bug.cgi?id=1959377
# Fixed on Firefox 139
./firefox-mac-missing-vector-header.patch
]
++ lib.optionals (lib.versionOlder version "140") [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1962497
# https://phabricator.services.mozilla.com/D246545
# Fixed on Firefox 140
pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
+2 -2
View File
@@ -9,11 +9,11 @@
buildMozillaMach rec {
pname = "firefox";
version = "128.10.1esr";
version = "128.11.0esr";
applicationName = "Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "6e7363d8cbecda1cedaf534ac10dc046b5f515399ec754492357e8a558c61ee3389f7bb90aa929dbcb4d6eba041ae1e778a0a8f90aa1e1f939eea517333b6c45";
sha512 = "80af64c1dce6d7a25111480567a3251cc2d1edce00acc4d85bbaa44590f5bbf4c0716f9490c3ab8ef1e6fc2bbabb2379029c2dee51ce477933c7a5935092d279";
};
meta = {
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+2 -2
View File
@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "138.0.4";
version = "139.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "64d80456da8df27d7eeed7eb20c35fcf213bc948eb48739b6101e2c476ea9a9133da928477a79683c96c160f8d53bed52be487f01a8d29e38d39071f12676806";
sha512 = "84a2b47f2ff71aac226a774ab0ac9ab8d9a16f5620a06f7abb6648732209d022aef35a9d4873e91ebd67a4fc494fc238524e25c38fad8046db26afda06e6f970";
};
meta = {
pkgs/applications/networking/instant-messengers/jami/default.nix
+18 -26
View File
@@ -68,31 +68,32 @@
stdenv.mkDerivation rec {
pname = "jami";
version = "20241031.0";
version = "20250523.0";
src = fetchFromGitLab {
domain = "git.jami.net";
owner = "savoirfairelinux";
repo = "jami-client-qt";
rev = "stable/${version}";
hash = "sha256-LKezdzM+ltUSgW4GmTXICyufx9mI1AVbdEcwSp6tmao=";
hash = "sha256-uc2IcSAaCTkTMwjhgMRVdWsStLkOO5dPU2Hx+cYUUL0=";
fetchSubmodules = true;
};
pjsip-jami = pjsip.overrideAttrs (old: rec {
version = "8fc165b833eea6e3c88d67a541385424b129fd3f";
pjsip-jami = pjsip.overrideAttrs (old: {
version = "sfl-2.15-unstable-2025-02-24";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "pjproject";
rev = version;
hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A=";
rev = "37130c943d59f25a71935803ea2d84515074a237";
hash = "sha256-7gAiriuooqqF38oajAuD/Lj5trn/9VMkCGOumcV45NA=";
};
configureFlags = [
"--disable-sound"
"--enable-video"
"--enable-ext-sound"
"--disable-android-mediacodec"
"--disable-speex-aec"
"--disable-g711-codec"
"--disable-l16-codec"
@@ -115,30 +116,21 @@ stdenv.mkDerivation rec {
buildInputs = old.buildInputs ++ [ gnutls ];
});
opendht-jami =
(opendht.overrideAttrs {
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = "074e05cc3254d5d73b0d96ee772a6e01bb3113e5";
hash = "sha256-WuaURlC7eDDxvnM3YuyU9CNrwnE4WBQUIEw3z/0zjN8=";
};
}).override
{
enableProxyServerAndClient = true;
enablePushNotifications = true;
};
opendht-jami = opendht.override {
enableProxyServerAndClient = true;
enablePushNotifications = true;
};
dhtnet = stdenv.mkDerivation {
pname = "dhtnet";
version = "unstable-2024-07-22";
version = "unstable-2025-03-19";
src = fetchFromGitLab {
domain = "git.jami.net";
owner = "savoirfairelinux";
repo = "dhtnet";
rev = "8cd00200669fa5b7632faa447ba206c3847e2879";
hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME=";
rev = "7e7359ff5dadd9aaf6d341486f3ee41029f645e1";
hash = "sha256-sT7OgYUBnO+HfIeCaR3lmoFJ9qE1Y5TEK1/KHzhvK7M=";
};
postPatch = ''
@@ -236,18 +228,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
};
qwindowkit = fetchFromGitHub {
qwindowkit-src = fetchFromGitHub {
owner = "stdware";
repo = "qwindowkit";
rev = "79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef";
hash = "sha256-iZfmv3ADVjHf47HPK/FdrfeAzrXbxbjH3H5MFVg/ZWE=";
rev = "758b00cb6c2d924be3a1ea137ec366dc33a5132d";
hash = "sha256-qpVsF4gUX2noG9nKgjNP7FCEe59okZtDA8R/aZOef7Q=";
fetchSubmodules = true;
};
postPatch = ''
sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake
sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt
cp -R --no-preserve=mode,ownership ${qwindowkit} qwindowkit
cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
'';
preConfigure = ''
pkgs/by-name/am/amazon-q-cli/package.nix
+3 -3
View File
@@ -8,18 +8,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "amazon-q-cli";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-q-developer-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-X1L3Nrzchp8yuGGBwwLQ4ZE41GKH3pFR2CX77TYYhNo=";
hash = "sha256-HgbF5jistZhzebZmnTmMBlHuL6/fy1kcQplAFldzAV8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-qtQ+e0NRzzGn0s2zpnMNUv7JdQDuImMfyC0C/QZrpjU=";
cargoHash = "sha256-yhSVnz8gzJy/E9T1U4GsT3b7wmYzSCYXEb8y2HOIQms=";
cargoBuildFlags = [
"-p"
pkgs/by-name/at/atmos/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "atmos";
version = "1.174.0";
version = "1.176.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = "atmos";
tag = "v${finalAttrs.version}";
hash = "sha256-lkU4g+CMT3Dob7dG5iaX82FZ6oWIEkCnL+RrZ+JRmFM=";
hash = "sha256-dqCjbaGDIbJyi44OFz4Xuu5fy0jJp1URidO2EV6pD4U=";
};
vendorHash = "sha256-0VtuRtvof360vH3SK3TzV4S44owSqn7n2J/aV7/KIJI=";
vendorHash = "sha256-fk74wLJuRVtw/mOyI2GIyXcX/cC/VX6Bx1rDRFsz95M=";
ldflags = [
"-s"
pkgs/by-name/ce/cedar/package.nix
+3 -3
View File
@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "cedar";
version = "4.4.0";
version = "4.4.1";
src = fetchFromGitHub {
owner = "cedar-policy";
repo = "cedar";
tag = "v${version}";
hash = "sha256-rF6r7BUwjRYK9MM0owLs77i7duNj710+PHoX1LGDO24=";
hash = "sha256-9lR1k8XoQDAbaknAGg5kFENX5cJY4l6JgGNyl1dbUXM=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-6SvXJc7ow0zhCPqrI15n05FUBZOmYDnqV4YSclkTZ9I=";
cargoHash = "sha256-XFQo7/NRgRcxhzgdiXJ4iINU22s58Vp/kHLt7Jdr5/s=";
passthru = {
tests.version = testers.testVersion { package = cedar; };
pkgs/by-name/ci/circt/package.nix
+2 -2
View File
@@ -19,12 +19,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.118.0";
version = "1.119.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
hash = "sha256-ZjJQkl9KgrCwxafHyQzX+wutl5FIdwHpKGaB5mlhdsc=";
hash = "sha256-e9tF/A7VnZblhS3GO3ezdEWqCYKHMwgwzbG4wmTw1sE=";
fetchSubmodules = true;
};
pkgs/by-name/da/darkly/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "darkly-qt${qtMajorVersion}";
version = "0.5.19";
version = "0.5.20";
src = fetchFromGitHub {
owner = "Bali10050";
repo = "Darkly";
tag = "v${finalAttrs.version}";
hash = "sha256-hT6OHL8xLp6PZba9hPDxvdGwNkf5ROH9L7ATtnuODpk=";
hash = "sha256-3/oJbf7QHaFyBnrEnZFpWgXbRc5wAFj9RZ7iQEBSZNw=";
};
nativeBuildInputs = [
pkgs/by-name/de/deja-dup/package.nix
+5 -2
View File
@@ -22,19 +22,20 @@
json-glib,
duplicity,
rclone,
restic,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "deja-dup";
version = "47.0";
version = "48.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "deja-dup";
rev = finalAttrs.version;
hash = "sha256-MjZ+NkNAzwEnC9R48Q5Cb3+c5jM7ooOv7+5TQ6Xo4LM=";
hash = "sha256-g6bGOlpiEMJ9d+xe2GJyTBWAuGlY9EZTlJaYhB/5Ldw=";
};
patches = [
@@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = [
"-Dduplicity_command=${lib.getExe duplicity}"
"-Drclone_command=${lib.getExe rclone}"
"-Denable_restic=true"
"-Drestic_command=${lib.getExe restic}"
];
preFixup = ''
pkgs/by-name/dg/dgraph/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "dgraph";
version = "24.1.2";
version = "24.1.3";
src = fetchFromGitHub {
owner = "dgraph-io";
repo = "dgraph";
rev = "v${version}";
sha256 = "sha256-cW8n+HkWwRtdabp5GCCkF6Izgb9LjYxLjoR1jDoePN0=";
sha256 = "sha256-d6HKhA07l6rT+8TktEWaOFw4YTfDz8O5ZhgEQkVcE/M=";
};
vendorHash = "sha256-eOo2ihaabdhDRATIc5C4YEMBcA0Xl5xzBKW5GJhrTOA=";
pkgs/by-name/ev/evcxr/package.nix
+3 -3
View File
@@ -19,17 +19,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "evcxr";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "google";
repo = "evcxr";
rev = "v${finalAttrs.version}";
sha256 = "sha256-8PjZFWUH76QrA8EI9Cx0sBCzocvSmnp84VD7Nv9QMc8=";
sha256 = "sha256-vntXHKP3fk5+26fPHKUy3gqr1Bt9o/ypxyyvXOfdt3I=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-hE/O6lHC0o+nrN4vaQ155Nn2gZscpfsZ6o7IDi/IEjI=";
cargoHash = "sha256-bV83OvHG7lQN3juVsPRurINCzxVPZd0yZ2YNtXXFU8I=";
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
pkgs/by-name/fo/forecast/package.nix
+3 -3
View File
@@ -16,13 +16,13 @@
rustPlatform.buildRustPackage {
pname = "forecast";
version = "0-unstable-2025-05-15";
version = "0-unstable-2025-05-25";
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "forecast";
rev = "7e10d602788c2da526c85cafdc5b167a8bfc2e2c";
hash = "sha256-HsnQll+xqLXA3vRjsiYKkXLKw+uZZoJsSOfms4+fQg0=";
rev = "a31dacc0430fb9065755e53856ed925aa866d1ff";
hash = "sha256-xi5HxDL2YS9LXIgeNxR5ZszMrbtifplysEfxfRj/Ik0=";
};
useFetchCargoVendor = true;
pkgs/by-name/ge/geteduroam/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
buildGoModule (finalAttrs: {
pname = "geteduroam";
version = "0.10";
version = "0.11";
src = fetchFromGitHub {
owner = "geteduroam";
repo = "linux-app";
tag = finalAttrs.version;
hash = "sha256-Mtzt6i8vJ5M8T0vrAOxXhawlhCmCMEnDQz0Jo6uV88A=";
hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY=";
};
vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";
pkgs/by-name/gr/grandorgue/package.nix
+2
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
wrapGAppsHook3,
cmake,
pkg-config,
fftwFloat,
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
imagemagick
libicns
makeWrapper
wrapGAppsHook3
];
buildInputs =
pkgs/by-name/ha/hawkeye/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
rustPackages.rustPlatform.buildRustPackage (finalAttrs: {
pname = "hawkeye";
version = "6.0.3";
version = "6.0.4";
src = fetchFromGitHub {
owner = "korandoru";
repo = "hawkeye";
tag = "v${finalAttrs.version}";
hash = "sha256-reeNsnWvn7sSfyqjGIk8jFnv8HaEBJsqitmNbRa9eTM=";
hash = "sha256-kIHeyNmtrkYZ+o0HojM0N1RhPEeTf+ADMTOvZzjFDLs=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-vvAbdY6C/cCiDu4hl4AL3Gh+TrbC93rn/l6NzgAsFuo=";
cargoHash = "sha256-yf2oIpekE8pjxvPpvwEbHJ/jK6HwUMm1RupwLnK4Q4U=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/ht/htmlhint/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "htmlhint";
version = "1.1.4";
version = "1.2.0";
src = fetchFromGitHub {
owner = "htmlhint";
repo = "HTMLHint";
rev = "v${version}";
hash = "sha256-6R+/uwqWpuTjUnFeUFMzZBzhlFBxYceYZfLLuaYhc6k=";
hash = "sha256-kn1HwOHJq4B+R/YIFQvvvG4efA7iVUVWLV8vfzbNEpA=";
};
npmDepsHash = "sha256-m5hHxA2YTk7qNpc1Z6TXxNTfIMY5LCM9Il9JHJxQJlI=";
npmDepsHash = "sha256-8YeaMU/maXN8Vvy5BYqge4Ky5/Ln4GJ7stVe3y+8uU4=";
meta = {
changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";
pkgs/by-name/hu/hugo/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "hugo";
version = "0.147.3";
version = "0.147.5";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
tag = "v${finalAttrs.version}";
hash = "sha256-CLeVT44A9QmkW4OED14I5u0JbafvXFWeaJnsPDukJJ8=";
hash = "sha256-Or1aRiNbCW1h4+PU9XsYD9lMW243+8VjpWXATGADxMo=";
};
vendorHash = "sha256-/XXYKuZNwrBx+Dr4XacDIzTrdELtXYHRjOzjhcBjoK4=";
vendorHash = "sha256-lnUz3MqQVQqfbNweGLsehrdQuHS1Xa/L7pWKrmB4tNw=";
checkFlags =
let
pkgs/by-name/ia/iamb/package.nix
+4 -2
View File
@@ -41,8 +41,10 @@ rustPlatform.buildRustPackage rec {
];
postInstall = ''
OUT_DIR=$releaseDir/build/iamb-*/out
installManPage $OUT_DIR/iamb.{1,5}
installManPage $src/docs/iamb.{1,5}
install -D $src/docs/iamb.svg -t $out/share/icons/hicolor/scalable/apps
install -D $src/docs/iamb.metainfo.xml $out/share/appdata/chat.iamb.iamb.appdata.xml
install -D $src/iamb.desktop -t $out/share/applications
'';
nativeInstallCheckInputs = [
pkgs/by-name/in/infra-arcana/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "infra-arcana";
version = "22.1.0";
version = "23.0.0";
src = fetchFromGitLab {
owner = "martin-tornqvist";
repo = "ia";
rev = "v${version}";
hash = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc=";
hash = "sha256-b7YRhoQa298fcP4cXlWhLXajjL0M3Mk4Kbb81iH6s5w=";
};
nativeBuildInputs = [
pkgs/by-name/ju/justbuild/package.nix
+2 -2
View File
@@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation rec {
pname = "justbuild";
version = "1.5.1";
version = "1.5.2";
src = fetchFromGitHub {
owner = "just-buildsystem";
repo = "justbuild";
rev = "refs/tags/v${version}";
hash = "sha256-EPRWJRo6vE4QizmWuh7yW3fZOIuS9I8EMiloBiqfVxs=";
hash = "sha256-Vde8/oOZ6djf4b/eXykzdsG+a+huWNbTZQFzr/YeXq4=";
};
bazelapi = fetchurl {
pkgs/by-name/ki/kid3/package.nix
+4 -1
View File
@@ -88,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
]
);
cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ];
cmakeFlags = [
(lib.cmakeFeature "WITH_APPS" apps)
(lib.cmakeBool "WITH_MP4V2" true)
];
env = {
DOCBOOKDIR = "${docbook_xsl}/xml/xsl/docbook/";
pkgs/by-name/lu/lux-cli/package.nix
+1 -1
View File
@@ -17,7 +17,7 @@
rustPlatform.buildRustPackage rec {
pname = "lux-cli";
version = "0.5.0";
version = "0.5.3";
src = luaPackages.lux-lua.src;
pkgs/by-name/ma/mani/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "mani";
version = "0.30.1";
version = "0.31.0";
src = fetchFromGitHub {
owner = "alajmo";
repo = "mani";
tag = "v${finalAttrs.version}";
sha256 = "sha256-BD9NpWaaBBVHWJesXsJJmFV51n+JOFGtYOH73PvSxv4=";
sha256 = "sha256-sV3yxtLlOTtCCj0kNstJ07cvI+B+rL4QNPQKGo98V6A=";
};
vendorHash = "sha256-PnQocOtnIBl0+5mDG7irEqGjAnzJ9Wk/fA4NW/nU+zw=";
pkgs/by-name/mi/mitra/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
rustPlatform.buildRustPackage rec {
pname = "mitra";
version = "4.2.1";
version = "4.3.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "silverpill";
repo = "mitra";
rev = "v${version}";
hash = "sha256-rT29QByrg/rn13Hj4UTzwA22xLsQhNESQPM0lb/dsf8=";
hash = "sha256-SUcapWfsIqohFsZY1Bpce5txLe2DtpgAGBJKTUwdzVI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-whAUofVJgqhwasOaYNmrWcZVyg0YpvNemt7/LJHxgCs=";
cargoHash = "sha256-B0Ba4ZGTw+FJLcXSy+VfKrp5hqGWoW3ugfnkDXFDlok=";
# require running database
doCheck = false;
pkgs/by-name/ml/mlt/package.nix
+2 -2
View File
@@ -42,13 +42,13 @@
stdenv.mkDerivation rec {
pname = "mlt";
version = "7.32.0";
version = "7.30.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
hash = "sha256-8T5FXXGs7SxL6nD+R1Q/0Forsdp5Xux4S3VLvgqXzw8=";
hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4=";
# The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
# Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
# submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545
pkgs/by-name/mo/monit/package.nix
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "monit";
version = "5.35.1";
version = "5.35.2";
src = fetchurl {
url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz";
hash = "sha256-d6TAI+4Gru1IU23+tJ2WqGip64EGw+LojKtTe7xylRs=";
hash = "sha256-Tf71QynmPZdyqeHDasmbxBFzt5lj3A2CNfLDL0ueB48=";
};
nativeBuildInputs = [
pkgs/by-name/ms/msr-tools/package.nix
+11 -15
View File
@@ -1,29 +1,25 @@
{
lib,
stdenv,
fetchurl,
unzip,
fetchFromGitHub,
autoreconfHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "msr-tools";
version = "1.3";
version = "1.3-unstable-2022-08-05";
src = fetchurl {
url = "https://01.org/sites/default/files/downloads/msr-tools/${pname}-${version}.zip";
sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
src = fetchFromGitHub {
owner = "intel";
repo = "msr-tools";
rev = "7d78c80d66463ac598bcc8bf1dc260418788dfda";
hash = "sha256-p+bfS1Fsz9MqPLmiVD8d+93oeUxxU2raKdRY7pThlzk=";
};
nativeBuildInputs = [ unzip ];
preInstall = ''
mkdir -p $out/bin
substituteInPlace Makefile \
--replace /usr/sbin $out/bin
'';
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
description = "Tool to read/write from/to MSR CPU registers on Linux";
description = "Tools to read/write from/to MSR CPU registers on Linux";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ peterhoeg ];
pkgs/by-name/ne/nekoray/package.nix
+3
View File
@@ -66,6 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
runHook preInstall
install -Dm755 nekoray "$out/share/nekoray/nekoray"
install -Dm644 "$src/res/public/nekobox.png" "$out/share/pixmaps/nekoray.png"
mkdir -p "$out/bin"
ln -s "$out/share/nekoray/nekoray" "$out/bin"
pkgs/by-name/ne/netbird/package.nix
+2 -2
View File
@@ -31,13 +31,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "netbird";
version = "0.44.0";
version = "0.45.1";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "netbird";
tag = "v${finalAttrs.version}";
hash = "sha256-+tiQx692GSAI5AoDaKY5x3Z3WrX6QU+WFV96paM9ayw=";
hash = "sha256-55Vyhzt0WtJRq9CcH7mXw7cklAce/lvC1S+MBMDnMbo=";
};
vendorHash = "sha256-EVhtxYDinmid5C/3N8UGmCzWw1qIE3m0rXes4uFpcOM=";
pkgs/by-name/ni/nixpkgs-track/package.nix
+3 -3
View File
@@ -9,17 +9,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nixpkgs-track";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "uncenter";
repo = "nixpkgs-track";
tag = "v${finalAttrs.version}";
hash = "sha256-iJqYn+MttFBmcAI2HKALAAYayFzvdAtkmNwM+IewxRM=";
hash = "sha256-NXEX2C2UhXmzyhN8jfqkv3d028axR1KIuXU94EPUmrU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-jC3E8BPuzRCI+smuqeWzNDA9MOcK/PDzZZPnvBVqSXI=";
cargoHash = "sha256-AbT0r6T2+ag70zEMjN3/2AMK1DfVkLfLAbG9puchD58=";
buildInputs = [ openssl ];
nativeBuildInputs = [
pkgs/by-name/op/opendht/package.nix
+19 -11
View File
@@ -15,21 +15,32 @@
llhttp,
openssl,
fmt,
fetchpatch2,
nix-update-script,
enableProxyServerAndClient ? false,
enablePushNotifications ? false,
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "opendht";
version = "3.2.0-unstable-2025-01-05";
version = "3.4.0";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = "5237f0a3b3eb8965f294de706ad73596569ae1dd";
hash = "sha256-qErVKyZQR/asJ8qr0sRDaXZ8jUV7RaSLnJka5baWa7Q=";
tag = "v${version}";
hash = "sha256-WNN4aCZiJuz9CgEKIzFmy50HBj0ZL/d1uU7L518lPhk=";
};
patches = lib.optionals enableProxyServerAndClient [
# Remove this patch when switching to using shared llhttp
(fetchpatch2 {
url = "https://github.com/savoirfairelinux/opendht/commit/2bc46e9657c94adcce2479807a0a04c2f783bd4e.patch?full_index=1";
hash = "sha256-znft836nPx8uvfHm0fQE9h+l5G006Im6IJOrsmElx6w=";
revert = true;
})
];
nativeBuildInputs = [
cmake
pkg-config
@@ -61,13 +72,6 @@ stdenv.mkDerivation {
"-DOPENDHT_PUSH_NOTIFICATIONS=ON"
];
# https://github.com/savoirfairelinux/opendht/issues/612
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
--replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
'';
outputs = [
"out"
"lib"
@@ -75,6 +79,10 @@ stdenv.mkDerivation {
"man"
];
passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex=v(.+)" ];
};
meta = with lib; {
description = "C++11 Kademlia distributed hash table implementation";
homepage = "https://github.com/savoirfairelinux/opendht";
pkgs/by-name/op/openscenegraph/package.nix
+4 -2
View File
@@ -88,7 +88,6 @@ stdenv.mkDerivation rec {
++ [
glib
libxml2
pcre
zlib
]
++ lib.optional jpegSupport libjpeg
@@ -98,7 +97,10 @@ stdenv.mkDerivation rec {
++ lib.optional tiffSupport libtiff
++ lib.optional gdalSupport gdal
++ lib.optional curlSupport curl
++ lib.optional colladaSupport opencollada
++ lib.optionals colladaSupport [
opencollada
pcre
]
++ lib.optional opencascadeSupport opencascade-occt
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional nvttSupport nvidia-texture-tools
pkgs/by-name/op/opensmtpd-table-ldap/package.nix
+1 -1
View File
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.opensmtpd.org/";
description = "ldap table for the OpenSMTPD mail server";
description = "LDAP tables for the OpenSMTPD mail server";
changelog = "https://github.com/OpenSMTPD/table-ldap/releases/tag/${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
pkgs/by-name/op/opensmtpd-table-mysql/package.nix
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.opensmtpd.org/";
description = "ldap table for the OpenSMTPD mail server";
description = "MySQL or MariaDB tables for the OpenSMTPD mail server";
changelog = "https://github.com/OpenSMTPD/table-mysql/releases/tag/${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
pkgs/by-name/op/opensmtpd-table-passwd/package.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.opensmtpd.org/";
description = "passwd table for the OpenSMTPD mail server";
description = "passwd tables for the OpenSMTPD mail server";
changelog = "https://github.com/OpenSMTPD/table-passwd/releases/tag/${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
pkgs/by-name/op/opensmtpd-table-postgres/package.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.opensmtpd.org/";
description = "ldap table for the OpenSMTPD mail server";
description = "PostgreSQL tables for the OpenSMTPD mail server";
changelog = "https://github.com/OpenSMTPD/table-postgres/releases/tag/${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
pkgs/by-name/op/opensmtpd-table-redis/package.nix
+1 -1
View File
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.opensmtpd.org/";
description = "ldap table for the OpenSMTPD mail server";
description = "Redis tables for the OpenSMTPD mail server";
changelog = "https://github.com/OpenSMTPD/table-redis/releases/tag/${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
pkgs/by-name/op/opensmtpd-table-socketmap/package.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.opensmtpd.org/";
description = "ldap table for the OpenSMTPD mail server";
description = "socketmap tables the OpenSMTPD mail server";
changelog = "https://github.com/OpenSMTPD/table-socketmap/releases/tag/${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
pkgs/by-name/op/opensmtpd-table-sqlite/package.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://www.opensmtpd.org/";
description = "ldap table for the OpenSMTPD mail server";
description = "SQLite tables for the OpenSMTPD mail server";
changelog = "https://github.com/OpenSMTPD/table-sqlite/releases/tag/${finalAttrs.version}";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
pkgs/by-name/pa/parca-agent/package.nix
+5 -2
View File
@@ -3,17 +3,18 @@
fetchFromGitHub,
lib,
stdenv,
nix-update-script,
}:
buildGoModule rec {
pname = "parca-agent";
version = "0.38.2";
version = "0.39.0";
src = fetchFromGitHub {
owner = "parca-dev";
repo = "parca-agent";
tag = "v${version}";
hash = "sha256-6TjO5Fb6+zCrVz/Edq41H3tTbJLtYD1k/OKt01ms2dY=";
hash = "sha256-ZdMQ0cyLihMhqXVN98t0Bhg2I4NUxBPcSl2KJU5P0vQ=";
fetchSubmodules = true;
};
@@ -35,6 +36,8 @@ buildGoModule rec {
"netgo"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "eBPF based, always-on profiling agent";
homepage = "https://github.com/parca-dev/parca-agent";
pkgs/by-name/pa/particle-cli/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage (finalAttrs: {
pname = "particle-cli";
version = "3.35.10";
version = "3.35.11";
src = fetchFromGitHub {
owner = "particle-iot";
repo = "particle-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-u1QiV8KNG5tRrSqKkoSljCvaGw5rExSVC71IQaC5hPI=";
hash = "sha256-LqQAdyaNSyWDPZEZWnUT1NLbmRkuBVn4yUXgBlU5EUI=";
};
npmDepsHash = "sha256-QIyq/hmZFjt2mpH61ZaCTPve8QvDTSm2Ijwa5thrKkM=";
npmDepsHash = "sha256-CpDZrnOZFD42jIoyGCWiYoQgA2Bn2iwaOrSx0SdihTk=";
buildInputs = [
udev
pkgs/by-name/pj/pjsip/fix-aarch64.patch
-13
View File
@@ -1,13 +0,0 @@
--- a/aconfigure
+++ b/aconfigure
@@ -9174,6 +9174,10 @@
ac_webrtc_instset=neon
ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
;;
+ arm64*|aarch64*)
+ ac_webrtc_instset=neon
+ ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
+ ;;
*)
ac_webrtc_instset=sse2
;;
pkgs/by-name/pj/pjsip/package.nix
+6 -5
View File
@@ -13,17 +13,15 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pjsip";
version = "2.14.1";
version = "2.15.1";
src = fetchFromGitHub {
owner = "pjsip";
repo = "pjproject";
tag = finalAttrs.version;
hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
hash = "sha256-9WzOIKWGy71OMzaPOp1P8/pvhHio2rDJOkH1VaNItjU=";
};
patches = [ ./fix-aarch64.patch ];
postPatch = ''
substituteInPlace \
pjsip-apps/src/py_pjsua/setup.py \
@@ -48,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
env =
lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
{
NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
}
// lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_LINK = "-headerpad_max_install_names";
};
pkgs/by-name/pr/prettyping/package.nix
+2 -2
View File
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "prettyping";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "denilsonsa";
repo = "prettyping";
rev = "v${version}";
sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf";
sha256 = "sha256-GhsoWnhX9xBnupmmHuKW9DA2KFgIzVbSO0CyR2FpJ74=";
};
installPhase = ''
pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "prometheus-borgmatic-exporter";
version = "0.2.8";
version = "0.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "maxim-mityutko";
repo = "borgmatic-exporter";
tag = "v${version}";
hash = "sha256-/d9XX/7w6hod7udB9tlCqOVpcpWZzU0Kir9RSoQiQBs=";
hash = "sha256-QbpHSpcXJdmi6oiPTFT6XwNLtaXSAGavHeEoz3IV73I=";
};
pythonRelaxDeps = [ "prometheus-client" ];
pkgs/by-name/ra/raycast/package.nix
+3 -3
View File
@@ -12,19 +12,19 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.99.0";
version = "1.99.2";
src =
{
aarch64-darwin = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
hash = "sha256-5TMVwZ912+r0OP2NeBc53FOkanaRHJgw+P+JbtdBsKg=";
hash = "sha256-VtZy1pUayK4r8L74llguBid5VJ1UcanNg8rWcOswVh4=";
};
x86_64-darwin = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
hash = "sha256-fhW/qQksn69ri7dLwMerRsktZ3Ykn5qmlNkWZ2piN58=";
hash = "sha256-PoR7bln88TtfNixhHnBCIA8ddesjQTin2o6nZ4dXPms=";
};
}
.${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
pkgs/by-name/re/rerun/package.nix
+3 -3
View File
@@ -34,13 +34,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rerun";
version = "0.23.2";
version = "0.23.3";
src = fetchFromGitHub {
owner = "rerun-io";
repo = "rerun";
tag = finalAttrs.version;
hash = "sha256-l3p9yicA7SNKURemxGq2j0iXeyE4jEsqQ9VdGZPuN/E=";
hash = "sha256-XVrhVUP7AIywIq357HoSP/ZCmYTnLiX/tgaOzhh6PHo=";
};
# The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-zF3mzv7FOrr1qGG6N6u4c0OKc39klkBfQIqF0fmX5GU=";
cargoHash = "sha256-tj9+dvXF3iDbUoxk7Hdz+PTuyDpCgdRE6ZqHBLTZuMU=";
cargoBuildFlags = [ "--package rerun-cli" ];
cargoTestFlags = [ "--package rerun-cli" ];
pkgs/by-name/ro/root/Fix-find_package-LLVM-overwriting-LLVM_LINK_LLVM_DYLIB.patch
+55
View File
@@ -0,0 +1,55 @@
From a4ed1625ee4e74c4e8664742165d6a485b737d57 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Tue, 22 Apr 2025 12:36:46 +0200
Subject: [PATCH] Work around find_package(LLVM) overwriting
LLVM_LINK_LLVM_DYLIB
---
clang/CMakeLists.txt | 10 ++++++++++
.../clang/cmake/modules/ClangConfig.cmake.in | 6 ++++++
2 files changed, 16 insertions(+)
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 5f2b7f064d..a9581d081e 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -28,7 +28,17 @@ if(CLANG_BUILT_STANDALONE)
mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
endif()
+ # Remember current value of LLVM_LINK_LLVM_DYLIB and reset later, because
+ # find_package(LLVM) is overwriting it without a good reason. See:
+ # https://github.com/llvm/llvm-project/pull/135570
+ if(DEFINED LLVM_LINK_LLVM_DYLIB)
+ set(llvm_link_llvm_dylib ${LLVM_LINK_LLVM_DYLIB})
+ endif()
find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")
+ if(DEFINED llvm_link_llvm_dylib)
+ set(LLVM_LINK_LLVM_DYLIB ${llvm_link_llvm_dylib})
+ endif()
+
list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
# Turn into CACHE PATHs for overwritting
diff --git a/clang/cmake/modules/ClangConfig.cmake.in b/clang/cmake/modules/ClangConfig.cmake.in
index 5f67681649..36a34ddab2 100644
--- a/clang/cmake/modules/ClangConfig.cmake.in
+++ b/clang/cmake/modules/ClangConfig.cmake.in
@@ -3,8 +3,14 @@
@CLANG_CONFIG_CODE@
set(LLVM_VERSION @LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@.@LLVM_VERSION_PATCH@)
+
+# ROOT calls find_package(LLVM) before find_package(Clang), and
+# find_package(LLVM) is overwriting LLVM_LINK_LLVM_DYLIB without a good
+# reason. See: https://github.com/llvm/llvm-project/pull/135570
+# So we need to set it to what it needs to be for ROOT.
find_package(LLVM ${LLVM_VERSION} EXACT REQUIRED CONFIG
HINTS "@CLANG_CONFIG_LLVM_CMAKE_DIR@")
+set(LLVM_LINK_LLVM_DYLIB OFF)
set(CLANG_EXPORTED_TARGETS "@CLANG_EXPORTS@")
set(CLANG_CMAKE_DIR "@CLANG_CONFIG_CMAKE_DIR@")
--
2.49.0
pkgs/by-name/ro/root/clang-root.nix
+58
View File
@@ -0,0 +1,58 @@
{
stdenv,
lib,
fetchgit,
apple-sdk,
cmake,
git,
llvm_18,
pkg-config,
python3,
}:
stdenv.mkDerivation rec {
pname = "clang-root";
version = "18-20250506-01";
src = fetchgit {
url = "https://github.com/root-project/llvm-project";
rev = "refs/tags/ROOT-llvm${version}";
hash = "sha256-8tviNWNmvIJhxF4j9Z7zMnjltTX0Ka2fN9HIgLfNAco=";
};
nativeBuildInputs = [
cmake
pkg-config
git
];
buildInputs = [
llvm_18
python3
];
patches = [
./Fix-find_package-LLVM-overwriting-LLVM_LINK_LLVM_DYLIB.patch
];
preConfigure = ''
cd clang
'';
cmakeFlags =
[
"-DCLANG_BUILD_TOOLS=OFF"
"-DCLANG_ENABLE_ARCMT=OFF"
"-DCLANG_ENABLE_STATIC_ANALYZER=OFF"
"-DCLANG_LINK_CLANG_DYLIB=OFF"
"-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
"-DLLVM_INCLUDE_TESTS=OFF"
"-DLLVM_LINK_LLVM_DYLIB=OFF"
"-DLLVM_MAIN_SRC_DIR=${llvm_18.src}"
]
++ (
if stdenv.hostPlatform.isDarwin then
[ "-DC_INCLUDE_DIRS=${apple-sdk.sdkroot}/usr/include" ]
else
lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
);
}
pkgs/by-name/ro/root/package.nix
+29 -15
View File
@@ -2,7 +2,8 @@
stdenv,
lib,
callPackage,
fetchgit,
fetchFromGitHub,
fetchpatch,
fetchurl,
makeWrapper,
writeText,
@@ -51,7 +52,7 @@
stdenv.mkDerivation rec {
pname = "root";
version = "6.34.08";
version = "6.36.00";
passthru = {
tests = import ./tests { inherit callPackage; };
@@ -59,17 +60,21 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
hash = "sha256-gGBFsVbeA/6PVmGmcOq4d/Lk0tpsI03D4x6Y4tfZb+g=";
hash = "sha256-lK/I3vkoQmeaEwonUhvmbiq9qjdiCIjmHYKKQ/xLAaI=";
};
clad_src = fetchgit {
url = "https://github.com/vgvassilev/clad";
clad_src = fetchFromGitHub {
owner = "vgvassilev";
repo = "clad";
# Make sure that this is the same tag as in the ROOT build files!
# https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76
rev = "refs/tags/v1.7";
hash = "sha256-iKrZsuUerrlrjXBrxcTsFu/t0Pb0sa4UlfSwd1yhg3g=";
rev = "refs/tags/v1.9";
hash = "sha256-TKCRAfwdTp/uDH7rk9EE4z2hwqBybklHhhYH6hQFYpg=";
};
# ROOT requires a patched version of clang
clang = (callPackage ./clang-root.nix { });
nativeBuildInputs = [
makeWrapper
cmake
@@ -81,6 +86,7 @@ stdenv.mkDerivation rec {
];
buildInputs =
[
clang
davix
fftw
ftgl
@@ -118,6 +124,20 @@ stdenv.mkDerivation rec {
xorg.libXext
];
patches = [
# Backport that can be removed once ROOT is updated to 6.38.00
(fetchpatch {
url = "https://github.com/root-project/root/commit/8f21acb893977bc651a4c4fe5c4fa020a48d31de.patch";
hash = "sha256-xo3BbaJRyW4Wy2eVuX1bY3FFH7Jm3vN2ZojMsVNIK2I=";
})
# Revert because it introduces usage of the xcrun executable from xcode:
(fetchpatch {
url = "https://github.com/root-project/root/commit/6bd0dbad38bb524491c5109bc408942246db8b50.patch";
hash = "sha256-D7LZWJnGF9DtKcM8EF3KILU81cqTcZolW+HMe3fmXTw=";
revert = true;
})
];
preConfigure =
''
for path in builtins/*; do
@@ -128,9 +148,6 @@ stdenv.mkDerivation rec {
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
--replace-fail 'set(lcgpackages ' '#set(lcgpackages '
substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
--replace-fail 'add_clang_symlink(''${link} clang)' ""
patchShebangs cmake/unix/
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -151,20 +168,17 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DClang_DIR=${clang}/lib/cmake/clang"
"-Dbuiltin_clang=OFF"
"-Dbuiltin_llvm=OFF"
"-Dfail-on-missing=ON"
"-Dfftw3=ON"
"-Dfitsio=OFF"
"-Dgnuinstall=ON"
"-Dmathmore=ON"
"-Dmysql=OFF"
"-Dpgsql=OFF"
"-Dsqlite=OFF"
"-Dvdt=OFF"
]
++ lib.optional (
(!stdenv.hostPlatform.isDarwin) && (stdenv.cc.libc != null)
) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
++ lib.optionals stdenv.hostPlatform.isDarwin [
# fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found
# fatal error: could not build module '_Builtin_intrinsics'
pkgs/by-name/ru/ruqola/package.nix
+2 -2
View File
@@ -11,14 +11,14 @@
stdenv.mkDerivation (finalAttrs: {
name = "ruqola";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = "ruqola";
tag = "v${finalAttrs.version}";
hash = "sha256-gcdu/+JTutY7gvokHNVbWH5D82HhtLXkL6PLZN81ano=";
hash = "sha256-Oeea+IX2H9UvLZnq6X4AjwH5O4VPCg/RHRwohidPalo=";
};
nativeBuildInputs = [
pkgs/by-name/sh/shadps4/package.nix
+2 -2
View File
@@ -39,13 +39,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shadps4";
version = "0.7.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "shadps4-emu";
repo = "shadPS4";
tag = "v.${finalAttrs.version}";
hash = "sha256-g55Ob74Yhnnrsv9+fNA1+uTJ0H2nyH5UT4ITHnrGKDo=";
hash = "sha256-ljnoClmijCds/ydqXaRuUL6/Qv/fGIkLyGsmfPDqvVo=";
fetchSubmodules = true;
};
pkgs/by-name/sm/smenu/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
}:
stdenv.mkDerivation rec {
version = "1.4.0";
version = "1.5.0";
pname = "smenu";
src = fetchFromGitHub {
owner = "p-gen";
repo = "smenu";
rev = "v${version}";
sha256 = "sha256-pAbtTqDIdDWReeaRK7UHXh/PS5f44/PRWaICluH02ec=";
sha256 = "sha256-nTQe6sCMHGRW7Djpv33xY8nL4a7ZyC9YM7PGOvmpuSM=";
};
buildInputs = [ ncurses ];
pkgs/by-name/sn/snips-sh/package.nix
+3 -3
View File
@@ -8,14 +8,14 @@
}:
buildGoModule rec {
pname = "snips-sh";
version = "0.4.2";
vendorHash = "sha256-Lp3yousaDkTCruOP0ytfY84vPmfLMgBoTwf+7Q7Q0Lc=";
version = "0.5.0";
vendorHash = "sha256-jitainpBp6YIzdMURI/lLxSi1Wk42Ubncoq6pFj8OKM=";
src = fetchFromGitHub {
owner = "robherley";
repo = "snips.sh";
rev = "v${version}";
hash = "sha256-IjGXGY75k9VeeHek0V8SrIElmiQ+Q2P5gEDIp7pmQd8=";
hash = "sha256-wumM5LyEQCL38Lmipz+BCB0dycH0Bj7lvUYwsctUg54=";
};
tags = (lib.optional (!withTensorflow) "noguesser");
pkgs/by-name/sp/spider/package.nix
+3 -3
View File
@@ -14,17 +14,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "spider";
version = "2.37.18";
version = "2.37.79";
src = fetchFromGitHub {
owner = "spider-rs";
repo = "spider";
tag = "v${finalAttrs.version}";
hash = "sha256-aJXd8yzDEP1pYe4J8Zi6vmLN1+ki6B0tLFV/mvwkk/k=";
hash = "sha256-uYgdYIZ+T5G9TvgFCdErvex9KXN0pJn3MngMKpT/PVo=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-QVh962yXXStDwLyd8LSnmxkik6wNebOfGyH0HuE13kg=";
cargoHash = "sha256-uJ69BxeYhU/xVTKqOsxoqfS4At9+BtqurJfYUFEnKtA=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/sq/sql-formatter/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
}:
stdenv.mkDerivation rec {
pname = "sql-formatter";
version = "15.6.1";
version = "15.6.2";
src = fetchFromGitHub {
owner = "sql-formatter-org";
repo = "sql-formatter";
rev = "v${version}";
hash = "sha256-Olq7DAhiopFlLnn6r78nJU6LjS2EiU93kc/iY4mLCL8=";
hash = "sha256-pqNxZ8bmnwQYPLIQ8vQrKct9fD8i0fiLn4h4f2779q4=";
};
yarnOfflineCache = fetchYarnDeps {
pkgs/by-name/st/stunnel/package.nix
+2 -2
View File
@@ -12,7 +12,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "stunnel";
version = "5.74";
version = "5.75";
outputs = [
"out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://www.stunnel.org/archive/${lib.versions.major finalAttrs.version}.x/stunnel-${finalAttrs.version}.tar.gz";
hash = "sha256-m+8jWrXSSiqN/2SF39eC7SNfRAfpvIcW3rOD/IDNYjA=";
hash = "sha256-DB7w7YUkCXTcy5T+dPuS1jg0dMfA0Q6HltH3gaO6VoM=";
# please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
};
pkgs/by-name/su/supabase-cli/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "2.23.1";
version = "2.23.7";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-1k4eWXBNzmG5qP2sGaEddK+bUAwSArsJ+WbtkMe9Fv4=";
hash = "sha256-djzeqSaDTAK8WR3y7hpDk6NpuGlGLMxLvgSTH1IvlWw=";
};
vendorHash = "sha256-ttQNief5BHbsRtmA32VFMbF2cuiIrtXVfOw5C/A9R+Q=";
vendorHash = "sha256-sjF0NEea51CKPWuZZHsDVZDtQaYz/94qM5iYwPb3jNo=";
ldflags = [
"-s"
pkgs/by-name/ta/tailscale/package.nix
+14 -6
View File
@@ -4,7 +4,6 @@
buildGoModule,
fetchFromGitHub,
fetchpatch,
makeWrapper,
installShellFiles,
@@ -24,7 +23,7 @@
}:
let
version = "1.82.5";
version = "1.84.0";
in
buildGoModule {
pname = "tailscale";
@@ -39,10 +38,10 @@ buildGoModule {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-BFitj8A+TfNKTyXBB1YhsEs5NvLUfgJ2IbjB2ipf4xU=";
hash = "sha256-8/kDUr1OBkKuEXut7Eqd3dnm+82+9b9D+cRsn0ke/bY=";
};
vendorHash = "sha256-SiUkN6BQK1IQmLfkfPetzvYqRu9ENK6+6txtGxegF5Y=";
vendorHash = "sha256-QBYCMOWQOBCt+69NtJtluhTZIOiBWcQ78M9Gbki6bN0=";
nativeBuildInputs = [
makeWrapper
@@ -96,8 +95,10 @@ buildGoModule {
# want but also limits the tests
unset subPackages
# several tests hang
rm tsnet/tsnet_test.go
# several tests hang, but keeping the file for tsnet/packet_filter_test.go
# packet_filter_test issue: https://github.com/tailscale/tailscale/issues/16051
substituteInPlace tsnet/tsnet_test.go \
--replace-fail 'func Test' 'func skippedTest'
'';
checkFlags =
@@ -141,6 +142,13 @@ buildGoModule {
# flaky: https://github.com/tailscale/tailscale/issues/11762
"TestTwoDevicePing"
# timeout 10m
"TestTaildropIntegration"
"TestTaildropIntegration_Fresh"
# context deadline exceeded
"TestPacketFilterFromNetmap"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# syscall default route interface en0 differs from netstat
pkgs/by-name/te/terraform-compliance/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "terraform-compliance";
version = "1.3.50";
version = "1.3.52";
format = "setuptools";
src = fetchFromGitHub {
owner = "terraform-compliance";
repo = "cli";
tag = version;
hash = "sha256-FwePzXXxwiV5tWY1a+mG5pcv6XB801qG6Lx+XUe662E=";
hash = "sha256-M6u1P1UxOrP9bNPjPB0V15DUj+Y/1dFIjf/GCnYoCwc=";
};
postPatch = ''
pkgs/by-name/tt/tts/package.nix
+3 -3
View File
@@ -10,14 +10,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "coqui-tts";
version = "0.26.0";
version = "0.26.2";
pyproject = true;
src = fetchFromGitHub {
owner = "idiap";
repo = "coqui-ai-TTS";
tag = "v${version}";
hash = "sha256-tLTurOwSzKvejb31yijmH3LFZGJHYp0OW0ckS7Ds5ig=";
hash = "sha256-U/U3aXFvqnaV/Msy5wyzAKCUw9XUNplugig6nv5nfZY=";
};
postPatch =
@@ -185,7 +185,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
homepage = "https://github.com/idiap/coqui-ai-TTS";
changelog = "https://github.com/idiap/coqui-ai-TTS/releases/tag/v${version}";
changelog = "https://github.com/idiap/coqui-ai-TTS/releases/tag/${src.tag}";
description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production";
license = licenses.mpl20;
teams = [ teams.tts ];
pkgs/by-name/wa/watcher/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "watcher";
version = "0.13.5";
version = "0.13.6";
src = fetchFromGitHub {
owner = "e-dant";
repo = "watcher";
tag = version;
hash = "sha256-5YeOomQ+6wsul+SQCvxodAYNinYh+tNHnf2UMjGYUt0=";
hash = "sha256-mcnItyXjU4ylNvM6QLlmUDybhwdxi7D6e3z8saZubMY=";
};
nativeBuildInputs = [
pkgs/by-name/xa/xastir/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "xastir";
version = "2.2.0";
version = "2.2.2";
src = fetchFromGitHub {
owner = "xastir";
repo = "xastir";
tag = "Release-${version}";
hash = "sha256-EQXSfH4b5vMiprFcMXCUDNl+R1cHSj9CyhZnUPAMoCw=";
hash = "sha256-bpT8F3xURo9jRxBrGGflmcLD6U7F+FTW+VAK1WCgqF4=";
};
nativeBuildInputs = [
pkgs/by-name/z-/z-lua/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "z-lua";
version = "1.8.21";
version = "1.8.24";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "z.lua";
rev = version;
sha256 = "sha256-TGUwYlPi9KGqOb2OcMyBb+AapXjlMPf0dSt2AQZS39A=";
sha256 = "sha256-1wsBXJd6QXgK4BCg+VTVDY95DP4+xFp0vAbKmztoREI=";
};
dontBuild = true;
pkgs/by-name/zo/zoxide/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "zoxide";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
tag = "v${version}";
hash = "sha256-+QZpLMlHOZdbKLFYOUOIRZHvIsbMDdstj9oGzyEGVxk=";
hash = "sha256-8hXoC3vyR08hN8MMojnAO7yIskg4FsEm28GtFfh5liI=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
'';
useFetchCargoVendor = true;
cargoHash = "sha256-uqIL8KTrgWzzzyoPR9gctyh0Rf7WQpTGqXow2/xFvCU=";
cargoHash = "sha256-Nonid/5Jh0WIQV0G3fpmkW0bql6bvlcNJBMZ+6MTTPQ=";
postInstall = ''
installManPage man/man*/*
pkgs/development/compilers/flutter/wrapper.nix
+12 -4
View File
@@ -103,11 +103,19 @@ let
let
# https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3
deps =
pkg:
builtins.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ]));
collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ builtins.concatMap collect (deps pkg));
pkg: lib.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ]));
withKey = pkg: {
key = pkg.outPath;
val = pkg;
};
collect = pkg: lib.map withKey ([ pkg ] ++ deps pkg);
in
builtins.concatMap collect appRuntimeDeps;
lib.map (e: e.val) (
lib.genericClosure {
startSet = lib.map withKey appRuntimeDeps;
operator = item: collect item.val;
}
);
# Some header files and libraries are not properly located by the Flutter SDK.
# They must be manually included.
pkgs/development/libraries/ngtcp2/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ngtcp2";
version = "1.12.0";
version = "1.13.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
# must match version usage in meta.changelog
tag = "v${finalAttrs.version}";
hash = "sha256-mfgWtyYhAJB8kvQVNCuSHx4Nz1Th5STMlorCB2xO7OQ=";
hash = "sha256-SnzKCPNfa42fV+fNdbgOe588JoaPdDVNtb2AStAsK9k=";
fetchSubmodules = true;
};
pkgs/development/libraries/opencsg/default.nix
+13 -17
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
cmake,
libGLU,
libGL,
libglut,
@@ -9,19 +10,19 @@
libXmu,
libXext,
libX11,
qmake,
fixDarwinDylibNames,
}:
stdenv.mkDerivation rec {
version = "1.7.0";
stdenv.mkDerivation (finalAttrs: {
pname = "opencsg";
version = "1.8.1";
src = fetchurl {
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
hash = "sha256-uJLezIGp5nwsTSXFOZ1XbY93w7DAUmBgZ0MkPIZTnfg=";
url = "http://www.opencsg.org/OpenCSG-${finalAttrs.version}.tar.gz";
hash = "sha256-r8wASontO8R4qeS6ObIPPVibJOI+J1tzg/kaWQ1NV8U=";
};
nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs =
[ glew ]
@@ -36,14 +37,9 @@ stdenv.mkDerivation rec {
doCheck = false;
preConfigure = ''
rm example/Makefile src/Makefile
qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out")
'';
postInstall =
''
install -D copying.txt "$out/share/doc/opencsg/copying.txt"
install -D ../copying.txt "$out/share/doc/opencsg/copying.txt"
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
@@ -61,12 +57,12 @@ stdenv.mkDerivation rec {
$app
'';
meta = with lib; {
meta = {
description = "Constructive Solid Geometry library";
mainProgram = "opencsgexample";
homepage = "http://www.opencsg.org/";
platforms = platforms.unix;
maintainers = [ maintainers.raskin ];
license = licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.raskin ];
license = lib.licenses.gpl2Plus;
};
}
})
pkgs/development/lua-modules/lux-lua.nix
+4 -4
View File
@@ -20,14 +20,14 @@ in
rustPlatform.buildRustPackage rec {
pname = "lux-lua";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "nvim-neorocks";
repo = "lux";
# NOTE: Lux's tags represent the lux-cli version, which may differ from the lux-lua version
tag = "v0.5.0";
hash = "sha256-maVnRaEuB8q7wUukDGwB4d+go+oerkoWsnb5swPagMY=";
tag = "v0.5.3";
hash = "sha256-iiXPLm05HsenB6I8aLiFjRMkziQ0khlSWvvskvVwuDA=";
};
buildAndTestSubdir = "lux-lua";
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ luaFeature ];
useFetchCargoVendor = true;
cargoHash = "sha256-CWPHE+j6RDtVrnYzakKecIM5dXuHuWaWK+T9xFEdmz8=";
cargoHash = "sha256-S3dcjFDVwvdUFpRjHhJRPjEluRxWi+XSxN5mj1WP26A=";
nativeBuildInputs = [
pkg-config
pkgs/development/python-modules/granian/default.nix
+3 -3
View File
@@ -19,19 +19,19 @@
buildPythonPackage rec {
pname = "granian";
version = "2.2.5";
version = "2.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "emmett-framework";
repo = "granian";
tag = "v${version}";
hash = "sha256-fToH8sKh0M75D9YuyqkMEqY+cQio1NUmYdk/TEGy3fk=";
hash = "sha256-LDO5lyEk9ZJOfccVNYU6mIGJV952Z7NgMweQWclxQ9o=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-ThH4sk3yLvR9bklosUhCbklkcbpLW/5I1ukBNxUyqr8=";
hash = "sha256-NYOORW3OQXSqmDMsFWjNl6UmN1RO/hAz+nuLfm/y6Uk=";
};
nativeBuildInputs = with rustPlatform; [
pkgs/development/python-modules/meep/default.nix
+2 -2
View File
@@ -36,13 +36,13 @@ assert !lapack.isILP64;
buildPythonPackage rec {
pname = "meep";
version = "1.30.0";
version = "1.30.1";
src = fetchFromGitHub {
owner = "NanoComp";
repo = "meep";
tag = "v${version}";
hash = "sha256-9cQHvwUAeop5dRMVvedph+KQvTcmnkHdfqPQlSY280c=";
hash = "sha256-rXmOCkWm8SymhLiKNskSiS2bsHCmTlKMfLg5u3XniOk=";
};
format = "other";
pkgs/development/python-modules/primecountpy/default.nix
+2 -2
View File
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "primecountpy";
version = "0.1.0";
version = "0.1.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676";
sha256 = "sha256-yFYYF8C+hu7/xBuXtu9hfXlfcs895Z2SNNHIPX5CQDA=";
};
buildInputs = [ primecount ];
pkgs/development/python-modules/pycrdt/Cargo.lock
Generated
+3 -3
View File
@@ -245,7 +245,7 @@ dependencies = [
[[package]]
name = "pycrdt"
version = "0.12.18"
version = "0.12.20"
dependencies = [
"pyo3",
"yrs",
@@ -568,9 +568,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "yrs"
version = "0.23.2"
version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38f76003877bef9c609585bad08e81438161c472c15d5e8116c8f87648866c6b"
checksum = "bb1d740a98b12112352f05ddfc06c1505b66fca116601f9388b84be45d21f84d"
dependencies = [
"arc-swap",
"async-lock",
pkgs/development/python-modules/pycrdt/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pycrdt";
version = "0.12.18";
version = "0.12.20";
pyproject = true;
src = fetchFromGitHub {
owner = "y-crdt";
repo = "pycrdt";
tag = version;
hash = "sha256-pqGzAOoCJy+7cTtQD6FeFDicg6S0X2M+DM/x6Id28ac=";
hash = "sha256-kSwmQf46c5UJD75cfJxR3EfxFXExHhLXB+xdExr4lCk=";
};
postPatch = ''
pkgs/development/python-modules/python-unshare/default.nix
-28
View File
@@ -1,28 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
}:
buildPythonPackage {
pname = "python-unshare";
# pypi version doesn't support Python 3 and the package didn't update for a long time:
# https://github.com/TheTincho/python-unshare/pull/8
version = "unstable-2018-05-20";
format = "setuptools";
src = fetchFromGitHub {
owner = "TheTincho";
repo = "python-unshare";
rev = "4e98c177bdeb24c5dcfcd66c457845a776bbb75c";
sha256 = "1h9biinhy5m7r2cj4abhvsg2hb6xjny3n2dxnj1336zpa082ys3h";
};
meta = with lib; {
description = "Python bindings for the Linux unshare() syscall";
homepage = "https://github.com/thetincho/python-unshare";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}
pkgs/development/python-modules/svg2tikz/default.nix
+7 -9
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
poetry-core,
inkex,
@@ -11,9 +10,7 @@
buildPythonPackage rec {
pname = "svg2tikz";
version = "3.3.0";
disabled = pythonOlder "3.7";
version = "3.3.1";
pyproject = true;
@@ -21,7 +18,7 @@ buildPythonPackage rec {
owner = "xyz2tex";
repo = "svg2tikz";
tag = "v${version}";
hash = "sha256-IIsgyDZkNoKjXt1jyCdBkaT5EWTdS6AmJ4evwbw0fdg=";
hash = "sha256-LG8u23pEovF05ApjyxA6AebEjmVtxPxpTp9f2DwkwpM=";
};
build-system = [
@@ -34,6 +31,7 @@ buildPythonPackage rec {
];
pythonRelaxDeps = [
"inkex"
"lxml"
];
@@ -41,12 +39,12 @@ buildPythonPackage rec {
pythonImportsCheck = [ "svg2tikz" ];
meta = with lib; {
changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/CHANGELOG.md";
meta = {
changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.tag}/CHANGELOG.md";
homepage = "https://github.com/xyz2tex/svg2tikz";
description = "Set of tools for converting SVG graphics to TikZ/PGF code";
license = licenses.gpl2Plus;
maintainers = with maintainers; [
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
dotlambda
gal_bolle
];
pkgs/development/python-modules/tlds/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "tlds";
version = "2025043000";
version = "2025051700";
pyproject = true;
src = fetchFromGitHub {
owner = "kichik";
repo = "tlds";
tag = version;
hash = "sha256-yyDnQMQmZAlHvrWgxSi47E26fJ74FI4COwv1NOLvOL0=";
hash = "sha256-AqVe9U/gLjXkmLls4+t04youpY7DtrbmlaHVUdAElMo=";
};
nativeBuildInputs = [ setuptools ];
pkgs/servers/adguardhome/bins.nix
-31
View File
@@ -1,31 +0,0 @@
{ fetchurl, fetchzip }:
{
x86_64-darwin = fetchzip {
sha256 = "sha256-/xwRH9+qJQ91z2alo2sBdnLs2Z2wXUMHqJvxagptx5U=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_darwin_amd64.zip";
};
aarch64-darwin = fetchzip {
sha256 = "sha256-60uD8dH4Dqbey21HGx/PIzWBcN/00V1/oS1ubrucayY=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_darwin_arm64.zip";
};
i686-linux = fetchurl {
sha256 = "sha256-RJeU+n46IMncX5MXDedw/7DSe6pISsTJEyfI5B1pEcY=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_386.tar.gz";
};
x86_64-linux = fetchurl {
sha256 = "sha256-jZV/U4DUw70J1xmZLM5+gqAgpUP7fdyw46Neq8fQxT0=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_amd64.tar.gz";
};
aarch64-linux = fetchurl {
sha256 = "sha256-TtD8KR92Mv3Z3nCz4xIT+FcuxwqgDTq3C1lGIELrEQU=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_arm64.tar.gz";
};
armv6l-linux = fetchurl {
sha256 = "sha256-MosFBi72sgdZshUzAxi/ht56VpeHMguRQawU3DI5Va8=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_armv6.tar.gz";
};
armv7l-linux = fetchurl {
sha256 = "sha256-7YFzd6z9eCGBHlyYgDiwE+cpQzEuQIHDYfbCopapYrw=";
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_armv7.tar.gz";
};
}
pkgs/servers/adguardhome/default.nix
+30 -15
View File
@@ -1,23 +1,39 @@
{
lib,
stdenv,
fetchurl,
fetchzip,
fetchFromGitHub,
buildGoModule,
buildNpmPackage,
nixosTests,
}:
let
inherit (stdenv.hostPlatform) system;
sources = import ./bins.nix { inherit fetchurl fetchzip; };
in
stdenv.mkDerivation rec {
buildGoModule rec {
pname = "adguardhome";
version = "0.107.61";
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "AdGuardHome";
tag = "v${version}";
hash = "sha256-nKN1yr0HxUrjFD/9e87pxNqbQkNFlreJI2OHEQkbW2Q=";
};
installPhase = ''
install -m755 -D ./AdGuardHome $out/bin/adguardhome
vendorHash = "sha256-odUfgLTSBLnzN1wsl7TOftGn7OmdbACO/83ukZ8PUaQ=";
dashboard = buildNpmPackage {
inherit src;
name = "dashboard";
postPatch = ''
cd client
'';
npmDepsHash = "sha256-s7TJvGyk05HkAOgjYmozvIQ3l2zYUhWrGRJrWdp9ZJQ=";
npmBuildScript = "build-prod";
postBuild = ''
mkdir -p $out/build/
cp -r ../build/static/ $out/build/
'';
};
preBuild = ''
cp -r ${dashboard}/build/static build
'';
passthru = {
@@ -29,14 +45,13 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/AdguardTeam/AdGuardHome";
description = "Network-wide ads & trackers blocking DNS server";
platforms = builtins.attrNames sources;
maintainers = with maintainers; [
numkem
iagoq
rhoriguchi
baksa
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.gpl3Only;
mainProgram = "adguardhome";
mainProgram = "AdGuardHome";
};
}
pkgs/servers/adguardhome/update.sh
+1 -26
View File
@@ -6,7 +6,6 @@
set -euo pipefail
dirname="$(dirname "$0")"
bins="$dirname/bins.nix"
latest_release=$(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest)
version=$(jq -r '.tag_name' <<<"$latest_release")
@@ -18,30 +17,6 @@ schema_version=$(curl --silent "https://raw.githubusercontent.com/AdguardTeam/Ad
echo "got schema_version $schema_version"
declare -A systems
systems[linux_386]=i686-linux
systems[linux_amd64]=x86_64-linux
systems[linux_arm64]=aarch64-linux
systems[linux_armv6]=armv6l-linux
systems[linux_armv7]=armv7l-linux
systems[darwin_amd64]=x86_64-darwin
systems[darwin_arm64]=aarch64-darwin
nix-update --subpackage dashboard adguardhome --version $version
echo '{ fetchurl, fetchzip }:' > "$bins"
echo '{' >> "$bins"
for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do
url="$(jq -r '.browser_download_url' <<< "$asset")"
adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64|armv6|armv7)' <<< "$url" || true)"
if [ -n "$adg_system" ]; then
fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)"
nix_system=${systems[$adg_system]}
nix_src="$(nix-prefetch --option extra-experimental-features flakes -s --output nix $fetch --url $url)"
echo "$nix_system = $fetch $nix_src;" >> $bins
fi
done
echo '}' >> "$bins"
sed -i -r -e "s/version\s*?=\s*?.*?;/version = \"${version#v}\";/" "$dirname/default.nix"
sed -i -r -e "s/schema_version\s*?=\s*?.*?;/schema_version = ${schema_version};/" "$dirname/default.nix"
pkgs/servers/irc/solanum/default.nix
+3 -3
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation {
pname = "solanum";
version = "0-unstable-2025-05-11";
version = "0-unstable-2025-05-21";
src = fetchFromGitHub {
owner = "solanum-ircd";
repo = "solanum";
rev = "b3d3796e690ce2482c1365d99e3329d5587b75d5";
hash = "sha256-hRiBcX2KDAdtx4G3jJyQlLvhfUutHoy85Upni1RfOHY=";
rev = "6ac284622813f4f64fa8e0bf905c4b35d244b343";
hash = "sha256-rUdxAjH1cvfCYQmt3DKWbxL4bctjhSn4pMl1TzLdL6g=";
};
patches = [
pkgs/servers/radarr/default.nix
+5 -5
View File
@@ -27,17 +27,17 @@ let
hash =
{
x64-linux_hash = "sha256-/EeFQdhkPkebyaE2MLpVp1/9rHiEpVDWBWiX2H8xyDg=";
arm64-linux_hash = "sha256-VG1oiyYRzfeLoz2mbDbTE29MKvPtjvrZKANb1Hw1VFw=";
x64-osx_hash = "sha256-Ss3GtQtEW3QP4PHTo+Q6+LyIxA8Bd7fkV8NfMiYtE0k=";
arm64-osx_hash = "sha256-9/gTN4EcQYKcDo0SZiRQHuOFqC3M3iBLFV7XPO7XKbw=";
x64-linux_hash = "sha256-cXAOXQE6eBFgJMw/Tai1/bxWon1fuh7guYUdQ+pmIMA=";
arm64-linux_hash = "sha256-ogWUNXtgmoUOxhQNE15+stddyurCPCeCb+OdHEdCZE4=";
x64-osx_hash = "sha256-+0UevL2jgkv0lLcRP7qJO3HrYfgNCWEPcwlGlSRPWA8=";
arm64-osx_hash = "sha256-nhUno+3a76n+gRy7hulfA0qYQ5Bh7dXOX5CcZd+kWPY=";
}
."${arch}-${os}_hash";
in
stdenv.mkDerivation rec {
pname = "radarr";
version = "5.21.1.9799";
version = "5.24.1.10017";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";
pkgs/tools/system/netdata/default.nix
+2 -2
View File
@@ -57,14 +57,14 @@
withML ? true,
}:
stdenv.mkDerivation (finalAttrs: {
version = "2.5.1";
version = "2.5.2";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${finalAttrs.version}";
hash = "sha256-77k93mg7iED53k38jATbS2Y1N0eLKhjo0RYyinApkuE=";
hash = "sha256-QsExU7/fdDHekNa+7WnWGiAKAsR1mqyJU34OXA1vB7c=";
fetchSubmodules = true;
};

Some files were not shown because too many files have changed in this diff Show More