Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-09-24 07:24:58 +00:00
committed by GitHub
13 changed files with 104 additions and 101 deletions
+2 -15
View File
@@ -3,7 +3,6 @@
stdenv,
callPackage,
fetchFromGitHub,
fetchpatch,
useMinimalFeatures ? false,
useArmadillo ? (!useMinimalFeatures),
@@ -84,27 +83,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
version = "3.11.0";
version = "3.11.3";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
tag = "v${finalAttrs.version}";
hash = "sha256-8HcbA9Cj2i6DuqcJGiwqd6GkqbJP9oLdmA34g7kc/ng=";
hash = "sha256-3C/gJejqfdT5pVNej2KlIdbOKZbYJY7jUFTfLsRoeQk=";
};
patches = [
# https://github.com/OSGeo/gdal/issues/12511
(fetchpatch {
url = "https://github.com/OSGeo/gdal/commit/1dd320b086606958fe970457a0640bdc4c4d494a.patch";
hash = "sha256-SXlNjgR4q7i3PrFfh/wzEFMrSGHQuB+ecXbGJgsROe0=";
})
(fetchpatch {
url = "https://github.com/OSGeo/gdal/commit/6da26aec591656f97fd882b07d37c21aabd06373.patch";
hash = "sha256-s70j/S9YKGRqxwrabsV3ePeGSsnDh/ouGLtLEm+z0lU=";
})
];
nativeBuildInputs = [
bison
cmake
+1 -1
View File
@@ -12,7 +12,7 @@ let
in
stdenv.mkDerivation rec {
pname = "immich-cli";
version = "2.2.90";
version = "2.2.92";
inherit (immich) src pnpmDeps;
postPatch = ''
+3 -3
View File
@@ -34,7 +34,7 @@
}:
let
pnpm = pnpm_10;
version = "1.142.1";
version = "1.143.1";
esbuild' = buildPackages.esbuild.override {
buildGoModule =
@@ -108,14 +108,14 @@ let
owner = "immich-app";
repo = "immich";
tag = "v${version}";
hash = "sha256-u538GWupnkH2K81Uk9yEuHc3pAeVexnJOnhWo7gElL0=";
hash = "sha256-lP/IrKV2B1Gq43jqVa1hIpx4HOJoiYBDUOvyTJB0t7k=";
};
pnpmDeps = pnpm.fetchDeps {
pname = "immich";
inherit version src;
fetcherVersion = 2;
hash = "sha256-aYG5SpFZxhbz32YAdP39RYwn2GV+mFWhddd4IFuPuz8=";
hash = "sha256-ShKgfsYc9n+B+NnSaJOSyLb4ev43ZsympYhRgPZtlxs=";
};
web = stdenv.mkDerivation {
+29 -13
View File
@@ -12,12 +12,12 @@
fixDarwinDylibNames,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libLAS";
version = "1.8.1";
src = fetchurl {
url = "https://download.osgeo.org/liblas/libLAS-${version}.tar.bz2";
url = "https://download.osgeo.org/liblas/libLAS-${finalAttrs.version}.tar.bz2";
sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
};
@@ -44,41 +44,57 @@ stdenv.mkDerivation rec {
url = "https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493.patch";
hash = "sha256-0zI0NvOt9C5BPrfAbgU1N1kj3rZFB7rf0KRj7yemyWI=";
})
(fetchpatch {
name = "set-macos-rpath-to-off-explicitly.patch";
url = "https://github.com/libLAS/libLAS/commit/ce9bc0da9e5d1eb8527259854aa826df062ed18e.patch";
hash = "sha256-Rse0p8bNgORNaw/EBbu0i2/iVmikFyeloJL8YkYarn0=";
})
(fetchpatch {
name = "fix-findLASZIP.patch";
url = "https://github.com/libLAS/libLAS/commit/be77a75f475ec8d59c0dae1c3c896289bcb5a287.patch";
hash = "sha256-5XDexk3IW7s2/G27GXkWp7cw1WZyQLMk/lTpfOM6PM0=";
})
];
# Disable setting of C++98 standard which was dropped in boost 1.84.0
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'set(CMAKE_CXX_FLAGS "''${CMAKE_CXX_FLAGS} -std=c++98 -ansi")' '#'
''
# Upstream libLAS still uses cmake_minimum_required(VERSION 2.8.11).
# This is not compatible with CMake 4, because support for CMake < 3.5 has been removed.
+ ''
substituteInPlace CMakeLists.txt \
--replace-fail 'cmake_minimum_required(VERSION 2.6.0)' 'cmake_minimum_required(VERSION 3.10)'
'';
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [
boost
libgeotiff
libtiff
# libLAS is currently not compatible with LASzip 3,
# see https://github.com/libLAS/libLAS/issues/144.
laszip_2
zlib
];
cmakeFlags = [
"-DWITH_LASZIP=ON"
# libLAS is currently not compatible with LASzip 3,
# see https://github.com/libLAS/libLAS/issues/144.
"-DLASZIP_INCLUDE_DIR=${laszip_2}/include"
"-DCMAKE_EXE_LINKER_FLAGS=-pthread"
(lib.cmakeBool "WITH_LASZIP" true)
(lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-pthread")
];
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib
'';
meta = with lib; {
meta = {
description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
homepage = "https://liblas.org";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ michelk ];
teams = [ teams.geospatial ];
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ michelk ];
teams = with lib.teams; [ geospatial ];
};
}
})
+2 -2
View File
@@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "mapserver";
version = "8.4.0";
version = "8.4.1";
src = fetchFromGitHub {
owner = "MapServer";
repo = "MapServer";
rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
hash = "sha256-XEjRklbvYV7UoVX12iW6s1mS8pzIljla488CQNuFfto=";
hash = "sha256-Q5PFOA/UGpDbzS0yROBOY6eXSgzx7nzSC+P109FrhvA=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -52,14 +52,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mkvtoolnix";
version = "94.0";
version = "95.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "mbunkus";
repo = "mkvtoolnix";
tag = "release-${finalAttrs.version}";
hash = "sha256-BEvb0+e1ugGPkj6MnX1uOvQ2k+zvlqLXFiBHFt3a5qw=";
hash = "sha256-FwOVqBHzgDveT8dGRfb2ONIAhCGEKU4UqpM3g7m0klA=";
};
passthru = {
+2 -2
View File
@@ -33,11 +33,11 @@
stdenv.mkDerivation rec {
pname = "saga";
version = "9.9.1";
version = "9.9.2";
src = fetchurl {
url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
hash = "sha256-InypyVCk08tsByKaIBRFWldwRz1AkNCgFD3DL4OG84w=";
hash = "sha256-fBnHootXNwdnB+TnBMS7U7oPWhs3p7cFvPVbAIwQCBE=";
};
sourceRoot = "saga-${version}/saga-gis";
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "shapelib";
version = "1.6.1";
version = "1.6.2";
src = fetchurl {
url = "https://download.osgeo.org/shapelib/shapelib-${version}.tar.gz";
hash = "sha256-XakKYOJUQPEI9OjpVzK/qD7eE8jgwrz4CuQQBsyOvCA=";
hash = "sha256-S3SjbO2U6ae+pAEVfmZK3cxb4lHn33+I1GdDYdoBLCE=";
};
doCheck = true;
+54 -54
View File
@@ -22,10 +22,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1d7z3fqanmzr6d99idvm2qj6lil2pxn5haxz7kb6f1x8fm88hfsv";
sha256 = "09bl9jk4pljv857n98nwy8icfwxj6pf931zdr1ddnb8xkpf7m59x";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
actionmailbox = {
dependencies = [
@@ -40,10 +40,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "098f12d19q64d0svzgz73w23mv2y3zmccryybp3hfi8gab14fsl9";
sha256 = "1vw72j49ycgr3gj29mv6747zvgxgpf4zja5z6w4wlxx8hlv4ly3z";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
actionmailer = {
dependencies = [
@@ -58,10 +58,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07xjqxmwif57wxz28ch10c3c2261ydv1x56vsiidg2icqciyaamh";
sha256 = "1rm6cch8r1zday0aasc52w3vc5gw64p1vx5vphzkrdzkjjq8lz6k";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
actionpack = {
dependencies = [
@@ -85,10 +85,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0d7pq6fsf041fvskzmqm12xcgk5m9d5fa6kbs1lsbmfbgc51dchp";
sha256 = "0vkar2bl3n5zz8jsa0rn937ixbpslfy1hqz80bfn101pzdpzklnc";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
actiontext = {
dependencies = [
@@ -103,10 +103,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1mphlcvnfba3gd1sydcrr2i7brfwlcbxjmwjpybvcx363bjcwsgk";
sha256 = "00dpw8ifngab7jfmd9h6lfr59c8c9fknp13invs7gw06y8y6504f";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
actionview = {
dependencies = [
@@ -125,10 +125,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "19arngl1nshasvbh90gzc23z1vpid2xzg3043grbmcfqyc68iz39";
sha256 = "01sv2s6drs8h34rag5q1bxrfilqk91zzi35wkkq5klgv2sbpxxjv";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
activejob = {
dependencies = [
@@ -139,10 +139,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0nryqb19i3frxhanykf6lmrw0rb09863z114gi7sm55kff2mmygj";
sha256 = "0mfbzar1h41w7a6i79v0y58xfpsbmis4zrpf67aj4h08c8w3h1p7";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
activemodel = {
dependencies = [ "activesupport" ];
@@ -150,10 +150,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643";
sha256 = "1pc4ffzs2ay4jddhvmsy10z9kxgyrkvf1n35kxr2bmr8y0dbk638";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
activerecord = {
dependencies = [
@@ -165,10 +165,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr";
sha256 = "0058rmkm9774jmx2pp45ppss33aqc22qm0ppv7zw7w8qj14y3cg6";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
activerecord-import = {
dependencies = [ "activerecord" ];
@@ -211,10 +211,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0psjqn03irbfk79x57ylaaaj83pqqcwy8b4mwrp6bmnljkzkbv5l";
sha256 = "0rmf162xsdl1885vnwg3s6mliawj6rf8gxiv7pl64cdhj70x0a0b";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
activesupport = {
dependencies = [
@@ -239,10 +239,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4";
sha256 = "1w5y2nm4v5q39ivh2a7lbw6zxz1q6lh6i3zvfbrz29wh7nxq8kn5";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
acts_as_list = {
dependencies = [
@@ -462,10 +462,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
type = "gem";
};
version = "0.4.0";
version = "0.4.1";
};
bigdecimal = {
groups = [
@@ -803,10 +803,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
type = "gem";
};
version = "2.5.0";
version = "2.5.3";
};
cose = {
dependencies = [
@@ -1004,10 +1004,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
type = "gem";
};
version = "2.2.1";
version = "2.2.3";
};
dry-cli = {
groups = [ "default" ];
@@ -1676,10 +1676,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y";
type = "gem";
};
version = "0.8.0";
version = "0.8.1";
};
irb = {
dependencies = [
@@ -1696,10 +1696,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r";
sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2";
type = "gem";
};
version = "1.15.1";
version = "1.15.2";
};
jmespath = {
groups = [ "default" ];
@@ -1879,10 +1879,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
type = "gem";
};
version = "2.24.0";
version = "2.24.1";
};
macaddr = {
dependencies = [ "systemu" ];
@@ -2034,10 +2034,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
type = "gem";
};
version = "5.25.4";
version = "5.25.5";
};
msgpack = {
groups = [ "default" ];
@@ -2152,10 +2152,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14zmzjy2sp87ac6iygkk3pz9snjvx4ks681vg4gxz8x8q7gmzajj";
sha256 = "1z1kpshd0r09jv0091bcr4gfx3i1psbqdzy7zyag5n8v3qr0anfr";
type = "gem";
};
version = "0.5.8";
version = "0.5.9";
};
net-ldap = {
groups = [ "default" ];
@@ -2808,10 +2808,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1";
type = "gem";
};
version = "5.2.3";
version = "5.2.6";
};
public_suffix = {
groups = [
@@ -2893,10 +2893,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lzd5skqw31k3cg3cvgbqfj42rm4llym2bwb74l7y224ldk5s6bn";
sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
type = "gem";
};
version = "2.2.14";
version = "2.2.17";
};
rack-attack = {
dependencies = [ "rack" ];
@@ -3022,10 +3022,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0h5vr7wd15s4zlhrnrm97b1h5bjdlcd5lvh6x2sl6khgnh21dnxf";
sha256 = "15yadsrxn8hf5clgrb7m8q1vdmfs5pwpa9bn1b9ya1b9brngi3zk";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
rails-controller-testing = {
dependencies = [
@@ -3103,10 +3103,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07zy8b88qxx493pc5sfkzvxqj3zcf363r1128n3hsvfx2vqipwg3";
sha256 = "1q39j3n116wsa7nrn3xmabxcwazlv8779m2v9djcbqkvkg90cxa5";
type = "gem";
};
version = "7.2.2.1";
version = "7.2.2.2";
};
rainbow = {
groups = [
@@ -3225,10 +3225,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp";
sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x";
type = "gem";
};
version = "0.6.0";
version = "0.6.2";
};
rexml = {
groups = [
@@ -3239,10 +3239,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
type = "gem";
};
version = "3.4.1";
version = "3.4.4";
};
rotp = {
groups = [ "default" ];
@@ -3861,10 +3861,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0";
sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v";
type = "gem";
};
version = "3.1.2";
version = "3.1.7";
};
swd = {
dependencies = [
@@ -4417,10 +4417,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89";
sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
type = "gem";
};
version = "2.7.1";
version = "2.7.3";
};
zendesk_api = {
dependencies = [
+1 -1
View File
@@ -20,7 +20,7 @@
let
pname = "zammad";
version = "6.5.1";
version = "6.5.2";
src = applyPatches {
src = fetchFromGitHub (lib.importJSON ./source.json);
+2 -2
View File
@@ -1,8 +1,8 @@
{
"owner": "zammad",
"repo": "zammad",
"rev": "e55bdaf93d52ff4552ddd2af1bebf168b8faeffa",
"hash": "sha256-sx/FJ/bT7Buv5/QvUJhJbKtywNrmkfYVnzVNzBi9OXo=",
"rev": "700e2fa128e3778783d3d299e20fae6c84a43537",
"hash": "sha256-MeH9xe/wjmc6wHp71z+VH5twQbrjBvobu9zltgXeVJ8=",
"fetchSubmodules": true
}
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyezvizapi";
version = "1.0.1.7";
version = "1.0.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "RenierM26";
repo = "pyEzvizApi";
tag = version;
hash = "sha256-bcgy8NBW+AQDYHYo+E+7studQK6/6UgjkT75URyzSi0=";
hash = "sha256-kfaOP/VKY4ZzmipY9REXtbVSCOD6U+/eBhDntfGrsQA=";
};
build-system = [ setuptools ];
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pystac";
version = "1.14.0";
version = "1.14.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "stac-utils";
repo = "pystac";
tag = "v${version}";
hash = "sha256-gYyoVgJIXhT26a57kQfMT5bV+eUNZiNE8FEPpNrJeNM=";
hash = "sha256-k2w/Se/XdPLZQ69TQkIomPsI6uiM+dO2H2HQ3fvPyF0=";
};
build-system = [ setuptools ];