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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-12-13 18:04:38 +00:00
committed by GitHub
parent c1c8e963dc 541e1aacbf
commit 96dd0fdefd
81 changed files with 638 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -11865,6 +11865,12 @@
githubId = 148352;
name = "Jim Fowler";
};
Kitt3120 = {
email = "nixpkgs@schweren.dev";
github = "Kitt3120";
githubId = 10689811;
name = "Torben Schweren";
};
kittywitch = {
email = "kat@inskip.me";
github = "kittywitch";
nixos/modules/hardware/inputmodule.nix
+15
View File
@@ -0,0 +1,15 @@
{
config,
lib,
pkgs,
...
}:
{
options.hardware.inputmodule.enable = lib.mkEnableOption ''Support for Framework input modules'';
config = lib.mkIf config.hardware.inputmodule.enable {
environment.systemPackages = [ pkgs.inputmodule-control ];
services.udev.packages = [ pkgs.inputmodule-control ];
};
}
nixos/modules/module-list.nix
+1
View File
@@ -71,6 +71,7 @@
./hardware/hackrf.nix
./hardware/i2c.nix
./hardware/infiniband.nix
./hardware/inputmodule.nix
./hardware/keyboard/qmk.nix
./hardware/keyboard/teck.nix
./hardware/keyboard/uhk.nix
pkgs/applications/audio/spotify-qt/default.nix
+20 -11
View File
@@ -1,38 +1,47 @@
{
stdenvNoCC,
stdenv,
fetchFromGitHub,
lib,
cmake,
mkDerivation,
libxcb,
qtbase,
qtsvg,
wrapQtAppsHook,
procps,
}:
mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "spotify-qt";
version = "3.11";
version = "3.12";
src = fetchFromGitHub {
owner = "kraxarn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Dm+ELHtYZGSzJSrERtvpuuV5cVZ9ah9WQ0iTTJqGqVg=";
repo = "spotify-qt";
rev = "v${finalAttrs.version}";
hash = "sha256-j9g2fq12gsue0pc/fLoCAtDlwwlbCVJ65kxPiTJTqvk=";
};
postPatch = ''
substituteInPlace src/spotifyclient/helper.cpp \
--replace-fail /usr/bin/ps ${lib.getExe' procps "ps"}
'';
buildInputs = [
libxcb
qtbase
qtsvg
];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=" ];
cmakeFlags = [ (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "") ];
installFlags = [ "DESTDIR=$(out)" ];
postInstall = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
mv $out/bin/spotify-qt.app $out/Applications
ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt
@@ -46,4 +55,4 @@ mkDerivation rec {
maintainers = with maintainers; [ iivusly ];
platforms = platforms.unix;
};
}
})
pkgs/applications/misc/adobe-reader/builder.sh
-43
View File
@@ -1,43 +0,0 @@
if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
source $stdenv/setup
echo "unpacking $src..."
tar xvfa $src
echo "unpacking reader..."
p=$out/libexec/adobe-reader
mkdir -p $out/libexec
tar xvf AdobeReader/COMMON.TAR -C $out
tar xvf AdobeReader/ILINXR.TAR -C $out
mv $out/Adobe/Reader9 $p
rmdir $out/Adobe
# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
rm $p/Reader/intellinux/plug_ins/PPKLite.api
# More pointless files.
rm $p/bin/UNINSTALL
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $libPath \
$p/Reader/intellinux/bin/acroread
# The "xargs -r" is to shut up a warning when Mozilla can't be found.
substituteInPlace $p/bin/acroread \
--replace /bin/pwd $(type -P pwd) \
--replace /bin/ls $(type -P ls) \
--replace xargs "xargs -r"
mkdir -p $out/bin
ln -s $p/bin/acroread $out/bin/acroread
mkdir -p $out/share/applications
mv $p/Resource/Support/AdobeReader.desktop $out/share/applications/
icon=$p/Resource/Icons/128x128/AdobeReader9.png
[ -e $icon ]
sed -i $out/share/applications/AdobeReader.desktop \
-e "s|Icon=.*|Icon=$icon|"
# Not sure if this works.
mkdir -p $out/share/mimelnk/application
mv $p/Resource/Support/vnd*.desktop $out/share/mimelnk/application
pkgs/applications/misc/adobe-reader/default.nix
+44 -3
View File
@@ -18,9 +18,6 @@ stdenv.mkDerivation rec {
pname = "adobe-reader";
version = "9.5.5";
# TODO: convert to phases
builder = ./builder.sh;
src = fetchurl {
url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2";
sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf";
@@ -42,6 +39,48 @@ stdenv.mkDerivation rec {
gdk-pixbuf-xlib
];
installPhase = ''
p=$out/libexec/adobe-reader
mkdir -p $out/libexec
tar xvf COMMON.TAR -C $out
tar xvf ILINXR.TAR -C $out
mv $out/Adobe/Reader9 $p
rmdir $out/Adobe
# Disable this plugin for now (it needs LDAP).
rm $p/Reader/intellinux/plug_ins/PPKLite.api
# Remove unneeded files
rm $p/bin/UNINSTALL
'';
postFixup = ''
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $libPath \
$p/Reader/intellinux/bin/acroread
# The "xargs -r" is to shut up a warning when Mozilla can't be found.
substituteInPlace $p/bin/acroread \
--replace-fail /bin/pwd $(type -P pwd) \
--replace-fail /bin/ls $(type -P ls) \
--replace-fail xargs "xargs -r"
mkdir -p $out/bin
ln -s $p/bin/acroread $out/bin/acroread
mkdir -p $out/share/applications
mv $p/Resource/Support/AdobeReader.desktop $out/share/applications/
icon=$p/Resource/Icons/128x128/AdobeReader9.png
[ -e $icon ]
sed -i $out/share/applications/AdobeReader.desktop \
-e "s|Icon=.*|Icon=$icon|"
mkdir -p $out/share/mimelnk/application
mv $p/Resource/Support/vnd*.desktop $out/share/mimelnk/application
'';
dontStrip = true;
passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
meta = {
@@ -54,5 +93,7 @@ stdenv.mkDerivation rec {
"See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"
];
platforms = [ "i686-linux" ];
maintainers = with lib.maintainers; [ onny ];
mainProgram = "acroread";
};
}
pkgs/applications/misc/organicmaps/default.nix
+2 -2
View File
@@ -31,13 +31,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "organicmaps";
version = "2024.11.12-7";
version = "2024.11.27-12";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
hash = "sha256-uA0KB9HGI0hXoD5YVOfWg3WblpGvWhgpnCVHWfLkrhs=";
hash = "sha256-lBEDPqxdnaajMHlf7G/d1TYYL9yPZo8AGekoKmF1ObM=";
fetchSubmodules = true;
};
pkgs/applications/networking/browsers/firefox/wrapper.nix
+9
View File
@@ -52,6 +52,7 @@ let
, extraPoliciesFiles ? []
, libName ? browser.libName or applicationName # Important for tor package or the like
, nixExtensions ? null
, hasMozSystemDirPatch ? (lib.hasPrefix "firefox" pname && !lib.hasSuffix "-bin" pname)
}:
let
@@ -320,12 +321,18 @@ let
${lib.optionalString (!xdg-utils.meta.broken) "--suffix PATH ':' \"${xdg-utils}/bin\""} \
--suffix PATH ':' "$out/bin" \
--set MOZ_APP_LAUNCHER "${launcherName}" \
'' + lib.optionalString hasMozSystemDirPatch ''
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
'' + ''
--set MOZ_LEGACY_PROFILES 1 \
--set MOZ_ALLOW_DOWNGRADE 1 \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \
--set-default MOZ_ENABLE_WAYLAND 1 \
'' + lib.optionalString (!hasMozSystemDirPatch) ''
${lib.optionalString (allNativeMessagingHosts != []) "--run \"mkdir -p \\\${MOZ_HOME:-~/.mozilla}/native-messaging-hosts\""} \
${lib.concatMapStringsSep " " (ext: "--run \"ln -sfLt \\\${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*\"") allNativeMessagingHosts} \
'' + ''
"''${oldWrapperArgs[@]}"
#############################
# #
@@ -348,10 +355,12 @@ let
install -D -t $out/share/applications $desktopItem/share/applications/*
'' + lib.optionalString hasMozSystemDirPatch ''
mkdir -p $out/lib/mozilla/native-messaging-hosts
for ext in ${toString allNativeMessagingHosts}; do
ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*
done
'' + ''
mkdir -p $out/lib/mozilla/pkcs11-modules
for ext in ${toString pkcs11Modules}; do
pkgs/applications/networking/cluster/helmfile/default.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.169.1";
version = "0.169.2";
src = fetchFromGitHub {
owner = "helmfile";
repo = "helmfile";
rev = "v${version}";
hash = "sha256-0tkUmLItw8VYApCVRwfzn4LN4kYcbQKDQd2QSafap1A=";
hash = "sha256-OoCLFhGeciCUC7Tb6+Md8tmamc/j0AeSlu5Krmkhxyc=";
};
vendorHash = "sha256-zWgza1eiO4UF/RL2Z4R4bvO+tgcN1KT8nBZor/plY+A=";
vendorHash = "sha256-VBgWnDi0jaZ+91kkYeX9QyNBrP9W+mSMjexwzZiKZWs=";
proxyVendor = true; # darwin/linux hash mismatch
pkgs/applications/networking/cluster/terraform-providers/providers.json
+14 -14
View File
@@ -390,11 +390,11 @@
"vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM="
},
"doppler": {
"hash": "sha256-pqZKqy08PnXfm88eYzDIYqC4rnwUPehfRVMcSX0gaqc=",
"hash": "sha256-UHEBjo8UR2hQyJ+O7t46vyf0Zy0tfA7D7auGzxPKOpw=",
"homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler",
"owner": "DopplerHQ",
"repo": "terraform-provider-doppler",
"rev": "v1.12.0",
"rev": "v1.13.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So="
},
@@ -678,13 +678,13 @@
"vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs="
},
"kafka": {
"hash": "sha256-CIA+0BMVPOpsB83QD6QEVOhohzeEFjFYTQ5UE+9MMIY=",
"hash": "sha256-cY0B1kGjlak3REHi4k/sxyPdawX4gGJFtJMJkJgU/hI=",
"homepage": "https://registry.terraform.io/providers/Mongey/kafka",
"owner": "Mongey",
"repo": "terraform-provider-kafka",
"rev": "v0.8.1",
"rev": "v0.8.3",
"spdx": "MIT",
"vendorHash": "sha256-wfN5tgW/Pqm6PqHLnuON4SQwd7U6DFj7e8HiTSrTGbo="
"vendorHash": "sha256-DnE9tA8VYgtzJWN8j3IOsQs1SiA3NX1mDQzp/Fpqh/U="
},
"kafka-connect": {
"hash": "sha256-3EUTte3txaDRz3jh0h23+Bf1tdLeCvPN9x8mYWY5VjI=",
@@ -1264,13 +1264,13 @@
"vendorHash": null
},
"tfe": {
"hash": "sha256-gCgbov6Psb884CJjYBIQM0180gwEQIt3yjXlZpgODao=",
"hash": "sha256-cg/g/RM4e+0Afhm22sj18qgHUvei2b0ZZtjWBKKDUAM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp",
"repo": "terraform-provider-tfe",
"rev": "v0.60.1",
"rev": "v0.61.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-8k2t5oUBzA9qMtmkJiq4wNpKpUT+Y83vx/TiUDs+B68="
"vendorHash": "sha256-zDL3MOsOzMFh894xeqt+CIvKlQxDm3JLXsy2IK4ZMlE="
},
"thunder": {
"hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=",
@@ -1346,13 +1346,13 @@
"vendorHash": "sha256-tg1LBq8K8loMkPUXPMEi9Y4Epg0ZfpaYADfWLaZ2k3U="
},
"vcd": {
"hash": "sha256-lWpJb2Dsx2wljQEignrbudFP/K2X8IfkY0IHLnO/Gtw=",
"hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=",
"homepage": "https://registry.terraform.io/providers/vmware/vcd",
"owner": "vmware",
"repo": "terraform-provider-vcd",
"rev": "v3.14.0",
"rev": "v3.14.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xR0PkeeUjt49KlB7+zIJ2ELcTNS46pQnBrr76X5KneY="
"vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
},
"venafi": {
"hash": "sha256-9Nn2dFF9W8STQoRXFNiXYCrHEWiirNvOAAS1f1brutw=",
@@ -1427,12 +1427,12 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
"hash": "sha256-prXoM9pZDbuWs99y7kXyv+D6pUghzbM6kbbl6L4tXT8=",
"hash": "sha256-aD5IcD4IDjB0+9cUJEUR9pRtWkLdzk4XVA8sTsBGx30=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.133.0",
"rev": "v0.134.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Dl9h+6gVpCg6hwhC348LKjCK88BQk/rZR2I4yujrZFk="
"vendorHash": "sha256-zQ6iofCmWfeDhRPtlXCuE63dKpA832jX5AEtUssmA7g="
}
}
pkgs/applications/networking/instant-messengers/discord/default.nix
+8 -8
View File
@@ -11,15 +11,15 @@ let
{
stable = "0.0.77";
ptb = "0.0.121";
canary = "0.0.538";
development = "0.0.53";
canary = "0.0.541";
development = "0.0.54";
}
else
{
stable = "0.0.329";
ptb = "0.0.151";
canary = "0.0.650";
development = "0.0.67";
canary = "0.0.653";
development = "0.0.68";
};
version = versions.${branch};
srcs = rec {
@@ -34,11 +34,11 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-RYwHDoPj0TsraI/7dNpngCiB6Fiyhi5ec/iCZD7YMoQ=";
hash = "sha256-upT12C23Vkm+BZycKAufRzM5YHizpZJtEaJjHGzYtv4=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-4FxdZsVTQTr5yzuzV6IZYZ6qk7sa9WZ27zCtVA1/uOg=";
hash = "sha256-3Qhysb7QFE7W4nqAHffgz9hbud6n6PGcGN6xGBmD6ow=";
};
};
x86_64-darwin = {
@@ -52,11 +52,11 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-QFeUeuJMZ9r7lqFhE51jQfpSw5v4+MgUoO2HEcKF4mI=";
hash = "sha256-uBnVz+d5Mp3fjICQQ/SZgFmkXVQGprf7VvUxv0hy00o=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
hash = "sha256-nyOQhSjlARvIjFc3uDi7IFtKxxIpO/V6M1eIg56dMdU=";
hash = "sha256-5sUkGN9ucyYArGkfbGBdJokoqpHKBrkwxH055LpMlrs=";
};
};
aarch64-darwin = x86_64-darwin;
pkgs/applications/office/treesheets/default.nix
+3 -3
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "0-unstable-2024-11-24";
version = "0-unstable-2024-12-11";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "4b27fa43bbd5db0c2a5db2a942002f71d6fdc752";
hash = "sha256-uKFh4sdcp6CsgJQrX6H9NQhPvOQ3U2PeS+xyDTqwkvo=";
rev = "81e74a0f3f325ada0abe35211e90b74132f91470";
hash = "sha256-6Ao1dl0tRLAZZxx0xV7uaojuCO9i3bUIdccsZ37Jm/g=";
};
nativeBuildInputs = [
pkgs/applications/science/machine-learning/openbugs/default.nix
+12 -7
View File
@@ -1,22 +1,27 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "OpenBUGS";
version = "3.2.3";
src = fetchurl {
url = "https://www.mrc-bsu.cam.ac.uk/wp-content/uploads/2018/04/${pname}-${version}.tar.gz";
sha256 = "sha256-oonE2gxKw3H4ATImyF69Cp4d7F3puFiVDkhUy4FLTtg=";
outputs = [ "out" ];
src = fetchFromGitHub {
owner = "jsta";
repo = "openbugs";
rev = "cd921342ba13ee89ee60f9aebd2e96c42bd59ae3";
sha256 = "sha256-11LrScN1kvtq0Fo7RWGjbQO0U5b5brCbipl5pdZnrFs=";
};
meta = with lib; {
description = "Open source program for Bayesian modelling based on MCMC";
description = "Software package for performing Bayesian analysis and simulation using Markov Chain Monte Carlo";
homepage = "https://www.mrc-bsu.cam.ac.uk/software/bugs/openbugs/";
maintainers = with maintainers; [ andresnav ];
changelog = "https://github.com/jsta/openbugs/blob/master/ChangeLog";
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl3Only;
platforms = [ "i686-linux" ];
maintainers = with maintainers; [ andresnav ];
};
}
pkgs/build-support/docker/nix-prefetch-docker
+3 -1
View File
@@ -121,7 +121,9 @@ fi
sourceUrl="docker://$imageName@$imageDigest"
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/skopeo-copy-tmp-XXXXXXXX")"
# nix>=2.20 rejects adding symlinked paths to the store, so use realpath
# to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
tmpPath="$(realpath "$(mktemp -d --tmpdir skopeo-copy-tmp-XXXXXXXX)")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)"
pkgs/build-support/docker/nix-prefetch-docker.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, makeWrapper, nix, skopeo, jq }:
{ lib, stdenv, makeWrapper, nix, skopeo, jq, coreutils }:
stdenv.mkDerivation {
name = "nix-prefetch-docker";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
installPhase = ''
install -vD ${./nix-prefetch-docker} $out/bin/$name;
wrapProgram $out/bin/$name \
--prefix PATH : ${lib.makeBinPath [ nix skopeo jq ]} \
--prefix PATH : ${lib.makeBinPath [ nix skopeo jq coreutils ]} \
--set HOME /homeless-shelter
'';
pkgs/build-support/fetchbzr/nix-prefetch-bzr
+3 -1
View File
@@ -42,7 +42,9 @@ fi
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/bzr-checkout-tmp-XXXXXXXX")"
# nix>=2.20 rejects adding symlinked paths to the store, so use realpath
# to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
tmpPath="$(realpath "$(mktemp -d --tmpdir bzr-checkout-tmp-XXXXXXXX)")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/$dstFile"
pkgs/build-support/fetchcvs/nix-prefetch-cvs
+3 -1
View File
@@ -20,7 +20,9 @@ fi
mkTempDir() {
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")"
# nix>=2.20 rejects adding symlinked paths to the store, so use realpath
# to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
tmpPath="$(realpath "$(mktemp -d --tmpdir nix-prefetch-csv-XXXXXXXX)")"
trap removeTempDir EXIT
}
pkgs/build-support/fetchgit/nix-prefetch-git
+3 -2
View File
@@ -453,8 +453,9 @@ else
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
# nix>=2.20 rejects adding symlinked paths to the store, so use realpath
# to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
tmpPath="$(realpath "$(mktemp -d --tmpdir git-checkout-tmp-XXXXXXXX)")"
exit_handlers+=(remove_tmpPath)
tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
pkgs/build-support/fetchhg/nix-prefetch-hg
+3 -2
View File
@@ -42,8 +42,9 @@ fi
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if [[ -z "$finalPath" ]]; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
# nix>=2.20 rejects adding symlinked paths to the store, so use realpath
# to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
tmpPath="$(realpath "$(mktemp -d --tmpdir hg-checkout-tmp-XXXXXXXX)")"
cleanup() { x=$?; rm -rf "$tmpPath"; exit $x; }; trap cleanup EXIT
tmpArchive="$tmpPath/hg-archive"
pkgs/build-support/fetchsvn/nix-prefetch-svn
+3 -1
View File
@@ -41,7 +41,9 @@ fi
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/svn-checkout-tmp-XXXXXXXX")"
# nix>=2.20 rejects adding symlinked paths to the store, so use realpath
# to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
tmpPath="$(realpath "$(mktemp -d --tmpdir svn-checkout-tmp-XXXXXXXX)")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/$dstFile"
pkgs/build-support/writers/scripts.nix
+129
View File
@@ -613,6 +613,135 @@ rec {
*/
writeBabashkaBin = name: writeBabashka "/bin/${name}";
/**
`writeGuile` returns a derivation that creates an executable Guile script.
# Inputs
`nameOrPath` (String)
: Name of or path to the script. The semantics is the same as that of
`makeScriptWriter`.
`config` (AttrSet)
: `guile` (Optional, Derivation, Default: `pkgs.guile`)
: Guile package used for the script.
: `libraries` (Optional, [ Derivation ], Default: [])
: Extra Guile libraries exposed to the script.
: `r6rs` and `r7rs` (Optional, Boolean, Default: false)
: Whether to adapt Guile’s initial environment to better support R6RS/
R7RS. See the [Guile Reference Manual](https://www.gnu.org/software/guile/manual/html_node/index.html)
for details.
: `srfi` (Optional, [ Int ], Default: [])
: SRFI module to be loaded into the interpreter before evaluating a
script file or starting the REPL. See the Guile Reference Manual to
know which SRFI are supported.
: Other attributes are directly passed to `makeScriptWriter`.
`content` (String)
: Content of the script.
# Examples
:::{.example}
## `pkgs.writers.writeGuile` with default config
```nix
writeGuile "guile-script" { }
''
(display "Hello, world!")
''
```
:::
:::{.example}
## `pkgs.writers.writeGuile` with SRFI-1 enabled and extra libraries
```nix
writeGuile "guile-script" {
libraries = [ pkgs.guile-semver ];
srfi = [ 1 ];
}
''
(use-modules (semver))
(make-semver 1 (third '(2 3 4)) 5) ; => #<semver 1.4.5>
''
```
:::
*/
writeGuile =
nameOrPath:
{
guile ? pkgs.guile,
libraries ? [ ],
r6rs ? false,
r7rs ? false,
srfi ? [ ],
...
}@config:
content:
assert builtins.all builtins.isInt srfi;
let
finalGuile = pkgs.buildEnv {
name = "guile-env";
paths = [ guile ] ++ libraries;
passthru = {
inherit (guile) siteDir siteCcacheDir;
};
meta.mainProgram = guile.meta.mainProgram or "guile";
};
in
makeScriptWriter
(
(builtins.removeAttrs config [
"guile"
"libraries"
"r6rs"
"r7rs"
"srfi"
])
// {
interpreter = "${lib.getExe finalGuile} \\";
makeWrapperArgs = [
"--set"
"GUILE_LOAD_PATH"
"${finalGuile}/${finalGuile.siteDir}:${finalGuile}/lib/scheme-libs"
"--set"
"GUILE_LOAD_COMPILED_PATH"
"${finalGuile}/${finalGuile.siteCcacheDir}:${finalGuile}/lib/libobj"
"--set"
"LD_LIBRARY_PATH"
"${finalGuile}/lib/ffi"
"--set"
"DYLD_LIBRARY_PATH"
"${finalGuile}/lib/ffi"
];
}
)
nameOrPath
/*
Spaces, newlines and tabs are significant for the "meta switch" of Guile, so
certain complication must be made to ensure correctness.
*/
(
lib.concatStringsSep "\n" [
(lib.concatStringsSep " " (
[ "--no-auto-compile" ]
++ lib.optional r6rs "--r6rs"
++ lib.optional r7rs "--r7rs"
++ lib.optional (srfi != [ ]) ("--use-srfi=" + concatMapStringsSep "," builtins.toString srfi)
++ [ "-s" ]
))
"!#"
content
]
);
/**
writeGuileBin takes the same arguments as writeGuile but outputs a directory
(like writeScriptBin)
*/
writeGuileBin = name: writeGuile "/bin/${name}";
/**
writeHaskell takes a name, an attrset with libraries and haskell version (both optional)
and some haskell source code and returns an executable.
pkgs/build-support/writers/test.nix
+55
View File
@@ -1,6 +1,8 @@
{
haskellPackages,
lib,
guile-lib,
akkuPackages,
nodePackages,
perlPackages,
python3Packages,
@@ -26,6 +28,8 @@ let
writeFish
writeFishBin
writeFSharp
writeGuile
writeGuileBin
writeHaskell
writeHaskellBin
writeJS
@@ -109,6 +113,12 @@ recurseIntoAttrs {
''
);
guile = expectSuccessBin (
writeGuileBin "test-writers-guile-bin" { } ''
(display "success\n")
''
);
rust = expectSuccessBin (
writeRustBin "test-writers-rust-bin" { } ''
fn main(){
@@ -249,6 +259,51 @@ recurseIntoAttrs {
''
);
guile = expectSuccess (
writeGuile "test-writers-guile"
{
libraries = [ guile-lib ];
srfi = [ 1 ];
}
''
(use-modules (unit-test))
(assert-true (= (second '(1 2 3))
2))
(display "success\n")
''
);
guileR6RS = expectSuccess (
writeGuile "test-writers-guile-r6rs"
{
r6rs = true;
libraries = with akkuPackages; [ r6rs-slice ];
}
''
(import (rnrs base (6))
(rnrs io simple (6))
(slice))
(assert (equal? (slice '(1 2 3) 0 2)
'(1 2)))
(display "success\n")
''
);
guileR7RS = expectSuccess (
writeGuile "test-writers-guile-r7rs"
{
r7rs = true;
}
''
(import (scheme write)
(srfi 1))
(unless (= (second '(1 2 3))
2)
(error "The value should be 2."))
(display "success\n")
''
);
haskell = expectSuccess (
writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } ''
import Data.Default
pkgs/by-name/ar/argocd/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "argocd";
version = "2.13.1";
version = "2.13.2";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-0qL9CnEwEp7sJK7u6EKHVFY/hH8lTb182HZ3r+9nIyQ=";
hash = "sha256-G74chKEh/zXfImvmXAWIf+Ny7obJ+YiXpNVVs3uJRoU=";
};
proxyVendor = true; # darwin/linux hash mismatch
pkgs/by-name/aw/awscli2/package.nix
+2 -2
View File
@@ -62,14 +62,14 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "awscli2";
version = "2.19.0"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.22.13"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "refs/tags/${version}";
hash = "sha256-kHJXdqGRVA4C3EB1T9gQYoM6M8E/UYTTma1RqLZqH58=";
hash = "sha256-yrkGfD2EBPsNRLcafdJE4UnYsK7EAfIA7TLa6smmWjY=";
};
postPatch = ''
pkgs/by-name/bi/bitwarden-cli/package.nix
+14
View File
@@ -50,6 +50,20 @@ buildNpmPackage rec {
npmFlags = [ "--legacy-peer-deps" ];
postConfigure = ''
# we want to build everything from source
shopt -s globstar
rm -r node_modules/**/prebuilds
shopt -u globstar
'';
postBuild = ''
# remove build artifacts that bloat the closure
shopt -s globstar
rm -r node_modules/**/{*.target.mk,binding.Makefile,config.gypi,Makefile,Release/.deps}
shopt -u globstar
'';
passthru = {
tests = {
vaultwarden = nixosTests.vaultwarden.sqlite;
pkgs/by-name/ca/caligula/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "caligula";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitHub {
owner = "ifd3f";
repo = "caligula";
rev = "v${version}";
hash = "sha256-fi4W7Z32S30kzKNVEDbV8PRyTW9fZxumBGtLn8SkI5Y=";
hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw=";
};
cargoHash = "sha256-ma7JVbWSiKfkCXCDwA8DFm2+KPrWR+8nSdgGSqehNg8=";
cargoHash = "sha256-2/6RoDsVf+yI/X22hUV68U1VBrRkd5i9BsFMIMGnZXg=";
nativeBuildInputs = [
rustPlatform.bindgenHook
pkgs/by-name/ch/check-jsonschema/package.nix
+3 -3
View File
@@ -8,7 +8,7 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "check-jsonschema";
version = "0.29.4";
version = "0.30.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "python-jsonschema";
repo = "check-jsonschema";
rev = "refs/tags/${version}";
hash = "sha256-JSz8zwiOnX3nuKypffe0wZ7YoZ7uHH/lAoUgdKfkEO8=";
tag = version;
hash = "sha256-qaNSL7ZPEWJ8Zc/XPEWtUJYQnUJ7jNdla1I0d6+GReM=";
};
propagatedBuildInputs = [
pkgs/by-name/dd/ddns-go/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "ddns-go";
version = "6.7.6";
version = "6.7.7";
src = fetchFromGitHub {
owner = "jeessy2";
repo = pname;
rev = "v${version}";
hash = "sha256-loZ+xdYwlyaHamta/shX5+suG9IJxy57UIEZXrs531Y=";
hash = "sha256-MzhZ9u4noPLdtrbALi42GI9i+nb4rRdugMzd20rJ6b0=";
};
vendorHash = "sha256-IkwTi6szNf1Hh50z2jDZsJ2nncvJjnanCsQlrFELpc0=";
vendorHash = "sha256-e8/z1vriyHXPY1OvkGFqeZHJhz5ssOlqD/Uwt5xq8Uw=";
ldflags = [
"-X main.version=${version}"
pkgs/by-name/di/disko/package.nix
+2 -2
View File
@@ -12,12 +12,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "disko";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "disko";
rev = "v${finalAttrs.version}";
hash = "sha256-CI27qHAbc3/tIe8sb37kiHNaeCqGxNimckCMj0lW5kg=";
hash = "sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];
pkgs/by-name/dn/dnscontrol/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "4.14.3";
version = "4.15.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = "dnscontrol";
rev = "v${version}";
hash = "sha256-FDxNJ6pOigasulxtAAnvHfWHQ3Ji459IQScA4dld9KQ=";
hash = "sha256-Y0JRzdC0g/4iQ3YppbL4YTyifveb5ruCPQ0AIwi4gbw=";
};
vendorHash = "sha256-aqS5esDroGg83NJygX8tW8P0U4YCkll98KmAfya6lKM=";
vendorHash = "sha256-uC6h3D/L7zzfn/2NcInCaDFKW0+JRkMVJSNzE+hXClM=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/gi/gitea/package.nix
+3 -3
View File
@@ -35,18 +35,18 @@ let
in
buildGoModule rec {
pname = "gitea";
version = "1.22.5";
version = "1.22.6";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${gitea.version}";
hash = "sha256-fvSS2hZRtpZICZzk0qFXbpwUteVNARkWv7cUc/HlQl4=";
hash = "sha256-WQ8RAx4yW2dl1a/NXHF9fqAG6y62mXmB2lH8DFCg+nA=";
};
proxyVendor = true;
vendorHash = "sha256-GM+Je21D5PSFrY+UHgZQ9CqjwcA2iWj9W9sqdjA4ypo=";
vendorHash = "sha256-BR5PDhag557F4nLRoNJuwz+dlSjYgxzoKx/DIsXBPto=";
outputs = [
"out"
pkgs/by-name/go/goose/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
buildGoModule rec {
pname = "goose";
version = "3.23.0";
version = "3.23.1";
src = fetchFromGitHub {
owner = "pressly";
repo = pname;
rev = "v${version}";
hash = "sha256-xfCkhVUR/GXYQEpaAhaeBV6UfXMdHyzTn+mIJfuHjBA=";
hash = "sha256-/Zz6upxfEB/F5XPc+T0veiT7n1qfWdK3VirXARSPrWU=";
};
proxyVendor = true;
vendorHash = "sha256-kNe+qc1EIHqXRv0DAGfBK6XNahn/YNmz74mfWrG3+rc=";
vendorHash = "sha256-PgGMft5JzDyRsH4RLGZOzolJWkNGJOqcYY04/CWIn/Q=";
# skipping: end-to-end tests require a docker daemon
postPatch = ''
pkgs/by-name/go/gopls/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "gopls";
version = "0.16.2";
version = "0.17.0";
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "gopls/v${version}";
hash = "sha256-amy00VMUcmyjDoZ4d9/+YswfcZ+1/cGvFsA4sAmc1dA=";
hash = "sha256-SfW53MF7xd2ETaTjYUK8qI/vUVISIh5cXz2jRZxhhfk=";
};
modRoot = "gopls";
vendorHash = "sha256-ta94xPboFtSxFeuMtPX76XiC1O7osNl4oLk64wIyyz4=";
vendorHash = "sha256-mQFwjkXkSs3nJIqlRKTCg6PvtmVq891Netd9WrB0wfA=";
# https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
ldflags = [ "-X main.version=v${version}" ];
pkgs/by-name/go/govc/package.nix
+2 -2
View File
@@ -6,7 +6,7 @@
buildGoModule rec {
pname = "govc";
version = "0.46.2";
version = "0.46.3";
subPackages = [ "govc" ];
@@ -14,7 +14,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "vmware";
repo = "govmomi";
sha256 = "sha256-g93buOK2JqkI1PkU1ImoBfj+qf5fOks3ceevbif/Kcs=";
sha256 = "sha256-vwvhVC+Avi55uenlW68tWGREEHRZw8RUjgiC0r7BgQ4=";
};
vendorHash = "sha256-ddofXjBnyHRn7apS8hpM57S1oo+1w5i4n0Z6ZPKQEDI=";
pkgs/by-name/gr/greenmask/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "greenmask";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "GreenmaskIO";
repo = "greenmask";
rev = "refs/tags/v${version}";
hash = "sha256-OysYBoS/y4vKoyYpRlbkTvDaSPIIEM7QGI3lNkvNSGA=";
hash = "sha256-gSwXwU0YF+0mqRvq+6D+qosLGUNb6/RIRavZpI1BSQM=";
};
vendorHash = "sha256-D4XMEFi0uk6ogdo6+G1k/g16QpHynB1OjdoGcY2fSds=";
vendorHash = "sha256-tUrg7cDG7K1um34YLxzA/jtCJpOla333BZTV7ic1Lio=";
subPackages = [ "cmd/greenmask/" ];
pkgs/by-name/in/inputmodule-control/package.nix
+49
View File
@@ -0,0 +1,49 @@
{
lib,
stdenv,
testers,
rustPlatform,
fetchFromGitHub,
inputmodule-control,
pkg-config,
libudev-zero,
}:
rustPlatform.buildRustPackage rec {
pname = "inputmodule-control";
version = "0.2.0";
src = fetchFromGitHub {
owner = "FrameworkComputer";
repo = "inputmodule-rs";
rev = "v${version}";
hash = "sha256-5sqTkaGqmKDDH7byDZ84rzB3FTu9AKsWxA6EIvUrLCU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-s5k23p0Fo+DQvGpDvy/VmGNFK7ZysqLIyDPuUn6n724=";
buildAndTestSubdir = "inputmodule-control";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libudev-zero ];
postInstall = ''
install -Dm644 release/50-framework-inputmodule.rules $out/etc/udev/rules.d/50-framework-inputmodule.rules
'';
passthru.tests.version = testers.testVersion {
package = inputmodule-control;
};
meta = {
description = "CLI tool to control Framework input modules like the LED matrix";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
mainProgram = "inputmodule-control";
homepage = "https://github.com/FrameworkComputer/inputmodule-rs";
downloadPage = "https://github.com/FrameworkComputer/inputmodule-rs/releases/tag/${src.rev}";
changelog = "https://github.com/FrameworkComputer/inputmodule-rs/releases/tag/${src.rev}";
maintainers = with lib.maintainers; [ Kitt3120 ];
};
}
pkgs/by-name/km/kmon/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "kmon";
version = "1.6.5";
version = "1.7.0";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1OsQT3RMNLQMjr4aA2u5knp/HhOUOJ/oZYHG/+cTQFQ=";
sha256 = "sha256-+pzVSCmK4Ex0CA94PtP2A+tW4p88THQlkhEhdOA4jdg=";
};
cargoHash = "sha256-9xRlm5pWWRRPq6MMwiMADmm8Bg2FqKNSfv7tm1ONiiQ=";
cargoHash = "sha256-s7/WuV4tTA06yRcvJMrEFXcemy/9ia5ZVRS5LDj/oXY=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ko/kompose/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "kompose";
version = "1.34.0";
version = "1.35.0";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kompose";
rev = "v${version}";
hash = "sha256-lBNf/pNJulex3WNRx8ZQcGag2nUPqjPKU9X/xDNxQjc=";
hash = "sha256-M1d1pSIMRIlLKob9D8MzrUuPm+h9C5sSC8L+uIdU1Ic=";
};
vendorHash = "sha256-SakezUp2Gj1PxY1Gwf8tH2yShtB/MPIqGjM/scrGG4I=";
vendorHash = "sha256-UQnhakHAyldESYhQlHe5mHVv5jFB7DUp+mNo0Q0iDkc=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ku/kube-bench/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "kube-bench";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-wRY40yNXTcixCUYWFMQsfkI7MPE4RuxCEHBoedDpW9Y=";
hash = "sha256-i0iSIK3nJ83bCuxIVxLBjJbBCpTU5TavmX2DTEJzG+Q=";
};
vendorHash = "sha256-bTpE8zJ6dCMimTowexehxnWPq3tXd0H9ZduJvCVqAlI=";
vendorHash = "sha256-c4+ruUR52TcjI+Xvuv9Xt8GAyjpbEvJhqDqWSRgVGWI=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ku/kubefetch/package.nix
+2 -2
View File
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "kubefetch";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "jkulzer";
repo = "kubefetch";
rev = "${version}";
hash = "sha256-p7YRE+o/omuGwXGpVUOvI7KbFyYGymYCRZk+Phh30RM=";
hash = "sha256-1NbbQ9f81DbfvpGayhMYdOTOZrDg2hdZi+qUOr2mntY=";
};
vendorHash = "sha256-qsncOsCxepySJI+rJnzbIGxSWlxMzqShtzcEoJD2UPw=";
pkgs/by-name/li/libfmvoice/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libfmvoice";
version = "0-unstable-2024-11-08";
version = "0-unstable-2024-12-11";
src = fetchFromGitHub {
owner = "vampirefrog";
repo = "libfmvoice";
rev = "1cd83789335ba7fcae4cd2081e873ad097e3270c";
hash = "sha256-XzkFfrfXefbZLXWFDy0V6agDPjzCzG5d28znQWsmcuM=";
rev = "896a67d0dab6144d30abb0c5cfbebe483196fed7";
hash = "sha256-aquI9mEwAI2agUnuCUSEfxIDkmI1RwQeNQEq/+x/akg=";
};
outputs = [
pkgs/by-name/lu/lumafly/package.nix
+31 -11
View File
@@ -9,6 +9,7 @@
icoutils,
copyDesktopItems,
makeDesktopItem,
writeScript,
}:
buildDotnetModule rec {
pname = "lumafly";
@@ -17,18 +18,33 @@ buildDotnetModule rec {
src = fetchFromGitHub {
owner = "TheMulhima";
repo = "lumafly";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-GVPMAwxbq9XlKjMKd9G5yUol42f+6lSyHukN7NMCVDA=";
};
# Use .NET 9.0 since 7.0 is EOL
dotnetFlags = [ "-p:TargetFramework=net9.0" ];
projectFile = "Lumafly/Lumafly.csproj";
nugetDeps = ./deps.nix;
dotnet-sdk = dotnetCorePackages.sdk_7_0;
dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-runtime = dotnetCorePackages.sdk_9_0;
selfContainedBuild = true;
passthru.updateScript = writeScript "update-lumafly" ''
#!/usr/bin/env nix-shell
#!nix-shell --pure -i bash -p bash nix nix-update git cacert
set -eo pipefail
prev_version=$(nix eval --raw -f. lumafly.version)
nix-update lumafly
[[ $(nix eval --raw -f. lumafly.version) == "$prev_version" ]] ||
$(nix-build . -A lumafly.fetch-deps --no-out-link)
'';
runtimeDeps = [
zlib
icu
@@ -40,21 +56,25 @@ buildDotnetModule rec {
copyDesktopItems
];
executables = [ "Lumafly" ];
postFixup = ''
# Icon for the desktop file
icotool -x $src/Lumafly/Assets/Lumafly.ico
install -D Lumafly_1_32x32x32.png $out/share/icons/hicolor/32x32/apps/lumafly.png
'';
desktopItems = [(makeDesktopItem {
desktopName = "Lumafly";
name = "lumafly";
exec = "Lumafly";
icon = "lumafly";
comment = meta.description;
type = "Application";
categories = [ "Game" ];
})];
desktopItems = [
(makeDesktopItem {
desktopName = "Lumafly";
name = "lumafly";
exec = "Lumafly";
icon = "lumafly";
comment = "A cross platform mod manager for Hollow Knight written in Avalonia";
type = "Application";
categories = [ "Game" ];
})
];
meta = {
description = "A cross platform mod manager for Hollow Knight written in Avalonia";
pkgs/by-name/me/melonDS/package.nix
+3 -3
View File
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonDS";
version = "1.0rc-unstable-2024-11-27";
version = "1.0rc-unstable-2024-12-05";
src = fetchFromGitHub {
owner = "melonDS-emu";
repo = "melonDS";
rev = "cba838dd52a8d163c59e312d75f451a04cea9b48";
hash = "sha256-0Pv2ARbQkYaGDQ7AMLlMdK1MjnsctPIIWxGz2XNTNmI=";
rev = "7d718ada390bc54749fa35389437147e1bbefae1";
hash = "sha256-Oh69L4yOSeEAAUjUupMN7cQbPEUjZ0M/5FmiBvsBGxw=";
};
nativeBuildInputs = [
pkgs/by-name/me/mergiraf/Cargo.lock
Generated
-1601
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/me/mergiraf/package.nix
+4 -8
View File
@@ -11,22 +11,18 @@
rustPlatform.buildRustPackage rec {
pname = "mergiraf";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "mergiraf";
repo = "mergiraf";
rev = "refs/tags/v${version}";
hash = "sha256-yBLSN5+rPPoxA6Bn1O2NNGNo9cDfowZdaOtVvvUmNAM=";
hash = "sha256-ft3lr+k/EOfYO9z8XPgONiUd8YLn6t7D6OsnMxVETrg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-PuHdAHDB2K65vJlAsdsxAyMEnj8dAOozDX99k26pI9A=";
nativeCheckInputs = [
git
pkgs/by-name/mi/misconfig-mapper/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "misconfig-mapper";
version = "1.12.3";
version = "1.12.4";
src = fetchFromGitHub {
owner = "intigriti";
repo = "misconfig-mapper";
rev = "refs/tags/v${version}";
hash = "sha256-TA6vnK1UAT66uPJzM4QJxjcpVZKPyAe4ZayYcrggzpc=";
hash = "sha256-v+Ls3P+s/pBMLgFMIHcfs+z9GsYNCcpOxoKlO+OjpzE=";
};
vendorHash = "sha256-KN4jasuVP6WJjoqQNPhqvXcmgbj16sX//PxAloj1w20=";
vendorHash = "sha256-+DA/eicufx4odMmHJEFKkDH6XbLLXCg3CRHT2kJhy8M=";
ldflags = [
"-s"
pkgs/by-name/mi/mise/package.nix
+3 -3
View File
@@ -20,16 +20,16 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
version = "2024.11.37";
version = "2024.12.6";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
hash = "sha256-9hBBEuSjE1WMmjb+UfA2rroMwzb2cuZ3TzVRZfvwvvI=";
hash = "sha256-VAevON40XWME9L4dHCuatg0ngzNBnhMUy9OAXPdJJdk=";
};
cargoHash = "sha256-PP1alyUmsqGjzUGnx1M8QYNBqELwil7NtH+W706PD2s=";
cargoHash = "sha256-fmvQNmMk6QMsPRUwLnqSNuJikH0QMNjA088Kb7TzUZ4=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/mu/muparser/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "muparser";
version = "2.3.4";
version = "2.3.5";
src = fetchFromGitHub {
owner = "beltoforion";
repo = "muparser";
rev = "v${version}";
hash = "sha256-hutmmhw7BHAwbDKBiK+3Yw833GL0rPGlVjlO7XzTii0=";
hash = "sha256-CE3xgJr2RNsNMrj8Cf6xd/pD9M1OlHEclTW6xZV5X30=";
};
postPatch = ''
pkgs/by-name/my/mydumper/package.nix
+2 -2
View File
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "mydumper";
version = "0.16.9-1";
version = "0.17.0-1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-f/NuDyicLG0RUl/ePGYa/4B2wAZ+roVLMc+kWkNxd+Q=";
hash = "sha256-ZLLctIBbw95iQ1LpBEGZBNlBxQy2oyductmOQXckN2Q=";
# as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule
fetchSubmodules = true;
};
pkgs/by-name/nb/nb/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "nb";
version = "7.14.6";
version = "7.15.0";
src = fetchFromGitHub {
owner = "xwmx";
repo = "nb";
rev = version;
hash = "sha256-VcYE1luwNtdrOmjTDKkIAX9rmcbFyCBtnib+c9FyJuA=";
hash = "sha256-dZl/WYmm+UTPYuvVf+7zvU7ms5x/cwnC56y+PIRx3Hc=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ne/netscanner/package.nix
+3 -3
View File
@@ -7,7 +7,7 @@
}:
let
pname = "netscanner";
version = "0.6.1";
version = "0.6.2";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
owner = "Chleba";
repo = "netscanner";
rev = "refs/tags/v${version}";
hash = "sha256-/EHg8YnsGwFlXEfdsh1eiWoNmapDHGOws4lkEGqjhoo=";
hash = "sha256-/8UhnJ4ZPaJ+CQPCeKr1uH0Iw6A4/DARiSukK6+ZZeY=";
};
cargoHash = "sha256-uqTSr+c+pDAi2r6roHeZfW0LCyN/1J0M2+8grdAtX7U=";
cargoHash = "sha256-u6Q9QPyOSMc356fkO4XVWUL0GGN1c2CoKhVvt1P30AU=";
postFixup = ''
wrapProgram $out/bin/netscanner \
pkgs/by-name/no/novops/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "novops";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "PierreBeucher";
repo = pname;
rev = "v${version}";
hash = "sha256-ToIIBLLwf9GLg+/2VF3DQTT1RokI6XHwdPmr+BtNFeU=";
hash = "sha256-bpv8Ybrsb2CAV8Qxj69F2E/mekYsOuAiZWuDNHDtxw0=";
};
cargoHash = "sha256-3QB7iuzWlWDgFRrKiwq7Yh9PIW88m1N+nPQ8fdEQ7Ps=";
cargoHash = "sha256-5NKgGX4j2hQuP9/9OnABLXcWuTPMAfvX0oquoSXeEIE=";
buildInputs =
[
pkgs/by-name/nu/numix-icon-theme-square/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "24.10.22";
version = "24.12.12";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-7pAVXaNH/qMmo7/CcDgeFbA6KHINAxu8sHMoQYecZKM=";
sha256 = "sha256-PxnMMznrSIbI+Vnx2cIPUZ0PxQVZsFn6E/0N2pPAZ6Q=";
};
nativeBuildInputs = [ gtk3 ];
pkgs/by-name/pa/patch2pr/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "patch2pr";
version = "0.29.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "bluekeyes";
repo = "patch2pr";
rev = "v${version}";
hash = "sha256-eWOzK08ZlNORaRRtDumxOhsQWNXxk48jxcanwhEOChY=";
hash = "sha256-o5GvA9602k2cnw1psWUZJZE1MVUT4GzRcoPYBJCHNtg=";
};
vendorHash = "sha256-x2w1HYrJo0HqyGGlIaxKqy1XYj/akQm0ijbYuK7qg58=";
vendorHash = "sha256-DNa/OE0m/69g7b44Z/cqUtbRvrsUr6lTrww0JcTjXP8=";
ldflags = [
"-X main.version=${version}"
pkgs/by-name/pe/pet/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "pet";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "knqyf263";
repo = "pet";
rev = "v${version}";
sha256 = "sha256-J6DrrCeuJrdVSBJNUcALiPOAP0SEjYYLSFEg7gEXvhs=";
sha256 = "sha256-B0ilobUlp6UUXu6+lVqIHkbFnxVu33eXZFf+F7ODoQU=";
};
vendorHash = "sha256-VGhkhpqYJZZLCUMOE0eYBOICeFhRjgSXCGGUEYLDoQo=";
vendorHash = "sha256-+ieBk7uMzgeM45uvLfljenNvhGVv1mEazErf4YHPNWQ=";
ldflags = [
"-s"
pkgs/by-name/pr/protonmail-bridge/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "protonmail-bridge";
version = "3.15.0";
version = "3.15.1";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-bridge";
rev = "v${version}";
hash = "sha256-mfaZJ1XI07b90cbWvWFzyppJnJG+Q9LyViuQmt3XWvY=";
hash = "sha256-TwMkayH5gRSYdv5zDoYT2imOU/8leJugk0HHQLLe/UI=";
};
vendorHash = "sha256-avtw9MtnDo/992JAhXKCr/FXv+9M2j/pBLDNRVGsseM=";
pkgs/by-name/sn/snipaste/package.nix
+2 -2
View File
@@ -5,10 +5,10 @@
}:
let
pname = "snipaste";
version = "2.10.2";
version = "2.10.3";
src = fetchurl {
url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage";
hash = "sha256-u9e2d9ZpHDbDIsFkseOdJX2Kspn9TkhFfZxbeielDA8=";
hash = "sha256-/3y3dEcottZIKGLQY4VBZs7ClYVedNwXXFLKfHezS3Q=";
};
contents = appimageTools.extract { inherit pname version src; };
in
pkgs/by-name/so/sogo/enable-activesync.patch
+1 -1
View File
@@ -5,7 +5,7 @@
#import <NGExtensions/NSObject+Logs.h>
-#include <wbxml/wbxml.h>
+#include <libwbxml-1.0/wbxml/wbxml.h>
+#include <libwbxml-1.1/wbxml/wbxml.h>
#define WBXMLDEBUG 0
pkgs/by-name/sp/spacectl/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "spacectl";
version = "1.7.1";
version = "1.8.0";
src = fetchFromGitHub {
owner = "spacelift-io";
repo = "spacectl";
rev = "v${version}";
hash = "sha256-puo44Si56MnpMst6yU8ZTMJTZ1yWVb1CiNXh1k/umbM=";
hash = "sha256-IkGkySGvRFvIxx9c2jkFJ0vJ6iqdp+pQYgOuZgHZjIw=";
};
vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo=";
pkgs/by-name/te/terraform-ls/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "terraform-ls";
version = "0.36.0";
version = "0.36.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
hash = "sha256-fNIOFfNh96npfZ7BTTPH7V1VND4okt+UURdzS3JWHUc=";
hash = "sha256-XihFvQZQ+cJrFd9ly9mDVcXUDBXwndd796bterxaaAQ=";
};
vendorHash = "sha256-JW8qs2ZjH+S8zdEh8/da0SptooE3iTS6JqoIUh20R2Y=";
vendorHash = "sha256-/ZlWx8/6eJfoiCl6yOtotoju2LVPP6YHqjk+5WE7jzQ=";
ldflags = [
"-s"
pkgs/by-name/tu/turnon/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "turnon";
version = "1.6.1";
version = "1.6.2";
src = fetchFromGitHub {
owner = "swsnr";
repo = "turnon";
rev = "v${version}";
hash = "sha256-727v1jQBBueLHvk0DphMHnrgJe46gap3hp0ygUYezJ0=";
hash = "sha256-e9xrBtLAe/OAiDMn87IuzS/6NT8s4ZRHLAI/KF42ZdU=";
};
cargoHash = "sha256-mywGCIjsoShRPRNMkTmVh7597QdvBSIsI/HucYv3CzY=";
cargoHash = "sha256-DlEoJ5YJe679RFRfk/Bs217KrOSxSgqDJa+xpdJaTVs=";
nativeBuildInputs = [
cairo
pkgs/by-name/us/usql/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "usql";
version = "0.19.12";
version = "0.19.14";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
hash = "sha256-gutAb6GkaHtZK0uw9+If/luIUn8jiGfruWtAV3nQJvE=";
hash = "sha256-RKeUh+a2fyvvwm1dcRY2ydAloD9kD9mgLcrjmKSl1Xw=";
};
buildInputs = [
@@ -25,7 +25,7 @@ buildGoModule rec {
icu
];
vendorHash = "sha256-32tl3mXpFqthXMRERDvMsocfMW0ltSvnm8/+NKiSjmE=";
vendorHash = "sha256-AA4w9ROVozDXx2F/3PoOe0BSDC/GFkmsVmt/daK9MQU=";
proxyVendor = true;
# Exclude drivers from the bad group
pkgs/by-name/vg/vgm2x/package.nix
+3 -3
View File
@@ -10,14 +10,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vgm2x";
version = "0-unstable-2024-11-17";
version = "0-unstable-2024-12-11";
src = fetchFromGitHub {
owner = "vampirefrog";
repo = "vgm2x";
rev = "615f68c160b035651d1a5111539d3d5ee0bd66a3";
rev = "b13c50806d2c0d67afab69e428bb43bde64d26a1";
fetchSubmodules = true;
hash = "sha256-coPpxMF83c7WXy0BGkBMOwRA2SPQho5O8vtKcXB5Vk4=";
hash = "sha256-5zuCemXz65giPqdjU1tIboajh8tNpkxCglreT/fbvgA=";
};
postPatch = ''
pkgs/by-name/wa/watershot/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "watershot";
version = "0.2.0";
version = "0.2.2";
src = fetchFromGitHub {
owner = "Kirottu";
repo = "watershot";
rev = "v${version}";
hash = "sha256-QX6BxK26kcrg0yKJA7M+Qlr3WwLaykBquI6UK8wVtX4=";
hash = "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE=";
};
cargoHash = "sha256-481E5/mUeeoaZ0N//tRWCyV8/sRRP6VdB06gB1whgzU=";
cargoHash = "sha256-SEv4DoTZxGAzGe++q9GjRuyp3D+k4BkVzpKkZpqoCFw=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/yg/yggdrasil/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "yggdrasil";
version = "0.5.10";
version = "0.5.11";
src = fetchFromGitHub {
owner = "yggdrasil-network";
repo = "yggdrasil-go";
rev = "v${version}";
hash = "sha256-vTqjZkM0tr+BjBKbgQ2GKuDNhoPgGnzagrofcAMKpTU=";
hash = "sha256-029bG3zHEJKjP8fvq+TxiAR/JiGqXzrK5gnxvyve9FA=";
};
vendorHash = "sha256-1N9PCzK203gO/BM5toMNF+XaYwDPyoE6FGxwk5HmRhY=";
vendorHash = "sha256-D65Sbc9W5qYO/GmSIvFRwPpGJlX7bzsp8yN6yb3prWY=";
subPackages = [
"cmd/genkeys"
pkgs/by-name/yt/ytdownloader/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildNpmPackage rec {
pname = "ytDownloader";
version = "3.18.4";
version = "3.18.5";
src = fetchFromGitHub {
owner = "aandrew-me";
repo = "ytDownloader";
rev = "refs/tags/v${version}";
hash = "sha256-3kR4UOEwHmp63289H7onVU48q9vGpS0oPRj0Qb1s47w=";
hash = "sha256-914sEFUVwiHMXwnwZjdeSQmeSPRREeoihLKYYTTKAcs=";
};
npmDepsHash = "sha256-ifo3O9cF52hRsPKD70pJ42O7XhzrBg//iXzBWrpv+5I=";
npmDepsHash = "sha256-zBFRzVBmKAncZFTFa0hhv5BaE0rsAv9IdezZBNd5J2E=";
nativeBuildInputs = [
copyDesktopItems
pkgs/development/python-modules/deal-solver/default.nix
+13 -20
View File
@@ -1,53 +1,46 @@
{
lib,
astroid,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
flit-core,
z3-solver,
astroid,
pytestCheckHook,
hypothesis,
pytest-cov-stub,
pytest-xdist,
pytestCheckHook,
pythonOlder,
z3-solver,
}:
buildPythonPackage rec {
pname = "deal-solver";
version = "0.1.2";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "life4";
repo = pname;
repo = "deal-solver";
rev = "refs/tags/${version}";
hash = "sha256-DAOeQLFR/JED32uJSW7W9+Xx5f1Et05W8Fp+Vm7sfZo=";
};
nativeBuildInputs = [
flit-core
];
build-system = [ flit-core ];
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
pythonRemoveDeps = [ "z3-solver" ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace "\"--cov=deal_solver\"," "" \
--replace "\"--cov-report=html\"," "" \
--replace "\"--cov-report=xml\"," "" \
--replace "\"--cov-report=term-missing:skip-covered\"," "" \
--replace "\"--cov-fail-under=100\"," ""
'';
propagatedBuildInputs = [
dependencies = [
z3-solver
astroid
] ++ z3-solver.requiredPythonModules;
nativeCheckInputs = [
pytestCheckHook
hypothesis
pytest-cov-stub
pytest-xdist
pytestCheckHook
];
pythonImportsCheck = [ "deal_solver" ];
pkgs/development/python-modules/llm-gguf/default.nix
+49
View File
@@ -0,0 +1,49 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
httpx,
llama-cpp-python,
llm,
}:
buildPythonPackage rec {
pname = "llm-gguf";
version = "0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "simonw";
repo = "llm-gguf";
tag = version;
hash = "sha256-ihMOiQnTfgZKICVDoQHLOMahrd+GiB+HwWFBMyIcs0A=";
};
build-system = [
setuptools
];
dependencies = [
httpx
llama-cpp-python
llm
];
pythonImportsCheck = [ "llm_gguf" ];
# Tests require internet access (downloading models)
doCheck = false;
meta = {
description = "Run models distributed as GGUF files using LLM";
homepage = "https://github.com/simonw/llm-gguf";
changelog = "https://github.com/simonw/llm-gguf/releases/tag/${src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
pkgs/development/python-modules/niaclass/default.nix
+3 -3
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "niaclass";
version = "0.2.1";
version = "0.2.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "firefly-cpp";
repo = "NiaClass";
rev = "refs/tags/${version}";
hash = "sha256-9ynnnnCrOesl7dWgX3P1aFDycH0ifDtTT4BSlq0HDj0=";
tag = version;
hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I=";
};
pythonRelaxDeps = [ "pandas" ];
pkgs/development/python-modules/pyoverkiz/default.nix
+3 -3
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.15.1";
version = "1.15.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
hash = "sha256-3j72zLBMm6tuQDWqNrkVEFvDAc45xyLnG19lEsJV1Mg=";
tag = "v${version}";
hash = "sha256-6KDtNXFlzWY27JeV9uwSu9pzjiZAmwLyYmg0KR8QudQ=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/python-arango/default.nix
+3 -3
View File
@@ -33,7 +33,7 @@ in
buildPythonPackage rec {
pname = "python-arango";
version = "8.1.3";
version = "8.1.4";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -41,8 +41,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "arangodb";
repo = "python-arango";
rev = "refs/tags/${version}";
hash = "sha256-DNcKmjlolku0BiV+4G0TClIMAeBRWg96OZgv601V/LA=";
tag = version;
hash = "sha256-NAFleaZaZFWwhAPsuJG9S81w/FlkHgefqVWg5F+lhUo=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-gvm/default.nix
+3 -3
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "python-gvm";
version = "24.11.0";
version = "24.12.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "greenbone";
repo = "python-gvm";
rev = "refs/tags/v${version}";
hash = "sha256-n4Izhtqs6awEtnt4r915ZtyHQnM49ExbuAzqJw/CNa0=";
tag = "v${version}";
hash = "sha256-6K9Gv2ycQuCeH5GxtRfpwRqTQxpuqRZC82EvQCFSX4k=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/pyvicare/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvicare";
version = "2.37.0";
version = "2.38.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openviess";
repo = "PyViCare";
rev = "refs/tags/${version}";
hash = "sha256-v+fRlyR4UZJs3yVFSaJfExFDOHVxOA0aCEXEbTxyZ7E=";
hash = "sha256-LxQaqT4NwJxyyZ3XB14DPM8ASqem3Yb7J7HLswZ8bE4=";
};
postPatch = ''
pkgs/development/python-modules/rmsd/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "rmsd";
version = "1.6.0";
version = "1.6.1";
format = "setuptools";
propagatedBuildInputs = [ scipy ];
src = fetchPypi {
inherit pname version;
hash = "sha256-9bALeHmdw6OJGxp3aabkDfCxo4fGv2etKzpBDhmZOrI=";
hash = "sha256-nllfrUlviV2+5k94CiJQTnChrQVcchh1+uhxt84kncM=";
};
pythonImportsCheck = [ "rmsd" ];
pkgs/development/python-modules/scikit-posthocs/default.nix
+3 -3
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "scikit-posthocs";
version = "0.11.0";
version = "0.11.1";
pyproject = true;
src = fetchFromGitHub {
owner = "maximtrp";
repo = "scikit-posthocs";
rev = "refs/tags/v${version}";
hash = "sha256-KrQqd3zChw9sxjbrTrxXInXAJLyXwPkhbPa9One6I+g=";
tag = "v${version}";
hash = "sha256-RPTWbhaDMdPiIQ6TLeWwZKYI9m23dEXu9iqBLYIEVN4=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/unstructured/default.nix
+3 -3
View File
@@ -57,7 +57,7 @@
grpcio,
}:
let
version = "0.16.8";
version = "0.16.11";
optional-dependencies = {
huggingflace = [
langdetect
@@ -99,8 +99,8 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "Unstructured-IO";
repo = "unstructured";
rev = "refs/tags/${version}";
hash = "sha256-TIJ1cfti+zF9sP0LrIIue9F8n8gRAy5+8hb4cIzHk2U=";
tag = version;
hash = "sha256-+I5eXG/ICmYPDTavDnyLlopIvoABjdDwOyfotrNs6qs=";
};
propagatedBuildInputs = [
pkgs/development/tools/apko/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "apko";
version = "0.20.1";
version = "0.21.0";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-V3wJzFrbgGqCtbK9YkrRiOZ1UeWN11QyJLFTo4R5LZY=";
hash = "sha256-ppWEMQs14GnnZr1wxe6YBQ9DtsN/EPiUSgYFOBdFbQU=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-oHeWXlXbhGdx4ilEWqEU/EEtJK2uReru0khi4hFY5ys=";
vendorHash = "sha256-8DsCLc1SovY8hupYc3AjOlp4JbeVeg1mbcVdLpvHUhI=";
nativeBuildInputs = [ installShellFiles ];
pkgs/servers/mail/mailpit/source.nix
+4 -4
View File
@@ -1,6 +1,6 @@
{
version = "1.21.5";
hash = "sha256-i1Us3ex09RiuSYf+eV8IybxHKfR6jKda61wJj2P3wxw=";
npmDepsHash = "sha256-Vb6XMECl0H+gIth2Qxuxib3SVqB0OdYGpBfr/6P4Hwc=";
vendorHash = "sha256-jnhDyIRCcnyovn/sQmdZ0kQDXU1ZFKMLfXksYAnIvJ8=";
version = "1.21.6";
hash = "sha256-jQiHEycXTuP8+T0ArCyyNtBOiB6wH842+eLlXrO5ZEw=";
npmDepsHash = "sha256-FxPkqhgVRvf/UpDjaj/CrVGjSuDZ31lazThHTHGY/tM=";
vendorHash = "sha256-teiOrfPCbPzWL5XGgmO9ZWEem7LPkxBwayrovMH15jk=";
}
pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@ let mkPrefetchScript = tool: src: deps:
installPhase = ''
install -vD ${src} $out/bin/$name;
wrapProgram $out/bin/$name \
--prefix PATH : ${lib.makeBinPath (deps ++ [ gnused nix ])} \
--prefix PATH : ${lib.makeBinPath (deps ++ [ coreutils gnused nix ])} \
--set HOME /homeless-shelter
'';
@@ -30,7 +30,7 @@ let mkPrefetchScript = tool: src: deps:
in rec {
nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ breezy ];
nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ];
nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ coreutils findutils gawk git git-lfs ];
nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ findutils gawk git git-lfs ];
nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ];
nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ];
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -15456,7 +15456,7 @@ with pkgs;
sommelier = callPackage ../applications/window-managers/sommelier { };
spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { };
spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { };
squishyball = callPackage ../applications/audio/squishyball {
ncurses = ncurses5;
pkgs/top-level/python-packages.nix
+2
View File
@@ -7582,6 +7582,8 @@ self: super: with self; {
llm = callPackage ../development/python-modules/llm { };
llm-gguf = callPackage ../development/python-modules/llm-gguf { };
llmx = callPackage ../development/python-modules/llmx { };
llvmlite = callPackage ../development/python-modules/llvmlite {