lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
879976f6 a4e2dd0f

+454 -353
+39 -45
nixos/modules/services/x11/xserver.nix
··· 364 364 ''; 365 365 }; 366 366 367 - xkb = mkOption { 368 - default = { }; 369 - description = "X keyboard extension (XKB) configuration"; 370 - type = types.submodule { 371 - options = { 372 - layout = mkOption { 373 - type = types.str; 374 - default = "us"; 375 - description = lib.mdDoc '' 376 - Keyboard layout, or multiple keyboard layouts separated by commas. 377 - ''; 378 - }; 367 + xkb = { 368 + layout = mkOption { 369 + type = types.str; 370 + default = "us"; 371 + description = lib.mdDoc '' 372 + X keyboard layout, or multiple keyboard layouts separated by commas. 373 + ''; 374 + }; 379 375 380 - model = mkOption { 381 - type = types.str; 382 - default = "pc104"; 383 - example = "presario"; 384 - description = lib.mdDoc '' 385 - Keyboard model. 386 - ''; 387 - }; 376 + model = mkOption { 377 + type = types.str; 378 + default = "pc104"; 379 + example = "presario"; 380 + description = lib.mdDoc '' 381 + X keyboard model. 382 + ''; 383 + }; 388 384 389 - options = mkOption { 390 - type = types.commas; 391 - default = "terminate:ctrl_alt_bksp"; 392 - example = "grp:caps_toggle,grp_led:scroll"; 393 - description = lib.mdDoc '' 394 - X keyboard options; layout switching goes here. 395 - ''; 396 - }; 385 + options = mkOption { 386 + type = types.commas; 387 + default = "terminate:ctrl_alt_bksp"; 388 + example = "grp:caps_toggle,grp_led:scroll"; 389 + description = lib.mdDoc '' 390 + X keyboard options; layout switching goes here. 391 + ''; 392 + }; 397 393 398 - variant = mkOption { 399 - type = types.str; 400 - default = ""; 401 - example = "colemak"; 402 - description = lib.mdDoc '' 403 - X keyboard variant. 404 - ''; 405 - }; 394 + variant = mkOption { 395 + type = types.str; 396 + default = ""; 397 + example = "colemak"; 398 + description = lib.mdDoc '' 399 + X keyboard variant. 400 + ''; 401 + }; 406 402 407 - dir = mkOption { 408 - type = types.path; 409 - default = "${pkgs.xkeyboard_config}/etc/X11/xkb"; 410 - defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"''; 411 - description = lib.mdDoc '' 412 - Path used for -xkbdir xserver parameter. 413 - ''; 414 - }; 415 - }; 403 + dir = mkOption { 404 + type = types.path; 405 + default = "${pkgs.xkeyboard_config}/etc/X11/xkb"; 406 + defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"''; 407 + description = lib.mdDoc '' 408 + Path used for -xkbdir xserver parameter. 409 + ''; 416 410 }; 417 411 }; 418 412
-2
nixos/modules/tasks/network-interfaces-scripted.nix
··· 61 61 MACAddress = i.macAddress; 62 62 } // optionalAttrs (i.mtu != null) { 63 63 MTUBytes = toString i.mtu; 64 - } // optionalAttrs (i.wakeOnLan.enable == true) { 65 - WakeOnLan = concatStringsSep " " i.wakeOnLan.policy; 66 64 }; 67 65 }; 68 66 in listToAttrs (map createNetworkLink interfaces);
+10
nixos/modules/tasks/network-interfaces.nix
··· 1463 1463 ] 1464 1464 ++ bridgeStp; 1465 1465 1466 + # Wake-on-LAN configuration is shared by the scripted and networkd backends. 1467 + systemd.network.links = pipe interfaces [ 1468 + (filter (i: i.wakeOnLan.enable)) 1469 + (map (i: nameValuePair "40-${i.name}" { 1470 + matchConfig.OriginalName = i.name; 1471 + linkConfig.WakeOnLan = concatStringsSep " " i.wakeOnLan.policy; 1472 + })) 1473 + listToAttrs 1474 + ]; 1475 + 1466 1476 # The network-interfaces target is kept for backwards compatibility. 1467 1477 # New modules must NOT use it. 1468 1478 systemd.targets.network-interfaces =
+9 -2
nixos/release-combined.nix
··· 67 67 (onSystems ["x86_64-linux"] "nixos.tests.docker") 68 68 (onFullSupported "nixos.tests.ecryptfs") 69 69 (onFullSupported "nixos.tests.env") 70 - (onFullSupported "nixos.tests.firefox-esr") 71 - (onFullSupported "nixos.tests.firefox") 70 + 71 + # Way too many manual retries required on Hydra. 72 + # Apparently it's hard to track down the cause. 73 + # So let's depend just on the packages for now. 74 + #(onFullSupported "nixos.tests.firefox-esr") 75 + #(onFullSupported "nixos.tests.firefox") 76 + (onFullSupported "nixpkgs.firefox-esr") 77 + (onFullSupported "nixpkgs.firefox") 78 + 72 79 (onFullSupported "nixos.tests.firewall") 73 80 (onFullSupported "nixos.tests.fontconfig-default-fonts") 74 81 (onFullSupported "nixos.tests.gnome")
+2 -2
pkgs/applications/audio/lsp-plugins/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "lsp-plugins"; 8 - version = "1.2.11"; 8 + version = "1.2.12"; 9 9 10 10 src = fetchurl { 11 11 url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; 12 - sha256 = "sha256-9zLs1J7rZkMaVQxOwihjCsKSLyb9q64pTZLVg/UVf2o="; 12 + sha256 = "sha256-a3ts+7wiEwcoLPj6KsfP9lvTNTDSr9t+qEujSgpotXo="; 13 13 }; 14 14 15 15 outputs = [ "out" "dev" "doc" ];
+76 -48
pkgs/applications/blockchains/exodus/default.nix
··· 1 - { stdenv, lib, fetchzip, glib, systemd, nss, nspr, gtk3-x11, pango, 2 - atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsa-lib, dbus, at-spi2-atk, 3 - cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: 1 + { stdenv 2 + , lib 3 + , requireFile 4 + , unzip 5 + , glib 6 + , systemd 7 + , nss 8 + , nspr 9 + , gtk3-x11 10 + , pango 11 + , atk 12 + , cairo 13 + , gdk-pixbuf 14 + , xorg 15 + , xorg_sys_opengl 16 + , util-linux 17 + , alsa-lib 18 + , dbus 19 + , at-spi2-atk 20 + , cups 21 + , vivaldi-ffmpeg-codecs 22 + , libpulseaudio 23 + , at-spi2-core 24 + , libxkbcommon 25 + , mesa 26 + }: 4 27 5 28 stdenv.mkDerivation rec { 6 29 pname = "exodus"; 7 - version = "23.5.22"; 30 + version = "23.9.25"; 8 31 9 - src = fetchzip { 32 + src = requireFile { 33 + name = "exodus-linux-x64-${version}.zip"; 10 34 url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; 11 - sha256 = "sha256-CZuT0nlKyF7LRGqNezm98MHcQa2Uhd8y+NiKE5mi0jk="; 35 + sha256 = "a3e314de257e1ec01baa1023886f327ade4b233d833f7fe79f6c3e0f26d07ced"; 12 36 }; 37 + 38 + nativeBuildInputs = [ unzip ]; 13 39 14 40 installPhase = '' 15 41 mkdir -p $out/bin $out/share/applications ··· 24 50 dontPatchELF = true; 25 51 dontBuild = true; 26 52 27 - preFixup = let 28 - libPath = lib.makeLibraryPath [ 29 - glib 30 - nss 31 - nspr 32 - gtk3-x11 33 - pango 34 - atk 35 - cairo 36 - gdk-pixbuf 37 - xorg.libX11 38 - xorg.libxcb 39 - xorg.libXcomposite 40 - xorg.libXcursor 41 - xorg.libXdamage 42 - xorg.libXext 43 - xorg.libXfixes 44 - xorg.libXi 45 - xorg.libXrender 46 - xorg.libxshmfence 47 - xorg.libXtst 48 - xorg_sys_opengl 49 - util-linux 50 - xorg.libXrandr 51 - xorg.libXScrnSaver 52 - alsa-lib 53 - dbus.lib 54 - at-spi2-atk 55 - at-spi2-core 56 - cups.lib 57 - libpulseaudio 58 - systemd 59 - vivaldi-ffmpeg-codecs 60 - libxkbcommon 61 - mesa 62 - ]; 63 - in '' 64 - patchelf \ 65 - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 66 - --set-rpath "${libPath}" \ 67 - $out/Exodus 68 - ''; 53 + preFixup = 54 + let 55 + libPath = lib.makeLibraryPath [ 56 + glib 57 + nss 58 + nspr 59 + gtk3-x11 60 + pango 61 + atk 62 + cairo 63 + gdk-pixbuf 64 + xorg.libX11 65 + xorg.libxcb 66 + xorg.libXcomposite 67 + xorg.libXcursor 68 + xorg.libXdamage 69 + xorg.libXext 70 + xorg.libXfixes 71 + xorg.libXi 72 + xorg.libXrender 73 + xorg.libxshmfence 74 + xorg.libXtst 75 + xorg_sys_opengl 76 + util-linux 77 + xorg.libXrandr 78 + xorg.libXScrnSaver 79 + alsa-lib 80 + dbus.lib 81 + at-spi2-atk 82 + at-spi2-core 83 + cups.lib 84 + libpulseaudio 85 + systemd 86 + vivaldi-ffmpeg-codecs 87 + libxkbcommon 88 + mesa 89 + ]; 90 + in 91 + '' 92 + patchelf \ 93 + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 94 + --set-rpath "${libPath}" \ 95 + $out/Exodus 96 + ''; 69 97 70 98 meta = with lib; { 71 99 homepage = "https://www.exodus.io/";
+25 -13
pkgs/applications/editors/jetbrains/default.nix
··· 17 17 , expat 18 18 , libxcrypt-legacy 19 19 , fontconfig 20 + , libxml2 21 + , xz 20 22 , vmopts ? null 21 23 }: 22 24 23 25 let 24 26 platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; 25 - ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; 27 + ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" "aarch64-linux" ]; 26 28 27 29 inherit (stdenv.hostPlatform) system; 28 30 ··· 58 60 openssl.out 59 61 expat 60 62 libxcrypt-legacy 63 + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ 64 + libxml2 65 + xz 61 66 ]; 62 67 dontAutoPatchelf = true; 63 68 postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ··· 65 70 cd $out/clion 66 71 67 72 # I think the included gdb has a couple of patches, so we patch it instead of replacing 68 - ls -d $PWD/bin/gdb/linux/x64/lib/python3.8/lib-dynload/* | 73 + ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | 69 74 xargs patchelf \ 70 75 --replace-needed libssl.so.10 libssl.so \ 71 76 --replace-needed libcrypto.so.10 libcrypto.so 72 77 73 - ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | 78 + ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | 74 79 xargs patchelf \ 75 80 --replace-needed libssl.so.10 libssl.so \ 76 81 --replace-needed libcrypto.so.10 libcrypto.so ··· 271 276 buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ 272 277 stdenv.cc.cc 273 278 zlib 274 - fontconfig # plugins/dotTrace/DotFiles/linux-x64/libSkiaSharp.so 279 + fontconfig # plugins/dotTrace/DotFiles/linux-*/libSkiaSharp.so 275 280 ]; 276 281 dontAutoPatchelf = true; 277 282 postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ··· 279 284 cd $out/rider 280 285 281 286 # Remove dotnet copy first so it's not considered by autoPatchElf 282 - rm -rf lib/ReSharperHost/linux-x64/dotnet 287 + rm -rf lib/ReSharperHost/linux-*/dotnet 283 288 autoPatchelf \ 284 - lib/ReSharperHost/linux-x64/ \ 285 - plugins/dotCommon/DotFiles/linux-x64/ \ 286 - plugins/dotTrace/DotFiles/linux-x64/ 287 - ln -s ${dotnet-sdk_7} lib/ReSharperHost/linux-x64/dotnet 289 + lib/ReSharperHost/linux-*/ \ 290 + plugins/dotCommon/DotFiles/linux-*/ \ 291 + plugins/dotTrace/DotFiles/linux-*/ 292 + 293 + for dir in lib/ReSharperHost/linux-*; do 294 + ln -s ${dotnet-sdk_7} $dir/dotnet 295 + done 288 296 ) 289 297 ''; 290 298 }); ··· 320 328 libdbusmenu 321 329 openssl.out 322 330 libxcrypt-legacy 331 + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ 332 + expat 333 + libxml2 334 + xz 323 335 ]; 324 336 dontAutoPatchelf = true; 325 337 postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ··· 327 339 cd $out/rust-rover 328 340 329 341 # Copied over from clion (gdb seems to have a couple of patches) 330 - ls -d $PWD/bin/gdb/linux/x64/lib/python3.8/lib-dynload/* | 342 + ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | 331 343 xargs patchelf \ 332 344 --replace-needed libssl.so.10 libssl.so \ 333 345 --replace-needed libcrypto.so.10 libcrypto.so 334 346 335 - ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | 347 + ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | 336 348 xargs patchelf \ 337 349 --replace-needed libssl.so.10 libssl.so \ 338 350 --replace-needed libcrypto.so.10 libcrypto.so ··· 340 352 autoPatchelf $PWD/bin 341 353 342 354 interp="$(cat $NIX_CC/nix-support/dynamic-linker)" 343 - patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper 344 - chmod +x $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper 355 + patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper 356 + chmod +x $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper 345 357 ) 346 358 ''; 347 359 });
+3 -3
pkgs/applications/graphics/lutgen/default.nix
··· 5 5 6 6 rustPlatform.buildRustPackage rec { 7 7 pname = "lutgen"; 8 - version = "0.8.3"; 8 + version = "0.9.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "ozwaldorf"; 12 12 repo = "lutgen-rs"; 13 13 rev = "v${version}"; 14 - hash = "sha256-9olBUPOi6ZQorgPxQX2lqZSlYjEPMwfhUF/Ze34v0nc="; 14 + hash = "sha256-tKSPk0V11pnKFV4E08H4CUnjw9nAonTRI6W3mGipd9I="; 15 15 }; 16 16 17 - cargoHash = "sha256-hMbrzjfLSawrm+GmtLx7sQ7atr1aV2RU9rJXgun6HR8="; 17 + cargoHash = "sha256-DiorrgTH9lIdmaZL7451uCXj9X7M6eHf4MQc85MpU7s="; 18 18 19 19 meta = with lib; { 20 20 description = "A blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes";
+1
pkgs/applications/misc/llpp/default.nix
··· 20 20 url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps.patch?h=llpp&id=0d2913056aaf3dbf7431e57b7b08b55568ba076c"; 21 21 hash = "sha256-t9PLXsM8+exCeYqJBe0LSDK0D2rpktmozS8qNcEAcHo="; 22 22 }) 23 + ./fix-mupdf.patch 23 24 ]; 24 25 25 26 postPatch = ''
-80
pkgs/applications/misc/llpp/fix-build-bash.patch
··· 1 - diff --git a/build.bash b/build.bash 2 - index 7c278b6..41494c5 100755 3 - with manual adjustments 4 - --- a/build.bash 5 - +++ b/build.bash 6 - @@ -30,7 +30,6 @@ srcd="$(dirname $0)" 7 - mudir=$outd/mupdf 8 - muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" 9 - 10 - -test -d "$mudir" || die muPDF not found, consult $(dirname $0)/BUILDING 11 - 12 - mkdir -p $outd/{$wsid,lablGL} 13 - :>$outd/ordered 14 - @@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } 15 - mulibst="$mudir/build/$mbt/libs" 16 - mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a" 17 - 18 - -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" 19 - -isfresh "$mulibst" "$(eval $keycmd)" || ( 20 - - make -C "$mudir" build=$mbt -j $mjobs libs 21 - - eval $keycmd >${mulibst}.past 22 - -) && vecho "fresh mupdf" 23 - - 24 - oincs() { 25 - local i= 26 - local incs1= 27 - @@ -100,35 +93,6 @@ mflags() { 28 - } 29 - 30 - overs="$(ocamlc -vnum 2>/dev/null)" || overs="" 31 - -test "$overs" = "4.11.1" || { 32 - - url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz 33 - - txz=$outd/$(basename $url) 34 - - keycmd="printf $url; digest $txz;" 35 - - isfresh $txz "$(eval $keycmd)" || { 36 - - executable_p() { command -v "$1" >/dev/null 2>&1; } 37 - - if executable_p wget; then dl() { wget -q "$1" -O "$2"; } 38 - - elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } 39 - - else die "no program to fetch remote urls found" 40 - - fi 41 - - dl $url $txz 42 - - eval $keycmd >$txz.past 43 - - } && vecho "fresh $txz" 44 - - absprefix=$(cd $outd &>/dev/null; pwd -P) 45 - - export PATH=$absprefix/bin:$PATH 46 - - ocamlc=$absprefix/bin/ocamlc 47 - - keycmd="printf $url; digest $ocamlc;" 48 - - isfresh $ocamlc "$(eval $keycmd)" || ( 49 - - tar xf $txz -C $outd 50 - - bn=$(basename $url) 51 - - cd $outd/${bn%.tar.xz} 52 - - ./configure --disable-ocamldoc --disable-ocamltest \ 53 - - --enable-debugger=no --prefix=$absprefix 54 - - make -j $mjobs world 55 - - make install 56 - - eval $keycmd >$absprefix/bin/ocamlc.past 57 - - ) && vecho "fresh ocamlc" 58 - - overs=$(ocamlc -vnum 2>/dev/null) 59 - -} 60 - 61 - ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ 62 - { read _ c; echo $c; })} 63 - @@ -243,7 +208,7 @@ bobjc() { 64 - } && vecho "fresh $o" 65 - } 66 - 67 - -ver=$(cd $srcd && git describe --tags --dirty) || ver=unknown 68 - +ver=@version@ 69 - 70 - cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" 71 - keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" 72 - @@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do 73 - done 74 - 75 - libs="str.cma unix.cma" 76 - -clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" 77 - +clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz" 78 - if $darwin; then 79 - mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) 80 - clibs="$clibs -framework Cocoa -framework OpenGL"
+13
pkgs/applications/misc/llpp/fix-mupdf.patch
··· 1 + --- a/link.c 2 + +++ b/link.c 3 + @@ -1522,8 +1522,9 @@ static void *mainloop (void UNUSED_ATTR *unused) 4 + if (pdf && nameddest && *nameddest) { 5 + fz_point xy; 6 + struct pagedim *pdim; 7 + - int pageno = pdf_lookup_anchor (state.ctx, pdf, nameddest, 8 + + fz_location location = fz_resolve_link (state.ctx, state.doc, nameddest, 9 + &xy.x, &xy.y); 10 + + int pageno = location.page; 11 + pdim = pdimofpageno (pageno); 12 + xy = fz_transform_point (xy, pdim->ctm); 13 + printd ("a %d %d %d", pageno, (int) xy.x, (int) xy.y);
+19 -15
pkgs/applications/misc/merkaartor/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , fetchpatch 5 - , qmake 5 + , cmake 6 + , pkg-config 6 7 , qttools 7 8 , wrapQtAppsHook 8 9 , gdal ··· 32 33 url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch"; 33 34 hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo="; 34 35 }) 36 + # https://github.com/openstreetmap/merkaartor/pull/290 37 + (fetchpatch { 38 + url = "https://github.com/openstreetmap/merkaartor/commit/7dede77370d89e8e7586f6ed5af225f9b5bde6cf.patch"; 39 + hash = "sha256-3oDRPysVNvA50t/b9xOcVQgac3U1lDPrencanl4c6Zk="; 40 + }) 35 41 ]; 36 42 37 - nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; 43 + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; 38 44 39 45 buildInputs = [ gdal proj qtsvg qtwebengine ] 40 46 ++ lib.optional withGeoimage exiv2 ··· 42 48 ++ lib.optional withLibproxy libproxy 43 49 ++ lib.optional withZbar zbar; 44 50 45 - preConfigure = '' 46 - lrelease src/src.pro 47 - ''; 48 - 49 - qmakeFlags = [ 50 - "USEWEBENGINE=1" 51 - ] ++ lib.optional withGeoimage "GEOIMAGE=1" 52 - ++ lib.optional withGpsdlib "GPSDLIB=1" 53 - ++ lib.optional withLibproxy "LIBPROXY=1" 54 - ++ lib.optional withZbar "ZBAR=1"; 51 + cmakeFlags = [ 52 + (lib.cmakeBool "GEOIMAGE" withGeoimage) 53 + (lib.cmakeBool "GPSD" withGpsdlib) 54 + (lib.cmakeBool "LIBPROXY" withLibproxy) 55 + (lib.cmakeBool "WEBENGINE" true) 56 + (lib.cmakeBool "ZBAR" withZbar) 57 + ]; 55 58 56 59 postInstall = lib.optionalString stdenv.isDarwin '' 57 - mkdir -p $out/Applications 58 - mv binaries/bin/merkaartor.app $out/Applications 59 - mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents 60 + mkdir -p $out/{Applications,bin} 61 + mv $out/merkaartor.app $out/Applications 62 + makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor 60 63 ''; 61 64 62 65 meta = with lib; { 63 66 description = "OpenStreetMap editor"; 64 67 homepage = "http://merkaartor.be/"; 65 68 license = licenses.gpl2Plus; 69 + mainProgram = "merkaartor"; 66 70 maintainers = with maintainers; [ sikmir ]; 67 71 platforms = platforms.unix; 68 72 };
+6 -6
pkgs/applications/networking/browsers/microsoft-edge/default.nix
··· 1 1 { 2 2 stable = import ./browser.nix { 3 3 channel = "stable"; 4 - version = "117.0.2045.47"; 4 + version = "118.0.2088.46"; 5 5 revision = "1"; 6 - sha256 = "sha256-h4iw+H8f62JEih1tWTpjxNC9+wu3hHQOM2VJid1kHNQ="; 6 + sha256 = "sha256-/3lo/y/LhAmGqiOhZgDoJVS+c2631NB/Z/lBNFunU30="; 7 7 }; 8 8 beta = import ./browser.nix { 9 9 channel = "beta"; 10 - version = "118.0.2088.17"; 10 + version = "118.0.2088.46"; 11 11 revision = "1"; 12 - sha256 = "sha256-3Z37M2ZQRJ5uA7NcinMlF1XEsYVv9A+ppPZZf34ye6Q="; 12 + sha256 = "sha256-u0w7COYoAgcpqVEsB0t27iMD2AGVYFCJyE72uWKIY70="; 13 13 }; 14 14 dev = import ./browser.nix { 15 15 channel = "dev"; 16 - version = "119.0.2116.0"; 16 + version = "119.0.2151.2"; 17 17 revision = "1"; 18 - sha256 = "sha256-raLRFSHZyHaxKi6EG62VIbcW29HTjTnBFw7IJFVbm5I="; 18 + sha256 = "sha256-42wbnA9i1FdBq14Y+xxstAe9ciWDzEBVMULCSURQzj0="; 19 19 }; 20 20 }
+3 -3
pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
··· 1 1 { lib, callPackage, stdenvNoCC }: 2 2 let 3 3 pname = "caprine"; 4 - version = "2.58.3"; 4 + version = "2.59.1"; 5 5 metaCommon = with lib; { 6 6 description = "An elegant Facebook Messenger desktop app"; 7 7 homepage = "https://sindresorhus.com/caprine"; ··· 10 10 }; 11 11 x86_64-appimage = callPackage ./build-from-appimage.nix { 12 12 inherit pname version metaCommon; 13 - sha256 = "sha256-w0nBQhHYzFLsNu0MxWhoju6fh4JpAKC7MWWVxwDkRYk="; 13 + sha256 = "sha256-stMv4KQoWPmK5jcfdhamC27Rb51zjbeEn40u6YUvXz4="; 14 14 }; 15 15 x86_64-dmg = callPackage ./build-from-dmg.nix { 16 16 inherit pname version metaCommon; 17 - sha256 = "sha256-6Mx2ZkT2hdnaSVt2hKMMV9xc7rYPFFbxcj6vb84ojYU="; 17 + sha256 = "sha256-WMT4yrLjDSMsI/lFbYODu3/0whcF+++4ShoChfMyLfQ="; 18 18 }; 19 19 in 20 20 (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {
+2 -2
pkgs/applications/networking/p2p/pyrosimple/default.nix
··· 10 10 11 11 python3.pkgs.buildPythonApplication rec { 12 12 pname = "pyrosimple"; 13 - version = "2.11.3"; 13 + version = "2.11.4"; 14 14 format = "pyproject"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "kannibalox"; 18 18 repo = pname; 19 19 rev = "refs/tags/v${version}"; 20 - hash = "sha256-P12Tx9lEGp9OINL6vJIdyL3+pJbR/uaYe8k7v9kSz/A="; 20 + hash = "sha256-jzLckRFdjivWcyM3NWSVBauT5/7A1jTICtK2j65Wojo="; 21 21 }; 22 22 23 23 pythonRelaxDeps = [
+2 -2
pkgs/applications/science/biology/bowtie2/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "bowtie2"; 5 - version = "2.5.1"; 5 + version = "2.5.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "BenLangmead"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-HaiZmWU6akHXJVWBmCvkG2E61NDrAP7UIxx9DNCEZqE="; 11 + sha256 = "sha256-Bem4SHY/74suZPDbw/rwKMLBn3bRq5ooHbBoVnKuYk0="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ];
+3 -3
pkgs/applications/virtualization/lima/default.nix
··· 11 11 12 12 buildGoModule rec { 13 13 pname = "lima"; 14 - version = "0.17.2"; 14 + version = "0.18.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "lima-vm"; 18 18 repo = pname; 19 19 rev = "v${version}"; 20 - sha256 = "sha256-0yWQhyDSDGZT6K/SeVntTdqnDzyGD244+r5kG1MFh1c="; 20 + sha256 = "sha256-sOOpqgEvDBVvD/o1wFL3ebqWw0XpSdEqY8cZmtdXyxE="; 21 21 }; 22 22 23 - vendorHash = "sha256-yA6qwnbRFR/V2Aaf53jLTejPKuNzbod2dVnLEQLoQkM="; 23 + vendorHash = "sha256-vJlnptEja3nBfj/c1hSZjY9DZPQ970ZIMnHBPndd2vQ="; 24 24 25 25 nativeBuildInputs = [ makeWrapper installShellFiles ] 26 26 ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];
+69
pkgs/by-name/co/codeium/package.nix
··· 1 + { stdenv, lib, fetchurl, gzip, autoPatchelfHook }: 2 + let 3 + 4 + inherit (stdenv.hostPlatform) system; 5 + throwSystem = throw "Unsupported system: ${system}"; 6 + 7 + plat = { 8 + x86_64-linux = "linux_x64"; 9 + aarch64-linux = "linux_arm"; 10 + x86_64-darwin = "macos_x64"; 11 + aarch64-darwin = "macos_arm"; 12 + 13 + }.${system} or throwSystem; 14 + 15 + hash = { 16 + x86_64-linux = "sha256-9EGoJ5DoGgVfbhCDeTvn1D7misJEj9jPwuiOK7z95Ts="; 17 + aarch64-linux = "sha256-lO0YOSiO8AUrkbV+3Uyvg6p3bdAcTze3La2g5IcK1f0="; 18 + x86_64-darwin = "sha256-WjvC3pt8Gd4q+BzrOhyGeYwZIbv2m5O3pSXe1N7Najw="; 19 + aarch64-darwin = "sha256-IRm5m/Jaf4pmAzx+MXwmHLejo6Gv2OL56R1IEr/NlZU="; 20 + }.${system} or throwSystem; 21 + 22 + bin = "$out/bin/codeium_language_server"; 23 + 24 + in 25 + stdenv.mkDerivation (finalAttrs: { 26 + pname = "codeium"; 27 + version = "1.2.104"; 28 + src = fetchurl { 29 + name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; 30 + url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; 31 + inherit hash; 32 + }; 33 + 34 + nativeBuildInputs = [ gzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; 35 + 36 + dontUnpack = true; 37 + dontConfigure = true; 38 + dontBuild = true; 39 + 40 + installPhase = '' 41 + runHook preInstall 42 + mkdir -p $out/bin 43 + gzip -dc $src > ${bin} 44 + chmod +x ${bin} 45 + runHook postInstall 46 + ''; 47 + 48 + passthru.updateScript = ./update.sh; 49 + 50 + meta = rec { 51 + description = "Codeium language server"; 52 + longDescription = '' 53 + Codeium proprietary language server, patched for Nix(OS) compatibility. 54 + bin/language_server_x must be symlinked into the plugin directory, replacing the existing binary. 55 + For example: 56 + ```shell 57 + ln -s "$(which codeium_language_server)" /home/a/.local/share/JetBrains/Rider2023.1/codeium/662505c9b23342478d971f66a530cd102ae35df7/language_server_linux_x64 58 + ``` 59 + ''; 60 + homepage = "https://codeium.com/"; 61 + downloadPage = homepage; 62 + changelog = homepage; 63 + license = lib.licenses.unfree; 64 + maintainers = with lib.maintainers; [ anpin ]; 65 + mainProgram = "codeium"; 66 + platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; 67 + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; 68 + }; 69 + })
+35
pkgs/by-name/co/codeium/update.sh
··· 1 + #!/usr/bin/env nix-shell 2 + #!nix-shell -i bash -p curl gnused gawk nix-prefetch jq 3 + 4 + set -euo pipefail 5 + 6 + ROOT="$(dirname "$(readlink -f "$0")")" 7 + NIX_DRV="$ROOT/package.nix" 8 + if [ ! -f "$NIX_DRV" ]; then 9 + echo "ERROR: cannot find package.nix in $ROOT" 10 + exit 1 11 + fi 12 + 13 + fetch_arch() { 14 + VER="$1"; ARCH="$2" 15 + URL="https://github.com/Exafunction/codeium/releases/download/language-server-v${VER}/language_server_${ARCH}.gz" 16 + nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")" 17 + } 18 + 19 + replace_hash() { 20 + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" 21 + } 22 + 23 + CODEIUM_VER=$(curl -s "https://api.github.com/repos/Exafunction/codeium/releases/latest" | jq -r .tag_name | grep -oP '\d+\.\d+\.\d+' ) 24 + 25 + CODEIUM_LINUX_X64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_x64") 26 + CODEIUM_LINUX_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_arm") 27 + CODEIUM_DARWIN_X64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_x64") 28 + CODEIUM_DARWIN_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_arm") 29 + 30 + sed -i "s/version = \".*\"/version = \"$CODEIUM_VER\"/" "$NIX_DRV" 31 + 32 + replace_hash "x86_64-linux" "$CODEIUM_LINUX_X64_HASH" 33 + replace_hash "aarch64-linux" "$CODEIUM_LINUX_AARCH64_HASH" 34 + replace_hash "x86_64-darwin" "$CODEIUM_DARWIN_X64_HASH" 35 + replace_hash "aarch64-darwin" "$CODEIUM_DARWIN_AARCH64_HASH"
+37
pkgs/by-name/gu/guile-lzlib/package.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , autoreconfHook 5 + , guile 6 + , pkg-config 7 + , texinfo 8 + , lzlib 9 + }: 10 + 11 + stdenv.mkDerivation rec { 12 + pname = "guile-lzlib"; 13 + version = "0.0.2"; 14 + 15 + src = fetchurl { 16 + url = "https://notabug.org/guile-lzlib/guile-lzlib/archive/${version}.tar.gz"; 17 + hash = "sha256-hiPbd9RH57n/v8vCiDkOcGprGomxFx2u1gh0z+x+T4c="; 18 + }; 19 + 20 + strictDeps = true; 21 + 22 + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; 23 + propagatedBuildInputs = [ guile lzlib ]; 24 + 25 + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; 26 + 27 + # tests fail on darwin 28 + doCheck = !stdenv.isDarwin; 29 + 30 + meta = with lib; { 31 + description = "A GNU Guile library providing bindings to lzlib"; 32 + homepage = "https://notabug.org/guile-lzlib/guile-lzlib"; 33 + license = licenses.gpl3Plus; 34 + maintainers = with maintainers; [ foo-dogsquared ]; 35 + platforms = guile.meta.platforms; 36 + }; 37 + }
+2 -2
pkgs/by-name/or/orchard/package.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "orchard"; 5 - version = "0.13.1"; 5 + version = "0.14.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "cirruslabs"; 9 9 repo = pname; 10 10 rev = version; 11 - hash = "sha256-b9AHsyMiR3gTXGRbmIUX9uSd7u3dFoUZ/CtKrYpuzno="; 11 + hash = "sha256-u4aGjEkQ9H7caW2Y5ZbiGhCV47I0Afi5NC/apJB5qvU="; 12 12 # populate values that require us to use git. By doing this in postFetch we 13 13 # can delete .git afterwards and maintain better reproducibility of the src. 14 14 leaveDotGit = true;
+3 -3
pkgs/by-name/ui/uiua/package.nix
··· 14 14 15 15 rustPlatform.buildRustPackage rec { 16 16 pname = "uiua"; 17 - version = "0.0.18"; 17 + version = "0.0.19"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "uiua-lang"; 21 21 repo = "uiua"; 22 22 rev = "refs/tags/${version}"; 23 - hash = "sha256-EXOBEvUAS0jCj9BAmy63dh0Dy30VOW0PBdsoa/2Jcx0="; 23 + hash = "sha256-2DopXsYhEyD6JHEJgtiCGCzpcl/6nOQCDp0uHDCSEcs="; 24 24 }; 25 25 26 - cargoHash = "sha256-8Cbks0oo8fgWj9Lxp0bwydYXkJD+fz3y+dZ7ne+RXdU="; 26 + cargoHash = "sha256-WWIxXXuMbk7QqldJIxjWaaM946WGLuMl6mSw7Vc8LKo="; 27 27 28 28 nativeBuildInputs = lib.optionals stdenv.isDarwin [ 29 29 rustPlatform.bindgenHook
+2 -2
pkgs/development/interpreters/erlang/24.nix
··· 1 1 { mkDerivation }: 2 2 3 3 mkDerivation { 4 - version = "24.3.4.13"; 5 - sha256 = "sha256-2+Fmj6qUJoutLXbexgPRpJbspnzuwSfu4OpyRd+7N3Y="; 4 + version = "24.3.4.14"; 5 + sha256 = "sha256-+OEA7bVomZox/iHhkRQPt91WayyxZQDkDI92B5Ez24Q="; 6 6 }
+2 -2
pkgs/development/interpreters/erlang/25.nix
··· 1 1 { mkDerivation }: 2 2 3 3 mkDerivation { 4 - version = "25.3.2.6"; 5 - sha256 = "iImrVaoS5bajaZZQoZoG3VzWHFmWvId8xQPKLhl9iQo="; 4 + version = "25.3.2.7"; 5 + sha256 = "sha256-JMHfnnvjAIrJ2YhSzk1qVeS7qGx2HDf2J+8+WFD5Bv8="; 6 6 }
+3 -4
pkgs/development/interpreters/erlang/26.nix
··· 1 - { lib, mkDerivation }: 1 + { mkDerivation }: 2 2 3 3 mkDerivation { 4 - version = "26.1.1"; 5 - sha256 = "sha256-Y0sArUFkGxlAAgrgUxn5Rjnd72geG08VO9FBxg/fJAg="; 4 + version = "26.1.2"; 5 + sha256 = "sha256-exLLdg7z/HKJI81w33vcQUDF6NG5n2WKtcYwdPxN+0A="; 6 6 } 7 -
+6 -3
pkgs/development/libraries/quarto/default.nix
··· 13 13 , python3 14 14 , quarto 15 15 , extraPythonPackages ? ps: with ps; [] 16 + , sysctl 16 17 }: 17 18 18 19 stdenv.mkDerivation (final: { ··· 60 61 mv bin/* $out/bin 61 62 mv share/* $out/share 62 63 63 - runHook preInstall 64 + runHook postInstall 64 65 ''; 65 66 66 67 passthru.tests = { 67 - quarto-check = runCommand "quarto-check" {} '' 68 + quarto-check = runCommand "quarto-check" { 69 + nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; 70 + } '' 68 71 export HOME="$(mktemp -d)" 69 72 ${quarto}/bin/quarto check 70 73 touch $out ··· 81 84 changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; 82 85 license = licenses.gpl2Plus; 83 86 maintainers = with maintainers; [ minijackson mrtarantoga ]; 84 - platforms = [ "x86_64-linux" ]; 87 + platforms = platforms.all; 85 88 sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; 86 89 }; 87 90 })
+2 -2
pkgs/development/python-modules/aiomqtt/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "aiomqtt"; 15 - version = "1.2.0"; 15 + version = "1.2.1"; 16 16 format = "pyproject"; 17 17 18 18 disabled = pythonOlder "3.8"; ··· 21 21 owner = "sbtinstruments"; 22 22 repo = "aiomqtt"; 23 23 rev = "refs/tags/v${version}"; 24 - hash = "sha256-WfHyCjNowtgTBADKeGyBBbO2JQ6YXJFvAtSq0iLzSbw="; 24 + hash = "sha256-P8p21wjmFDvI0iobpQsWkKYleY4M0R3yod3/mJ7V+Og="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/ansible/core.nix
··· 28 28 29 29 buildPythonPackage rec { 30 30 pname = "ansible-core"; 31 - version = "2.15.4"; 31 + version = "2.15.5"; 32 32 33 33 src = fetchPypi { 34 34 inherit pname version; 35 - hash = "sha256-waiq7emF955ZMrohY2OTeffYAlv9myg3jbFkmk71Qe0="; 35 + hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; 36 36 }; 37 37 38 38 # ansible_connection is already wrapped, so don't pass it through
+2 -2
pkgs/development/python-modules/async-tkinter-loop/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "async-tkinter-loop"; 13 - version = "0.9.1"; 13 + version = "0.9.2"; 14 14 format = "pyproject"; 15 15 16 16 src = fetchPypi { 17 17 inherit version; 18 18 pname = "async_tkinter_loop"; 19 - hash = "sha256-Phxx9RovjU5JOonMt7Zhum0/BGRS5OLRAkLTl4L/BW4="; 19 + hash = "sha256-YwmW+zXAx9TAxgoRLEr7/3o1rrO4eSNScuoTh3ud2Vo="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/azure-eventgrid/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "azure-eventgrid"; 13 - version = "4.14.0"; 13 + version = "4.15.0"; 14 14 format = "setuptools"; 15 15 16 16 disabled = pythonOlder "3.7"; 17 17 18 18 src = fetchPypi { 19 19 inherit pname version; 20 - hash = "sha256-Nati9XRCNJgt/cmhj2t1l+oijsR6SC1UVZ35VANd0l8="; 20 + hash = "sha256-hVPCQgVu5NkEMJBJcfaER8JGtjnIEWquIcBX6vFSiAc="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "azure-mgmt-redhatopenshift"; 13 - version = "1.3.0"; 13 + version = "1.4.0"; 14 14 format = "setuptools"; 15 15 16 16 disabled = pythonOlder "3.7"; 17 17 18 18 src = fetchPypi { 19 19 inherit pname version; 20 - hash = "sha256-LOJldUyWdVShpN8lD8zGdFeYFiKSmODk3WNOP1fJfcs="; 20 + hash = "sha256-BL2a2L2AwJWvs0V+VpSGaS8//AWMy5m6rdAPDJPbrEo="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/boto3-stubs/default.nix
··· 363 363 364 364 buildPythonPackage rec { 365 365 pname = "boto3-stubs"; 366 - version = "1.28.58"; 366 + version = "1.28.63"; 367 367 format = "setuptools"; 368 368 369 369 src = fetchPypi { 370 370 inherit pname version; 371 - hash = "sha256-LQxPd+RhC/W6z2/BNuyqQmaATi4APVHQf8F2dI21OQc="; 371 + hash = "sha256-7PT7K1txvlLPyXDuBZ/hdDntGQTQOVUI9VRcOA1NlR0="; 372 372 }; 373 373 374 374 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/botocore-stubs/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "botocore-stubs"; 12 - version = "1.31.62"; 12 + version = "1.31.63"; 13 13 format = "pyproject"; 14 14 15 15 disabled = pythonOlder "3.7"; ··· 17 17 src = fetchPypi { 18 18 pname = "botocore_stubs"; 19 19 inherit version; 20 - hash = "sha256-LOVV5d/y6R/CK9ZxBlNL8+BZO4ONh/iknTuOh/qDpEA="; 20 + hash = "sha256-hzcVpcIdD0WTYoOTx45Hz5TlOkPkCGOp718WX83PkA8="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/btrees/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "btrees"; 14 - version = "5.0"; 14 + version = "5.1"; 15 15 format = "setuptools"; 16 16 17 17 disabled = pythonOlder "3.7"; ··· 19 19 src = fetchPypi { 20 20 pname = "BTrees"; 21 21 inherit version; 22 - hash = "sha256-/d+KTcwCU+OQJ7qzgKLiDUeuNwoySFQW8qZq2a4aQ/o="; 22 + hash = "sha256-raDzHpMloEeV0dJOAn7ZsrZdpNZqz/i4eVWzUo1/w2k="; 23 23 }; 24 24 25 25 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/bytecode/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "bytecode"; 11 - version = "0.15.0"; 11 + version = "0.15.1"; 12 12 format = "pyproject"; 13 13 disabled = pythonOlder "3.6"; 14 14 ··· 16 16 owner = "vstinner"; 17 17 repo = pname; 18 18 rev = "refs/tags/${version}"; 19 - hash = "sha256-A8S3U07P4Olq9f7/q20aHOPAQsQp3OuGHtIAs8B8VEQ="; 19 + hash = "sha256-Jzsh0m00SiJjTP7hXMDmuR4XHmsCYdURuFDkVopGyIE="; 20 20 }; 21 21 22 22 SETUPTOOLS_SCM_PRETEND_VERSION = version;
+6 -17
pkgs/development/python-modules/clickgen/default.nix
··· 3 3 , buildPythonPackage 4 4 , pythonOlder 5 5 , fetchFromGitHub 6 - , attrs 7 6 , pillow 8 - , pyyaml 9 7 , toml 10 8 , numpy 9 + , pyyaml 11 10 , python 12 11 , pytestCheckHook 13 12 }: 14 13 15 14 buildPythonPackage rec { 16 15 pname = "clickgen"; 17 - version = "2.1.8"; 16 + version = "2.1.9"; 18 17 format = "setuptools"; 19 18 20 19 disabled = pythonOlder "3.8"; ··· 23 22 owner = "ful1e5"; 24 23 repo = "clickgen"; 25 24 rev = "refs/tags/v${version}"; 26 - hash = "sha256-74nOqaRZXLOSF4sjydAbF3sRMrw+21+fYDs3hiVSszA="; 25 + hash = "sha256-mSaltlX2eNRLJ09zN5Tim8mW8mnjPi10W4QIEpiBQvI="; 27 26 }; 28 27 29 - propagatedBuildInputs = [ 30 - attrs 31 - numpy 32 - pillow 33 - pyyaml 34 - toml 35 - ]; 28 + propagatedBuildInputs = [ pillow toml numpy pyyaml ]; 36 29 37 - nativeCheckInputs = [ 38 - pytestCheckHook 39 - ]; 30 + nativeCheckInputs = [ pytestCheckHook ]; 40 31 41 32 postInstall = '' 42 33 # Copying scripts directory needed by clickgen script at $out/bin/ 43 34 cp -R src/clickgen/scripts $out/${python.sitePackages}/clickgen/scripts 44 35 ''; 45 36 46 - pythonImportsCheck = [ 47 - "clickgen" 48 - ]; 37 + pythonImportsCheck = [ "clickgen" ]; 49 38 50 39 meta = with lib; { 51 40 homepage = "https://github.com/ful1e5/clickgen";
+2 -2
pkgs/development/python-modules/crc/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "crc"; 11 - version = "4.3.0"; 11 + version = "5.0.0"; 12 12 format = "pyproject"; 13 13 14 14 disabled = pythonOlder "3.8"; ··· 17 17 owner = "Nicoretti"; 18 18 repo = pname; 19 19 rev = "refs/tags/${version}"; 20 - hash = "sha256-rH/jc6/gxww3NSCYrhu+InZX1HTTdJFfa52ioU8AclY="; 20 + hash = "sha256-+C4cUKXZCpAXil8X4gTK3AhqNVWDrBQYY2Kgkd3+gqc="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/django-simple-captcha/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "django-simple-captcha"; 15 - version = "0.5.18"; 15 + version = "0.5.20"; 16 16 17 17 src = fetchPypi { 18 18 inherit pname version; 19 - hash = "sha256-bh/MT0AF99ae56Llmn6GO105GPNqhaTYEUmJhK7MSM4="; 19 + hash = "sha256-ICcwCae+tEKX6fbHpr0hraPS+pPDFNL2v145TO62opc="; 20 20 }; 21 21 22 22 nativeCheckInputs = [
+2 -2
pkgs/development/python-modules/elasticsearch8/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "elasticsearch8"; 13 - version = "8.10.0"; 13 + version = "8.10.1"; 14 14 format = "setuptools"; 15 15 16 16 disabled = pythonOlder "3.7"; 17 17 18 18 src = fetchPypi { 19 19 inherit pname version; 20 - hash = "sha256-Wb2l0FL7rm9Ck7HSWs9PmPyeShn9Hd9fCKnh/jWVy3o="; 20 + hash = "sha256-naLy7xSqHlz8QNbQhM+iydJi8m6DQqBWlDLijOOT7ak="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/gocardless-pro/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "gocardless-pro"; 13 - version = "1.46.0"; 13 + version = "1.47.0"; 14 14 format = "setuptools"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "gocardless"; 18 18 repo = "gocardless-pro-python"; 19 19 rev = "refs/tags/v${version}"; 20 - hash = "sha256-tfaV/pohDu7IIzDa9B3GpnzOs6U+MVoFM3YZ0ErC7zQ="; 20 + hash = "sha256-YCHI4MvdTlpDavXTTU4AESBUOBKt23IPxvGI+BGo2EI="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/gsd/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "gsd"; 12 - version = "3.1.1"; 12 + version = "3.2.0"; 13 13 format = "setuptools"; 14 14 15 15 disabled = pythonOlder "3.7"; ··· 18 18 owner = "glotzerlab"; 19 19 repo = pname; 20 20 rev = "refs/tags/v${version}"; 21 - hash = "sha256-YeMdBELr5kfymVUEE8+cqGLgOPBqbbD+vh1e9XbRLB8="; 21 + hash = "sha256-ceoHHEX44DrVgatV2EIS6gT9oVZkAx6OTFMZG/x4q64="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/hdfs/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "hdfs"; 14 - version = "2.7.2"; 14 + version = "2.7.3"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "mtth"; 18 18 repo = pname; 19 19 rev = "refs/tags/v${version}"; 20 - hash = "sha256-KXJDQEc4+T9r8sB41SOgcx8Gth3qAOZceoOpsLbJ+ak="; 20 + hash = "sha256-Pm2E8hB0wbu7npi/sLt9D8jQsH69qNOHLji9CYqST/8="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [ docopt requests six ];
+2 -2
pkgs/development/python-modules/imap-tools/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "imap-tools"; 10 - version = "1.3.0"; 10 + version = "1.4.0"; 11 11 12 12 disabled = pythonOlder "3.5"; 13 13 ··· 17 17 owner = "ikvk"; 18 18 repo = "imap_tools"; 19 19 rev = "refs/tags/v${version}"; 20 - hash = "sha256-dlCPJQDkHW4zNIHwhyKkgk+rI2t+Xn+Fbf3xJPRtaiY="; 20 + hash = "sha256-bTYfAXc/2bRj8TBd9mmg0EGjUcUu6aiZXl8MF0+1xcs="; 21 21 }; 22 22 23 23 nativeCheckInputs = [
+3 -3
pkgs/development/python-modules/litellm/default.nix
··· 8 8 , tiktoken 9 9 }: 10 10 let 11 - version = "0.1.590"; 11 + version = "0.1.738"; 12 12 in 13 13 buildPythonPackage rec { 14 14 pname = "litellm"; ··· 18 18 src = fetchFromGitHub { 19 19 owner = "BerriAI"; 20 20 repo = "litellm"; 21 - rev = "7cb96e86b4753008cbf8d116aca514750e98d360"; 22 - hash = "sha256-ITMcwGjelNfNGnfBmmdu0Xwph4u0mxiFSfHnysUxWCQ="; 21 + rev = "refs/tags/v${version}"; 22 + hash = "sha256-1Ft2E5I3OkVZUfmQHN1Qe/Z3cvLid8ie3BCeZoAii8U="; 23 23 }; 24 24 25 25 postPatch = ''
+2 -2
pkgs/development/python-modules/pynina/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "pynina"; 10 - version = "0.3.2"; 10 + version = "0.3.3"; 11 11 format = "setuptools"; 12 12 13 13 disabled = pythonOlder "3.7"; ··· 15 15 src = fetchPypi { 16 16 pname = "PyNINA"; 17 17 inherit version; 18 - hash = "sha256-uiNUkNL/3FGGhqctE9AZNdSD4o7jTk829GAT5Gy2Xeo="; 18 + hash = "sha256-6HJ78tKl6If/ezwOrGl3VEYO4eMh/6cZq2j2AMBr0I8="; 19 19 }; 20 20 21 21 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/screenlogicpy/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "screenlogicpy"; 12 - version = "0.9.1"; 12 + version = "0.9.3"; 13 13 format = "setuptools"; 14 14 15 15 disabled = pythonOlder "3.6"; ··· 18 18 owner = "dieselrabbit"; 19 19 repo = pname; 20 20 rev = "refs/tags/v${version}"; 21 - hash = "sha256-bBdOaAr9VH7UeY/UdeKS9oOevJwW2HChJiTGCNbbikM="; 21 + hash = "sha256-0qB+FWqlh5qdy/jKLPYCXl3DewurLSOlYgcdiDtzeYE="; 22 22 }; 23 23 24 24 propagatedBuildInputs = [
+3 -3
pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "forgejo-actions-runner"; 10 - version = "2.4.0"; 10 + version = "3.0.1"; 11 11 12 12 src = fetchFromGitea { 13 13 domain = "codeberg.org"; 14 14 owner = "forgejo"; 15 15 repo = "runner"; 16 16 rev = "v${version}"; 17 - hash = "sha256-EEwXo2MvdBlSMho4rrYD4wXLccS/30NbCuxO0CUktgE="; 17 + hash = "sha256-idA74R6kbI7Bk0XvT7BOyctT0IKymsJoFCWgYrtZstU="; 18 18 }; 19 19 20 - vendorHash = "sha256-FspNmiphGHSeZFmdlWIDsEUrCc8THfb0Wm67cMCTtHI="; 20 + vendorHash = "sha256-HE//SD/doMf42y2KF10JAuUe86hpFhCUM61da2NC5CE="; 21 21 22 22 ldflags = [ 23 23 "-s"
+3 -21
pkgs/development/tools/lurk/default.nix
··· 1 1 { lib 2 2 , rustPlatform 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 }: 6 5 7 6 rustPlatform.buildRustPackage rec { 8 7 pname = "lurk"; 9 - version = "0.3.3"; 8 + version = "0.3.4"; 10 9 11 10 src = fetchFromGitHub { 12 11 owner = "jakwai01"; 13 12 repo = pname; 14 13 rev = "v${version}"; 15 - hash = "sha256-D/wJAmlc6OUuD8kSfGevG+UoPKy58X0lObL7mjiBG+c="; 14 + hash = "sha256-7Yi77IsP/tmzrTvBVgIj2+fOXYKCT59pILeEuGuk4Y4="; 16 15 }; 17 16 18 - cargoHash = "sha256-PFR6jMAvEybT/XOfLrv21F8ZxSX0BZDiEFtgQL5fL18="; 19 - 20 - cargoPatches = [ 21 - # update the version to 0.3.3 22 - (fetchpatch { 23 - name = "chore-prepare-release.patch"; 24 - url = "https://github.com/JakWai01/lurk/commit/cb4355674159255ac4186283a93de294de057d1b.patch"; 25 - hash = "sha256-N+/8AGEToEqhkQ6BYGQP279foZbt6DzUBmAUaHm9hW4="; 26 - }) 27 - ]; 28 - 29 - patches = [ 30 - (fetchpatch { 31 - name = "fix-tests.patch"; 32 - url = "https://github.com/JakWai01/lurk/commit/87eb4aa8bf9a551b24cec2146699cb2c22d62019.patch"; 33 - hash = "sha256-m44m1338VODX+HGEVMLozKfVvXsQxvLIpo28VBK//vM="; 34 - }) 35 - ]; 17 + cargoHash = "sha256-Cvtg9msoYkIIlaUw4hxWy2wSrE1uORR/2R2Geq4SI4w="; 36 18 37 19 meta = with lib; { 38 20 description = "A simple and pretty alternative to strace";
+4 -4
pkgs/development/tools/rust/cargo-wasi/default.nix
··· 9 9 10 10 rustPlatform.buildRustPackage rec { 11 11 pname = "cargo-wasi"; 12 - version = "0.1.27"; 12 + version = "0.1.28"; 13 13 14 14 src = fetchCrate { 15 15 inherit version; 16 16 pname = "cargo-wasi-src"; 17 - sha256 = "sha256-u6+Fn/j2cvpBqTIfyPC8jltcCKGimFcu4NiMFCAfmwg="; 17 + sha256 = "sha256-fmQ23BtcBUPNcgZgvNq85iqdY6WRUhqwAp4aIobqMIw="; 18 18 }; 19 19 20 - cargoHash = "sha256-Hi5Z5TmiHXp7YrqXfbwACKEximksQRhdoMGU1iLmXOk="; 20 + cargoHash = "sha256-yXtxznUp2gECq2CvRByiFzbTjYtWvTheDjGoynJWb+o="; 21 21 22 22 nativeBuildInputs = [ pkg-config ]; 23 23 ··· 26 26 27 27 # Checks need to be disabled here because the current test suite makes assumptions 28 28 # about the surrounding environment that aren't Nix friendly. See these lines for specifics: 29 - # https://github.com/bytecodealliance/cargo-wasi/blob/0.1.27/tests/tests/support.rs#L13-L18 29 + # https://github.com/bytecodealliance/cargo-wasi/blob/0.1.28/tests/tests/support.rs#L13-L18 30 30 doCheck = false; 31 31 32 32 meta = with lib; {
+3 -3
pkgs/servers/monitoring/mackerel-agent/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "mackerel-agent"; 5 - version = "0.77.1"; 5 + version = "0.78.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "mackerelio"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-BPLAAl4V3LN0I+ReiQX3hJcgdZZ6/7lLfBdwl9HzTHc="; 11 + sha256 = "sha256-L8kYbJ9RmCoec9keBHv61K94rjnH+Q4dRkn6PCtjgJI="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ makeWrapper ]; 15 15 nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; 16 16 buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; 17 17 18 - vendorHash = "sha256-K+T6DxOvVotvTZE8WhWZ0v/T6UqJ5N6xxsdJrr8DQt4="; 18 + vendorHash = "sha256-A3e6qd6yjKsNUaXiltbS9G4WEMd3F1FxaxqMMVuBCUI="; 19 19 20 20 subPackages = [ "." ]; 21 21
+3 -3
pkgs/servers/monitoring/prometheus/zfs-exporter.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "zfs_exporter"; 8 - version = "2.3.1"; 8 + version = "2.3.2"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "pdf"; 12 12 repo = pname; 13 13 rev = "v" + version; 14 - hash = "sha256-EM7CHvpqPwCKgb5QU+jYmMaovHp12hJD1zVxcYygHdU="; 14 + hash = "sha256-JpLrCkPg0vVR0bKKHY5qf1/OD+O7yvWxS7kb7Yg3+c4="; 15 15 }; 16 16 17 - vendorHash = "sha256-AgZo+5gYJ2EaxSI+Jxl7ldu6iZ+uSncYR0n+D2mMC4w="; 17 + vendorHash = "sha256-uIilESEmAxANxFOy7qvYxlF/bId/Kqh4jUspNknlhlc="; 18 18 19 19 postInstall = '' 20 20 install -Dm444 -t $out/share/doc/${pname} *.md
+3 -3
pkgs/servers/monitoring/uptime-kuma/default.nix
··· 2 2 3 3 buildNpmPackage rec { 4 4 pname = "uptime-kuma"; 5 - version = "1.23.2"; 5 + version = "1.23.3"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "louislam"; 9 9 repo = "uptime-kuma"; 10 10 rev = version; 11 - hash = "sha256-AJAnWMJDIPbZyVcz6lGMSIq/EuwL2xgj9+4jySNzUb8="; 11 + hash = "sha256-YffkCFws/61uX6BwYqTeuAq5vqLOC+FeUt6rtQG6xws="; 12 12 }; 13 13 14 - npmDepsHash = "sha256-ABVCpJH0cS8zPNdPLlNVgAKYd1zSinS3rLJHj4hiMEY="; 14 + npmDepsHash = "sha256-USyLvC6ior1YhiZz6YySaG7xiYziHB01SHC9BPwuvJo="; 15 15 16 16 patches = [ 17 17 # Fixes the permissions of the database being not set correctly
+3 -3
pkgs/tools/admin/aws-sso-cli/default.nix
··· 6 6 }: 7 7 buildGoModule rec { 8 8 pname = "aws-sso-cli"; 9 - version = "1.13.1"; 9 + version = "1.14.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "synfinatic"; 13 13 repo = pname; 14 14 rev = "v${version}"; 15 - hash = "sha256-QwixApaGUzTmvc9TfFk8bdMU7dxyaeUo5aWucV4tH1c="; 15 + hash = "sha256-4LgTAoPly551vzZ8StF01+zpBGAO7fpcyq3IrSrDhlg="; 16 16 }; 17 - vendorHash = "sha256-/6DCrjOqjbz+olRp7rs8ui4uUrcor0zAc0yOIz+ZcEo="; 17 + vendorHash = "sha256-YZ9/eqKZ0PDHZL6f3J7Obfq34Xk3swU/gGwzWJ2QsKs="; 18 18 19 19 nativeBuildInputs = [ makeWrapper ]; 20 20
+3 -3
pkgs/tools/misc/boxxy/default.nix
··· 8 8 9 9 rustPlatform.buildRustPackage rec { 10 10 pname = "boxxy"; 11 - version = "0.8.0"; 11 + version = "0.8.1"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "queer"; 15 15 repo = "boxxy"; 16 16 rev = "v${version}"; 17 - hash = "sha256-I7VQfLCD+nfFllbns7yjYMl9hNwM8AgUbiHte4vMciM="; 17 + hash = "sha256-vggerp66ALH7aqC6daH1a82ajJg5ZmEZTqC98IHhzFU="; 18 18 }; 19 19 20 - cargoHash = "sha256-xtyiJZ9jPP2M0pUpMwQlUa9QgsRhFLqEm+hE3K4WO88="; 20 + cargoHash = "sha256-nKuxeVFCc4Etl5x5vgpCXbU7WkLVaL9wRCVSWhffPzU="; 21 21 22 22 nativeBuildInputs = [ 23 23 pkg-config
+2 -2
pkgs/tools/misc/pkgtop/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "pkgtop"; 8 - version = "2.4.1"; 8 + version = "2.5.1"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "orhun"; 12 12 repo = "pkgtop"; 13 13 rev = version; 14 - hash = "sha256-Skk7Zur2UMxNjrJmcp+FvUuNvbh9HmzuZ5mWcvhxcKk="; 14 + hash = "sha256-NY8nx4BKAUq1nGBlzRzm2OH1k01TV6qs2IcoErhuxTc="; 15 15 }; 16 16 17 17 vendorHash = "sha256-dlDbNym7CNn5088znMNgGAr2wBM3+nYv3q362353aLs=";
+2 -2
pkgs/tools/misc/yt-dlp/default.nix
··· 22 22 # The websites yt-dlp deals with are a very moving target. That means that 23 23 # downloads break constantly. Because of that, updates should always be backported 24 24 # to the latest stable release. 25 - version = "2023.10.7"; 25 + version = "2023.10.13"; 26 26 27 27 src = fetchPypi { 28 28 inherit pname version; 29 - hash = "sha256-/IZlepskDPZf7z/2J+Sg3jNeclk2/nDUQCxx3ZdFLzY="; 29 + hash = "sha256-4CbqHENf827vEhW8TFu4xHmTi5AFSZe6mfY6RUH+Y7Q="; 30 30 }; 31 31 32 32 propagatedBuildInputs = [
+3 -3
pkgs/tools/networking/xh/default.nix
··· 11 11 12 12 rustPlatform.buildRustPackage rec { 13 13 pname = "xh"; 14 - version = "0.18.0"; 14 + version = "0.19.1"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "ducaale"; 18 18 repo = "xh"; 19 19 rev = "v${version}"; 20 - sha256 = "sha256-2qZ+FGc8Y8HLJaQluVv036NG77lvaqsc3I5cmkD+r/M="; 20 + sha256 = "sha256-R15l73ApQ5apZsJ9+wLuse50nqZObTLurt0pXu5p5BE="; 21 21 }; 22 22 23 - cargoSha256 = "sha256-0lPEZ8Th3PAw6AEnb+ciKMhi5wysFCvYwiHd9/o8VVc="; 23 + cargoSha256 = "sha256-GGn5cNOIgCBl4uEIYxw5CIgd6uPHkid9MHnLCpuNX7I="; 24 24 25 25 buildFeatures = lib.optional withNativeTls "native-tls"; 26 26
+5 -5
pkgs/tools/text/xml/xq/default.nix
··· 2 2 , buildGoModule 3 3 , fetchFromGitHub 4 4 , testers 5 - , xq 5 + , xq-xml 6 6 }: 7 7 8 8 buildGoModule rec { 9 9 pname = "xq"; 10 - version = "1.2.1"; 10 + version = "1.2.2"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "sibprogrammer"; 14 14 repo = "xq"; 15 15 rev = "v${version}"; 16 - hash = "sha256-Z14x1b25wKNm9fECkNqGJglK/Z8Xq8VHmYfp5aEvvMU="; 16 + hash = "sha256-bhJ8zMZQZn/VzhulkfGOW+uyS8E43TIREAvKIsEPonA="; 17 17 }; 18 18 19 - vendorHash = "sha256-CP4QsrTkFcOLDxnFc0apevXRmXHA9aJSU4AK9+TAxOU="; 19 + vendorHash = "sha256-iJ1JMvIJqXLkZXuzn2rzKnLbiagTocg/6mJN3Pgd/4w="; 20 20 21 21 ldflags = [ 22 22 "-s" ··· 27 27 28 28 passthru.tests = { 29 29 version = testers.testVersion { 30 - package = xq; 30 + package = xq-xml; 31 31 }; 32 32 }; 33 33