Merge 0ab631ca55 into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2025-09-06 21:18:50 +00:00
committed by GitHub
28 changed files with 115 additions and 138 deletions
@@ -178,6 +178,10 @@ in
ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}";
Restart = "on-failure";
CacheDirectory = "calibre-web";
CacheDirectoryMode = "0750";
environment.CACHE_DIR = "/var/cache/calibre-web";
}
// lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) {
StateDirectory = cfg.dataDir;
@@ -1920,8 +1920,8 @@ let
mktplcRef = {
publisher = "github";
name = "codespaces";
version = "1.17.3";
hash = "sha256-idJFYHJ4yeqpFZBX55Y0v1yfzgqyhS0MrC4yIto7i7w=";
version = "1.17.4";
hash = "sha256-0fhPOtHpjafuo+oCCRmLKYI7Q22eE3vliH9q//ab6Ag=";
};
meta = {
@@ -2017,8 +2017,8 @@ let
mktplcRef = {
name = "Go";
publisher = "golang";
version = "0.48.0";
hash = "sha256-W+GsieGOn9UhOB49v/NqsHCoOm4VNaZotipIN2E4N9k=";
version = "0.50.0";
hash = "sha256-e0O5EXStxHw7sKozH6qzLSMzy00S+6Q7p9KtP+NbB6Y=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog";
+2 -2
View File
@@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "alibuild";
version = "1.17.26";
version = "1.17.28";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-Adiz+vIquMXWgwGSGwuQlVHiMaQhJiNAoAq5K8Ra4bc=";
hash = "sha256-x+1sAFJzKBUwVy5uIR/EVKicVGY5q6ghFiN175vN4VE=";
};
build-system = with python3Packages; [
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "application-title-bar";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "antroids";
repo = "application-title-bar";
tag = "v${finalAttrs.version}";
hash = "sha256-YSzXjFPCG/bs1Qm9YvoEDcM9GmlSosf2KAyz+7lx6Xg=";
hash = "sha256-IJb2ECsFoA+YpegV0Fqk8rsNfym7KU7O79mwFdTr9gE=";
};
propagatedUserEnvPkgs = with kdePackages; [ kconfig ];
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "c2patool";
version = "0.20.0";
version = "0.20.3";
src = fetchFromGitHub {
owner = "contentauth";
repo = "c2pa-rs";
tag = "c2patool-v${finalAttrs.version}";
hash = "sha256-GYqH1Gc3oGFvQDZ8vKuFOGUWvIRlDzoPKDK1rTU9H3Y=";
hash = "sha256-ubJyplfvQ8OOdPwhnphZl51nbAgFcZz9fMTyQCPu5cw=";
};
cargoHash = "sha256-anpm5touXTQviCAr3kJ1Wm7pAt5yGsJKMwHFYTnNPzI=";
cargoHash = "sha256-xp9CfHtC4g2o5QJSU/IcNVi8CXifdB9npOYbFujLht4=";
# use the non-vendored openssl
env.OPENSSL_NO_VENDOR = 1;
+27
View File
@@ -0,0 +1,27 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "dli";
version = "0-unstable-2025-09-06";
src = fetchFromGitHub {
owner = "haylinmoore";
repo = "dli";
rev = "176302f80cf771a7a15d9df58c3296a979f18e28";
hash = "sha256-I8ozN5ucBhsArehSQibTLlYavq+4rBRUvU42Cli4KVo=";
};
vendorHash = "sha256-kgf/tt1Mr/3ja3or0zL/Mqnwy00XiGj7rdM/MnhjWZw=";
meta = {
description = "CLI based tool for managing DNS records";
homepage = "https://github.com/haylinmoore/dli";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.haylin ];
mainProgram = "dli";
};
}
+7 -7
View File
@@ -56,24 +56,24 @@
let
pname = "gitkraken";
version = "11.2.1";
version = "11.3.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
hash = "sha256-nxYWcw8A/lIVyjiUJOmcjmTblbxiLSxMUjo7KnlAMzs=";
hash = "sha256-OUPsDr7+aQfYO8Xdu7gHlx4gvOUH5ee9xPxEsD9s3ng=";
};
x86_64-darwin = fetchzip {
url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
hash = "sha256-7I3yAEarGGhFs/PvcqvoDx8MbJ/zEuNN/s0o357M1vc=";
hash = "sha256-J1RCFhIhi1z0WJ/a6z/KbSBJrhAiHFdBzy8EfZu6I6Y=";
};
aarch64-darwin = fetchzip {
url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
hash = "sha256-pDPdi+cRMqhxu/84u6ojxteIi1VHfN3qy/NTruHVt8U=";
hash = "sha256-hE0OOmDWlUBYBKMKLKDBO7FGoxwpLAb2lRkwCjFEAGE=";
};
};
@@ -207,9 +207,9 @@ let
# SSL and permissions fix for bundled nodegit
pushd $out/share/${pname}/resources/app.asar.unpacked/node_modules/@axosoft/nodegit/build/Release
mv nodegit-ubuntu-18.node nodegit-ubuntu-18-ssl-1.1.1.node
mv nodegit-ubuntu-18-ssl-static.node nodegit-ubuntu-18.node
chmod 755 nodegit-ubuntu-18.node
mv nodegit-ubuntu-20.node nodegit-ubuntu-20-ssl-1.1.1.node
mv nodegit-ubuntu-20-ssl-static.node nodegit-ubuntu-20.node
chmod 755 nodegit-ubuntu-20.node
popd
# Devendor bundled git
+3 -3
View File
@@ -10,11 +10,11 @@ let
owner = "superseriousbusiness";
repo = "gotosocial";
version = "0.19.1";
version = "0.19.2";
web-assets = fetchurl {
url = "https://${domain}/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
hash = "sha256-UtxFm8ZSpIGXruBdanSF1lkA7Gs1FJNhoqzDTqSNYUM=";
hash = "sha256-et1jguboadjJJdUpugmRvkAtpdfHxn4+ftXUH/hWTdE=";
};
in
buildGoModule rec {
@@ -24,7 +24,7 @@ buildGoModule rec {
src = fetchFromGitea {
inherit domain owner repo;
tag = "v${version}";
hash = "sha256-RhJRdRxTdbZwIAGD3gH0mjDfCvdS7xkRxcUd1ArsNoo=";
hash = "sha256-06ZBfOD222bt8nwlGCd7uuHS3P8YiaCKWWeYqlyJXns=";
};
vendorHash = null;
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau";
version = "0.689";
version = "0.690";
src = fetchFromGitHub {
owner = "luau-lang";
repo = "luau";
tag = finalAttrs.version;
hash = "sha256-ZHALILdIJHYovSdUJk2KZIG0u/vdCAROzFd7U3pqWIk=";
hash = "sha256-9Ql2hwzDMODc6+hSQStArmwmdG31682gGRqNRxWfmT0=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -41,7 +41,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "25.05.2.1";
version = "25.05.3.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings [ "." ] [ "-" ] version}";
hash = "sha256-RpMzn8x378QWMFFj5pn8b9j1jWLKGEbvINt0PMsCIHI=";
hash = "sha256-W/q9eN4Ov3pxp2qyr3b7G4ayDaNtFUPQeAcOHCB23Q8=";
};
outputs = [
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "starkiller";
version = "3.0.1";
version = "3.1.0";
src = fetchFromGitHub {
owner = "bc-security";
repo = "starkiller";
rev = "v${finalAttrs.version}";
hash = "sha256-+q+toH5AvIdFPOY0Q06lWDlPrhIpEnukV+8JlwDZVPE=";
hash = "sha256-KjEHbRhbXY57886uziRzUoA/MzK6QZx7/b1lrmIKsWc=";
};
yarnOfflineCache = fetchYarnDeps {
+3 -3
View File
@@ -21,19 +21,19 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux;
stdenv.mkDerivation (finalAttrs: {
pname = "uutils-coreutils";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "uutils";
repo = "coreutils";
tag = finalAttrs.version;
hash = "sha256-nKKjc6Bui7k50SR7BY09dRGt3Za1Ch/E+3KiCO5KtOg=";
hash = "sha256-jxjg2RIZaemA6jgfdE1KX8G6c/NWumecoJMFx7dspz8=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "uutils-coreutils-${finalAttrs.version}";
hash = "sha256-PTIypl9uqFkp6GrF7Pp40AItbWFlXT2V2x/C8L2J8S0=";
hash = "sha256-SFuAWzmYd1N7czUyC/7CYrCObYfoKrC5oORFxXtbwhE=";
};
patches = [
@@ -1,12 +1,11 @@
diff --git a/GNUmakefile b/GNUmakefile
index f46126a82..44be8f13b 100644
index 20dc731d3..400e5b84f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -57,20 +57,6 @@ TOYBOX_ROOT := $(BASEDIR)/tmp
TOYBOX_VER := 0.8.12
TOYBOX_SRC := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
@@ -69,19 +69,6 @@ TOYBOX_SRC := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
#------------------------------------------------------------------------
OS ?= $(shell uname -s)
-
-ifdef SELINUX_ENABLED
- override SELINUX_ENABLED := 0
-# Now check if we should enable it (only on non-Windows)
@@ -23,7 +22,7 @@ index f46126a82..44be8f13b 100644
# Possible programs
PROGS := \
base32 \
@@ -181,8 +167,10 @@ SELINUX_PROGS := \
@@ -200,8 +187,10 @@ endif
ifneq ($(OS),Windows_NT)
PROGS := $(PROGS) $(UNIX_PROGS)
@@ -32,6 +31,6 @@ index f46126a82..44be8f13b 100644
- PROGS := $(PROGS) $(SELINUX_PROGS)
+ PROGS := $(PROGS) $(SELINUX_PROGS)
+ endif
# Always use external libstdbuf when building with make (Unix only)
CARGOFLAGS += --features feat_external_libstdbuf
endif
UTILS ?= $(PROGS)
+17 -5
View File
@@ -3,6 +3,7 @@
stdenv,
fetchzip,
jdk24,
unzip,
copyDesktopItems,
makeDesktopItem,
}:
@@ -13,6 +14,9 @@ let
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
platform = selectSystem {
"x86_64-linux" = "linux-x86-64";
"aarch64-linux" = "linux-aarch64";
"x86_64-darwin" = "macosx-x86-64";
"aarch64-darwin" = "macosx-aarch64";
};
in
@@ -27,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
stripRoot = false;
};
nativeBuildInputs = [ copyDesktopItems ];
nativeBuildInputs = [
copyDesktopItems
]
++ lib.optional stdenv.isDarwin unzip;
desktopItems = [
(makeDesktopItem {
@@ -60,12 +67,17 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
''
+ lib.optionalString stdenv.isLinux ''
mkdir -p $out/share/{applications,pixmaps}
mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis/* $out/
mv $out/lib/*.png $out/share/pixmaps/
''
+ lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis.app $out/Applications/
''
+ ''
runHook postInstall
'';
@@ -79,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
epl20
];
maintainers = [ ];
platforms = [ "x86_64-linux" ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "Weasis";
};
})
+2 -2
View File
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "whatsapp-for-mac";
version = "2.25.16.81";
version = "2.25.22.79";
src = fetchzip {
extension = "zip";
name = "WhatsApp.app";
url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=relbranch";
hash = "sha256-CZcMYWyBpusM+NUlMC2du01cq3uqXvMiIdOienLn/nM=";
hash = "sha256-LYjPMiXLD1U5ZNt/acBagrV2RS7U/OGMJ06mUFBluSQ=";
};
dontConfigure = true;
+7 -3
View File
@@ -13,6 +13,8 @@
electron,
commandLineArgs ? "",
nix-update-script,
}:
let
@@ -20,7 +22,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ytmdesktop";
version = "2.0.9";
version = "2.0.10";
src = fetchFromGitHub {
owner = "ytmdesktop";
@@ -34,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
find -name .git -print0 | xargs -0 rm -rf
'';
hash = "sha256-uDm8jDkPwxLa+LUK8fPlJMvXInD7T7B+641YyCgYvnI=c";
hash = "sha256-CA3Vb7Wp4WrsWSVtIwDxnEt1pWYb73WnhyoMVKoqvOE=";
};
patches = [
@@ -55,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-bBd5wWr+j3HQY2+VIAATYVdCh+0tIRlLg68bx4z1+Ys=";
hash = "sha256-1jlnVY4KWm+w3emMkCkdwUtkqRB9ZymPPGuvgfQolrA=";
};
nativeBuildInputs = [
@@ -137,6 +139,8 @@ stdenv.mkDerivation (finalAttrs: {
})
];
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/ytmdesktop/ytmdesktop/tag/v${finalAttrs.version}";
description = "Desktop App for YouTube Music";
@@ -9,7 +9,7 @@
beamPackages.mixRelease rec {
pname = "livebook";
version = "0.17.0";
version = "0.17.1";
inherit (beamPackages) elixir;
@@ -21,13 +21,13 @@ beamPackages.mixRelease rec {
owner = "livebook-dev";
repo = "livebook";
tag = "v${version}";
hash = "sha256-bdz6ufli+WC+3Fpd9uFK+OKOmL2Ogvmr5qsI85N1vgg=";
hash = "sha256-TQbSqavpJqasQsuLSvCdrkL7DZK56c7FHp5ABhK9noA=";
};
mixFodDeps = beamPackages.fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version;
hash = "sha256-YyNrERVomIPaBJVKPTc5ZbWzaJk6b87RAC4QkBDicoQ=";
hash = "sha256-18fmaNuu2KqTGhBBd+pSBfgnrHiqzXc3CMdSpC5lFs8=";
};
postInstall = ''
@@ -48,8 +48,6 @@ self: super:
# https://github.com/spacchetti/spago/issues/512
spago = self.callPackage ../tools/purescript/spago/spago.nix { };
nix-linter = self.callPackage ../../development/tools/analysis/nix-linter { };
# Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
# cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
hercules-ci-optparse-applicative =
@@ -36,7 +36,7 @@ let
# BLAS
libraries += ['blas']
library_dirs += ['${blas}/lib']
library_dirs += ['${lib.getLib blas}/lib']
# FFTW
fftw = True
@@ -51,9 +51,8 @@ let
libxc = True
if libxc:
xc = '${libxc}/'
include_dirs += [xc + 'include']
library_dirs += [xc + 'lib/']
extra_link_args += ['-Wl,-rpath={xc}/lib'.format(xc=xc)]
include_dirs += ['${lib.getDev libxc}/include']
library_dirs += ['${lib.getLib libxc}/lib']
if 'xc' not in libraries:
libraries.append('xc')
@@ -61,9 +60,8 @@ let
libvdwxc = True
if libvdwxc:
vdwxc = '${libvdwxc}/'
extra_link_args += ['-Wl,-rpath=%s/lib' % vdwxc]
library_dirs += ['%s/lib' % vdwxc]
include_dirs += ['%s/include' % vdwxc]
library_dirs += ['${lib.getLib libvdwxc}/lib']
include_dirs += ['${lib.getDev libvdwxc}/include']
libraries += ['vdwxc']
'';
};
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "langgraph-runtime-inmem";
version = "0.6.13";
version = "0.12.0";
pyproject = true;
# Not available in any repository
src = fetchPypi {
pname = "langgraph_runtime_inmem";
inherit version;
hash = "sha256-F1bFV/g6jNl575fT0KNvqZBmbmMFkhLG4RrylXuZNQs=";
hash = "sha256-h1YFV8lqb929MjzOIHPI8hahjDCkShr83kevjUWFF8A=";
};
build-system = [
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyvista";
version = "0.46.2";
version = "0.46.3";
pyproject = true;
src = fetchFromGitHub {
owner = "pyvista";
repo = "pyvista";
tag = "v${version}";
hash = "sha256-k5Sr41mmZJCEiIeEyyqulzYrI3cQYTWN5ooW41QUPuQ=";
hash = "sha256-RpgrsNMZmIfx3bb7W9xU6u4gJoAuDQ8Xx9C25TLp6PI=";
};
# remove this line once pyvista 0.46 is released
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "simsimd";
version = "6.5.1";
version = "6.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "ashvardanian";
repo = "simsimd";
repo = "SimSIMD";
tag = "v${version}";
hash = "sha256-y7HCz3Lmlc0674VTMPXQGS7H9PMW+oeSvsYNsJq1MvI=";
hash = "sha256-1x0uRFjoNoGkQv4YwQ/84lR8k1Z9wy5X9ZlwO3q6wqo=";
};
build-system = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
meta = {
changelog = "https://github.com/ashvardanian/SimSIMD/releases/tag/${src.tag}";
description = "Portable mixed-precision BLAS-like vector math library for x86 and ARM";
homepage = "https://github.com/ashvardanian/simsimd";
homepage = "https://github.com/ashvardanian/SimSIMD";
license = with lib.licenses; [
asl20
# or
@@ -1,65 +0,0 @@
{
lib,
mkDerivation,
fetchFromGitHub,
fixplate,
tasty,
tasty-hunit,
tasty-th,
streamly,
mtl,
path,
pretty-terminal,
text,
base,
aeson,
path-io,
cmdargs,
containers,
hnix,
bytestring,
}:
mkDerivation {
pname = "nix-linter";
version = "0.2.0.4";
src = fetchFromGitHub {
owner = "Synthetica9";
repo = "nix-linter";
rev = "ecdd50750fd3ffaff83c0637474b884a0c38f8b9";
sha256 = "0hm6iaamh1wlvqk8z4yfh4idgbclbsimxhlgflwz2hnv9mm12sf1";
};
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [ fixplate ];
executableHaskellDepends = [
streamly
mtl
path
pretty-terminal
text
base
aeson
cmdargs
containers
hnix
bytestring
path-io
];
testHaskellDepends = [
tasty
tasty-hunit
tasty-th
];
description = "Linter for Nix(pkgs), based on hnix";
homepage = "https://github.com/Synthetica9/nix-linter";
license = lib.licenses.bsd3;
maintainers = [ ];
# doesn't build on ghc92
hydraPlatforms = lib.platforms.none;
broken = true;
}
@@ -12,8 +12,9 @@
},
patches ? [ ],
maintainers ? [
lib.maintainers.lovesegfault
lib.maintainers.artturin
lib.maintainers.philiptaron
lib.maintainers.lovesegfault
],
teams ? [ lib.teams.nix ],
self_attribute_name,
@@ -120,8 +120,9 @@ let
];
maintainers = [
lib.maintainers.lovesegfault
lib.maintainers.artturin
lib.maintainers.philiptaron
lib.maintainers.lovesegfault
];
teams = [ lib.teams.nix ];
+1
View File
@@ -1729,6 +1729,7 @@ mapAliases {
nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25
nix-direnv-flakes = nix-direnv;
nix-ld-rs = nix-ld; # Added 2024-08-17
nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06
nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18
nix-repl = throw (
# Added 2018-08-26
-2
View File
@@ -15119,8 +15119,6 @@ with pkgs;
nix-info = callPackage ../tools/nix/info { };
nix-info-tested = nix-info.override { doCheck = true; };
nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter);
nix-prefetch-github = with python3Packages; toPythonApplication nix-prefetch-github;
inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
-1
View File
@@ -317,7 +317,6 @@ let
nix-delegate
nix-deploy
nix-diff
nix-linter
nix-output-monitor
nix-script
nix-tree