lol

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
13988f84 d87fe456

+361 -120
-2
nixos/modules/system/boot/systemd/initrd.nix
··· 90 90 inherit (cfg) packages package; 91 91 }; 92 92 93 - fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems; 94 - 95 93 kernel-name = config.boot.kernelPackages.kernel.name or "kernel"; 96 94 modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; }; 97 95 firmware = config.hardware.firmware;
+4
pkgs/applications/editors/vim/plugins/overrides.nix
··· 955 955 dependencies = with self; [ nui-nvim ]; 956 956 }; 957 957 958 + none-ls-nvim = super.none-ls-nvim.overrideAttrs { 959 + dependencies = [ self.plenary-nvim ]; 960 + }; 961 + 958 962 null-ls-nvim = super.null-ls-nvim.overrideAttrs { 959 963 dependencies = with self; [ plenary-nvim ]; 960 964 };
+37
pkgs/applications/emulators/retroarch/cores.nix
··· 7 7 , cmake 8 8 , curl 9 9 , fetchFromGitHub 10 + , fetchpatch 10 11 , ffmpeg 11 12 , ffmpeg_4 12 13 , fluidsynth 14 + , fmt 15 + , freetype 13 16 , gettext 17 + , harfbuzz 14 18 , hexdump 15 19 , hidapi 16 20 , icu ··· 19 23 , libGL 20 24 , libGLU 21 25 , libjpeg 26 + , liblcf 22 27 , libpcap 23 28 , libpng 29 + , libsndfile 24 30 , libvorbis 25 31 , libxml2 32 + , libxmp 26 33 , libzip 27 34 , makeWrapper 35 + , mpg123 28 36 , nasm 29 37 , openssl 38 + , opusfile 30 39 , pcre 40 + , pixman 31 41 , pkg-config 32 42 , portaudio 33 43 , python3 34 44 , retroarch 35 45 , sfml 36 46 , snappy 47 + , speexdsp 37 48 , udev 38 49 , which 39 50 , xorg ··· 397 408 meta = { 398 409 description = "Port of DOSBox to libretro aiming for simplicity and ease of use."; 399 410 license = lib.licenses.gpl2Only; 411 + }; 412 + }; 413 + 414 + easyrpg = mkLibretroCore { 415 + core = "easyrpg"; 416 + extraNativeBuildInputs = [ cmake pkg-config ]; 417 + extraBuildInputs = [ fmt freetype harfbuzz liblcf libpng libsndfile libvorbis libxmp mpg123 opusfile pcre pixman speexdsp ]; 418 + patches = [ 419 + # The following patch is shared with easyrpg-player. 420 + # Update when new versions of liblcf and easyrpg-player are released. 421 + # See pkgs/games/easyrpg-player/default.nix for details. 422 + (fetchpatch { 423 + name = "0001-Fix-building-with-fmtlib-10.patch"; 424 + url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; 425 + hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; 426 + }) 427 + ]; 428 + cmakeFlags = [ 429 + "-DBUILD_SHARED_LIBS=ON" 430 + "-DPLAYER_TARGET_PLATFORM=libretro" 431 + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" 432 + ]; 433 + makefile = "Makefile"; 434 + meta = { 435 + description = "EasyRPG Player libretro port"; 436 + license = lib.licenses.gpl3Only; 400 437 }; 401 438 }; 402 439
+11
pkgs/applications/emulators/retroarch/hashes.json
··· 251 251 }, 252 252 "version": "unstable-2023-12-29" 253 253 }, 254 + "easyrpg": { 255 + "fetcher": "fetchFromGitHub", 256 + "src": { 257 + "owner": "EasyRPG", 258 + "repo": "Player", 259 + "rev": "f8e41f43b619413f95847536412b56f85307d378", 260 + "hash": "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s=", 261 + "fetchSubmodules": true 262 + }, 263 + "version": "unstable-2023-04-29" 264 + }, 254 265 "eightyone": { 255 266 "fetcher": "fetchFromGitHub", 256 267 "src": {
+5
pkgs/applications/emulators/retroarch/update_cores.py
··· 50 50 "dolphin": {"repo": "dolphin"}, 51 51 "dosbox": {"repo": "dosbox-libretro"}, 52 52 "dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"}, 53 + # The EasyRPG core is pinned to 0.8 since it depends on version 0.8 of liblcf, which 54 + # was released in April 2023. 55 + # Update the version when a compatible liblcf is available. 56 + # See pkgs/games/easyrpg-player/default.nix for details. 57 + "easyrpg": {"repo": "Player", "owner": "EasyRPG", "fetch_submodules": True, "rev": "0.8"}, 53 58 "eightyone": {"repo": "81-libretro"}, 54 59 "fbalpha2012": {"repo": "fbalpha2012"}, 55 60 "fbneo": {"repo": "fbneo"},
+5 -5
pkgs/applications/misc/dunst/default.nix pkgs/by-name/du/dunst/package.nix
··· 6 6 , testers, dunst 7 7 }: 8 8 9 - stdenv.mkDerivation rec { 9 + stdenv.mkDerivation (finalAttrs: { 10 10 pname = "dunst"; 11 - version = "1.9.2"; 11 + version = "1.10.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "dunst-project"; 15 15 repo = "dunst"; 16 - rev = "v${version}"; 17 - sha256 = "sha256-8IH0WTPSaAundhYh4l7gQR66nyT38H4DstRTm+Xh+Z8="; 16 + rev = "v${finalAttrs.version}"; 17 + hash = "sha256-6smFUdWqOuYB0btsDgHtIpDBfHhkpIQfjyZ8wtRg1bQ="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; ··· 59 59 maintainers = with maintainers; [ domenkozar ]; 60 60 mainProgram = "dunst"; 61 61 }; 62 - } 62 + })
+2 -2
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
··· 2 2 callPackage ./generic.nix { } rec { 3 3 pname = "signal-desktop"; 4 4 dir = "Signal"; 5 - version = "6.44.0"; 5 + version = "6.46.0"; 6 6 url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; 7 - hash = "sha256-M4Xiy8cDQciMzgGl1/eeKZjEaelVtkk6JXJYBP4ua2s="; 7 + hash = "sha256-rHmG2brzlQtYd3l5EFhjndPF5T7nQWzUhEe7LsEFVpc="; 8 8 }
+2 -2
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
··· 2 2 callPackage ./generic.nix {} rec { 3 3 pname = "signal-desktop"; 4 4 dir = "Signal"; 5 - version = "6.46.0"; 5 + version = "6.47.1"; 6 6 url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; 7 - hash = "sha256-6s6wFg2mJRaxEyWkZrCefspAdlcDwbjxXpx5CMNGW94="; 7 + hash = "sha256-WRdn3T18xhWvlELtwlOs/ZoPuEt/yQgs7JP/1MGN5Ps="; 8 8 }
+2 -2
pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
··· 19 19 20 20 stdenv.mkDerivation (finalAttrs: { 21 21 pname = "teams-for-linux"; 22 - version = "1.4.11"; 22 + version = "1.4.12"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "IsmaelMartinez"; 26 26 repo = "teams-for-linux"; 27 27 rev = "v${finalAttrs.version}"; 28 - hash = "sha256-vjxbWOaUanYXalGVDgX+sjsrz5Cn1yGBkBs9B8VGrDQ="; 28 + hash = "sha256-LrFF61D2b9+FWnVkb9MYxBJQxMtejuOmGTEtfSj1No4="; 29 29 }; 30 30 31 31 offlineCache = fetchYarnDeps {
+4
pkgs/applications/video/mpv/default.nix
··· 227 227 cp mpv_identify.sh umpv $out/bin/ 228 228 popd 229 229 pushd $out/share/applications 230 + 231 + # patch out smb protocol reference, since our ffmpeg can't handle it 232 + substituteInPlace mpv.desktop --replace-fail "smb," "" 233 + 230 234 sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \ 231 235 mpv.desktop > umpv.desktop 232 236 printf "NoDisplay=true\n" >> umpv.desktop
+3 -3
pkgs/by-name/as/ast-grep/package.nix
··· 6 6 7 7 rustPlatform.buildRustPackage rec { 8 8 pname = "ast-grep"; 9 - version = "0.19.0"; 9 + version = "0.19.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "ast-grep"; 13 13 repo = "ast-grep"; 14 14 rev = version; 15 - hash = "sha256-ho4o7Ryp6IwBZ66Sag9IC67EfC/opfkicksouHKPURc="; 15 + hash = "sha256-uRAWcEG4+8tkfHe9bmVSWsRp3A35+5PRPdGuXuDm210="; 16 16 }; 17 17 18 - cargoHash = "sha256-EDgtXZhAOd8I9TwzpXsVpUpi8uoxyBBIxWyF7wSazwo="; 18 + cargoHash = "sha256-U7W3Ila75XQDwtcVDEzooLxdbcGZCrUU/Ijcx/xhRaM="; 19 19 20 20 # Work around https://github.com/NixOS/nixpkgs/issues/166205. 21 21 env = lib.optionalAttrs stdenv.cc.isClang {
+67
pkgs/by-name/er/errands/package.nix
··· 1 + { lib 2 + , fetchFromGitHub 3 + , python3Packages 4 + , gobject-introspection 5 + , libadwaita 6 + , wrapGAppsHook 7 + , meson 8 + , ninja 9 + , desktop-file-utils 10 + , pkg-config 11 + , appstream 12 + , libsecret 13 + , gtk4 14 + , gtksourceview5 15 + }: 16 + 17 + python3Packages.buildPythonApplication rec { 18 + pname = "errands"; 19 + version = "45.1.9"; 20 + 21 + pyproject = false; 22 + 23 + src = fetchFromGitHub { 24 + owner = "mrvladus"; 25 + repo = "Errands"; 26 + rev = "refs/tags/${version}"; 27 + hash = "sha256-q8vmT7XUx3XJjPfbEd/c3HrTENfopl1MqwT0x5OuG0c="; 28 + }; 29 + 30 + nativeBuildInputs = [ 31 + gobject-introspection 32 + wrapGAppsHook 33 + desktop-file-utils 34 + meson 35 + ninja 36 + pkg-config 37 + appstream 38 + gtk4 39 + ]; 40 + 41 + buildInputs = [ 42 + libadwaita 43 + libsecret 44 + gtksourceview5 45 + ]; 46 + 47 + propagatedBuildInputs = with python3Packages; [ 48 + pygobject3 49 + lxml 50 + caldav 51 + pycryptodomex 52 + ]; 53 + 54 + dontWrapGApps = true; 55 + 56 + preFixup = '' 57 + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 58 + ''; 59 + 60 + meta = with lib; { 61 + description = "Manage your tasks"; 62 + homepage = "https://github.com/mrvladus/Errands"; 63 + license = licenses.mit; 64 + mainProgram = "errands"; 65 + maintainers = with maintainers; [ sund3RRR ]; 66 + }; 67 + }
+11 -11
pkgs/by-name/pa/paratest/composer.lock
··· 4 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", 5 5 "This file is @generated automatically" 6 6 ], 7 - "content-hash": "c3efe6b6543d5e592e77a809fb1bb84e", 7 + "content-hash": "11632300688e9bcc111cc0e38617b43f", 8 8 "packages": [ 9 9 { 10 10 "name": "fidry/cpu-core-counter", ··· 2628 2628 }, 2629 2629 { 2630 2630 "name": "phpstan/phpstan", 2631 - "version": "1.10.57", 2631 + "version": "1.10.58", 2632 2632 "source": { 2633 2633 "type": "git", 2634 2634 "url": "https://github.com/phpstan/phpstan.git", 2635 - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" 2635 + "reference": "a23518379ec4defd9e47cbf81019526861623ec2" 2636 2636 }, 2637 2637 "dist": { 2638 2638 "type": "zip", 2639 - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", 2640 - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", 2639 + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", 2640 + "reference": "a23518379ec4defd9e47cbf81019526861623ec2", 2641 2641 "shasum": "" 2642 2642 }, 2643 2643 "require": { ··· 2686 2686 "type": "tidelift" 2687 2687 } 2688 2688 ], 2689 - "time": "2024-01-24T11:51:34+00:00" 2689 + "time": "2024-02-12T20:02:57+00:00" 2690 2690 }, 2691 2691 { 2692 2692 "name": "phpstan/phpstan-deprecation-rules", ··· 2904 2904 }, 2905 2905 { 2906 2906 "name": "squizlabs/php_codesniffer", 2907 - "version": "3.8.1", 2907 + "version": "3.9.0", 2908 2908 "source": { 2909 2909 "type": "git", 2910 2910 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", 2911 - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" 2911 + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" 2912 2912 }, 2913 2913 "dist": { 2914 2914 "type": "zip", 2915 - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", 2916 - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", 2915 + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", 2916 + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", 2917 2917 "shasum": "" 2918 2918 }, 2919 2919 "require": { ··· 2980 2980 "type": "open_collective" 2981 2981 } 2982 2982 ], 2983 - "time": "2024-01-11T20:47:48+00:00" 2983 + "time": "2024-02-16T15:06:51+00:00" 2984 2984 }, 2985 2985 { 2986 2986 "name": "symfony/filesystem",
+3 -3
pkgs/by-name/pa/paratest/package.nix
··· 5 5 6 6 (php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject (finalAttrs: { 7 7 pname = "paratest"; 8 - version = "7.4.1"; 8 + version = "7.4.2"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "paratestphp"; 12 12 repo = "paratest"; 13 13 rev = "v${finalAttrs.version}"; 14 - hash = "sha256-0cyv2WSiGjyp9vv2J8hxFnuvxAwrig1DmSxKSdBzNGI="; 14 + hash = "sha256-Sd7S51SjI8g2Qz/NAeKKpxpSyBhvlrtJFbazbPJf2N0="; 15 15 }; 16 16 17 17 composerLock = ./composer.lock; 18 - vendorHash = "sha256-vYcfmVEMGhAvPYTsVAJl7njxgVkL1b8QBr/3/DCxmCE="; 18 + vendorHash = "sha256-O8iEkvXIkkaQxcKfhm0Z4EZOtLolNsTPaPkXekpxkqs="; 19 19 20 20 meta = { 21 21 changelog = "https://github.com/paratestphp/paratest/releases/tag/v${finalAttrs.version}";
+1
pkgs/by-name/pu/purescm/.gitignore
··· 1 + node_modules/
+19
pkgs/by-name/pu/purescm/README.rst
··· 1 + ======================================================================== 2 + purescm 3 + ======================================================================== 4 + 5 + 6 + Suggested additional ``buildInputs`` 7 + ==================================== 8 + 9 + ``chez-racket`` 10 + Upstream is using the Racket fork of Chez Scheme to execute the 11 + generated Scheme output. 12 + 13 + 14 + To update this package 15 + ====================== 16 + 17 + #. Bump the ``./package.json`` version pin 18 + #. Run ``nix-shell -p nodejs --command "npm i --package-lock-only"`` 19 + #. Update ``npmDeps.hash`` in the ``package.nix``
+20
pkgs/by-name/pu/purescm/package-lock.json
··· 1 + { 2 + "name": "purescm", 3 + "lockfileVersion": 3, 4 + "requires": true, 5 + "packages": { 6 + "": { 7 + "dependencies": { 8 + "purescm": "1.8.2" 9 + } 10 + }, 11 + "node_modules/purescm": { 12 + "version": "1.8.2", 13 + "resolved": "https://registry.npmjs.org/purescm/-/purescm-1.8.2.tgz", 14 + "integrity": "sha512-r+iaiRagOO2rHxGIke391l+pMlpE85vOVpQA32pdftJTdKeUVGIYy0UAs1nOkQSNxdHMXsNIkrskAwOSiyX3PA==", 15 + "bin": { 16 + "purescm": "index.js" 17 + } 18 + } 19 + } 20 + }
+5
pkgs/by-name/pu/purescm/package.json
··· 1 + { 2 + "dependencies": { 3 + "purescm": "1.8.2" 4 + } 5 + }
+45
pkgs/by-name/pu/purescm/package.nix
··· 1 + { lib 2 + , buildNpmPackage 3 + , fetchNpmDeps 4 + , testers 5 + }: 6 + 7 + let 8 + inherit (lib) fileset; 9 + 10 + packageLock = builtins.fromJSON (builtins.readFile ./package-lock.json); 11 + 12 + pname = "purescm"; 13 + version = packageLock.packages."node_modules/${pname}".version; 14 + 15 + package = buildNpmPackage { 16 + inherit pname version; 17 + 18 + src = ./.; 19 + dontNpmBuild = true; 20 + 21 + npmDeps = fetchNpmDeps { 22 + src = ./.; 23 + hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o="; 24 + }; 25 + 26 + installPhase = '' 27 + mkdir -p $out/share/${pname} 28 + cp -r node_modules/ $out/share/${pname} 29 + ln -s $out/share/${pname}/node_modules/.bin $out/bin 30 + ''; 31 + 32 + passthru.tests = { 33 + version = testers.testVersion { inherit package; }; 34 + }; 35 + 36 + meta = { 37 + description = "Chez Scheme back-end for PureScript"; 38 + homepage = "https://github.com/purescm/purescm"; 39 + license = lib.licenses.asl20; 40 + maintainers = with lib.maintainers; [ toastal ]; 41 + mainProgram = "purescm"; 42 + }; 43 + }; 44 + in 45 + package
+8 -8
pkgs/development/libraries/mps/default.nix
··· 16 16 hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0="; 17 17 }; 18 18 19 + postPatch = '' 20 + # Disable -Werror to avoid biuld failure on fresh toolchains like 21 + # gcc-13. 22 + substituteInPlace code/gc.gmk --replace-fail '-Werror ' ' ' 23 + substituteInPlace code/gp.gmk --replace-fail '-Werror ' ' ' 24 + substituteInPlace code/ll.gmk --replace-fail '-Werror ' ' ' 25 + ''; 26 + 19 27 nativeBuildInputs = [ autoreconfHook ]; 20 28 buildInputs = [ sqlite ]; 21 - 22 - # needed for 1.116.0 to build with gcc7 23 - env.NIX_CFLAGS_COMPILE = toString [ 24 - "-Wno-implicit-fallthrough" 25 - "-Wno-error=clobbered" 26 - "-Wno-error=cast-function-type" 27 - ]; 28 - 29 29 30 30 meta = { 31 31 description = "A flexible memory management and garbage collection library";
+3 -3
pkgs/development/libraries/qt-6/default.nix
··· 32 32 callPackage = self.newScope ({ 33 33 inherit (self) qtModule; 34 34 inherit srcs python3; 35 - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; 35 + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; 36 36 }); 37 37 in 38 38 { ··· 109 109 qtwebengine 110 110 qtwebsockets 111 111 qtwebview 112 - ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) { }; 112 + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwayland libglvnd ])) { }; 113 113 114 114 qt3d = callPackage ./modules/qt3d.nix { }; 115 115 qt5compat = callPackage ./modules/qt5compat.nix { }; ··· 163 163 MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz 164 164 ReplayKit SecurityInterface Vision; 165 165 qtModule = callPackage ({ qtModule }: qtModule.override { 166 - stdenv = if stdenv.isDarwin 166 + stdenv = if stdenv.hostPlatform.isDarwin 167 167 then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } 168 168 else stdenv; 169 169 }) { };
+11 -11
pkgs/development/libraries/qt-6/modules/qtbase.nix
··· 21 21 , double-conversion 22 22 , util-linux 23 23 , systemd 24 - , systemdSupport ? stdenv.isLinux 24 + , systemdSupport ? stdenv.hostPlatform.isLinux 25 25 , libb2 26 26 , md4c 27 27 , mtdev ··· 87 87 , dconf 88 88 , gtk3 89 89 # options 90 - , libGLSupported ? stdenv.isLinux 90 + , libGLSupported ? stdenv.hostPlatform.isLinux 91 91 , libGL 92 92 , debug ? false 93 93 , developerBuild ? false ··· 132 132 unixODBCDrivers.mariadb 133 133 ] ++ lib.optionals systemdSupport [ 134 134 systemd 135 - ] ++ lib.optionals stdenv.isLinux [ 135 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ 136 136 util-linux 137 137 mtdev 138 138 lksctp-tools ··· 165 165 xorg.libXtst 166 166 xorg.xcbutilcursor 167 167 libepoxy 168 - ] ++ lib.optionals stdenv.isDarwin [ 168 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 169 169 AGL 170 170 AVFoundation 171 171 AppKit ··· 178 178 179 179 buildInputs = [ 180 180 at-spi2-core 181 - ] ++ lib.optionals (!stdenv.isDarwin) [ 181 + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ 182 182 libinput 183 - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ 183 + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ 184 184 AppKit 185 185 CoreBluetooth 186 186 ] ··· 191 191 ++ lib.optional (postgresql != null) postgresql; 192 192 193 193 nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] 194 - ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; 194 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; 195 195 196 196 propagatedNativeBuildInputs = [ lndir ]; 197 197 ··· 204 204 # https://bugreports.qt.io/browse/QTBUG-97568 205 205 postPatch = '' 206 206 substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls" 207 - '' + lib.optionalString stdenv.isDarwin '' 207 + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' 208 208 substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" 209 209 ''; 210 210 ··· 225 225 "-DQT_FEATURE_libproxy=ON" 226 226 "-DQT_FEATURE_system_sqlite=ON" 227 227 "-DQT_FEATURE_openssl_linked=ON" 228 - ] ++ lib.optionals (!stdenv.isDarwin) [ 228 + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ 229 229 "-DQT_FEATURE_sctp=ON" 230 230 "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" 231 231 "-DQT_FEATURE_vulkan=ON" 232 - ] ++ lib.optionals stdenv.isDarwin [ 232 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 233 233 # error: 'path' is unavailable: introduced in macOS 10.15 234 234 "-DQT_FEATURE_cxx17_filesystem=OFF" 235 235 ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; 236 236 237 - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ 237 + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ 238 238 # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" 239 239 "-framework GSS" 240 240 ]);
+2 -2
pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
··· 12 12 qtModule { 13 13 pname = "qtconnectivity"; 14 14 nativeBuildInputs = [ pkg-config ]; 15 - buildInputs = lib.optionals stdenv.isLinux [ bluez ]; 15 + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; 16 16 propagatedBuildInputs = [ 17 17 qtbase 18 18 qtdeclarative 19 - ] ++ lib.optionals stdenv.isDarwin [ 19 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 20 20 IOBluetooth 21 21 PCSC 22 22 ];
+5 -5
pkgs/development/libraries/qt-6/modules/qtmultimedia.nix
··· 28 28 pname = "qtmultimedia"; 29 29 nativeBuildInputs = [ pkg-config ]; 30 30 buildInputs = [ libunwind orc ffmpeg_6 ] 31 - ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; 31 + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; 32 32 propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] 33 - ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] 34 - ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; 33 + ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] 34 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; 35 35 36 36 cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" ]; 37 37 38 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin 38 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin 39 39 "-include AudioToolbox/AudioToolbox.h"; 40 - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin 40 + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin 41 41 "-framework AudioToolbox"; 42 42 }
+1 -1
pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix
··· 8 8 qtModule { 9 9 pname = "qtquick3dphysics"; 10 10 propagatedBuildInputs = [ qtbase qtquick3d ]; 11 - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) 11 + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) 12 12 "-faligned-allocation"; 13 13 }
+1 -1
pkgs/development/libraries/qt-6/modules/qtserialport.nix
··· 9 9 qtModule { 10 10 pname = "qtserialport"; 11 11 nativeBuildInputs = [ pkg-config ]; 12 - propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ]; 12 + propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; 13 13 }
+2 -2
pkgs/development/libraries/qt-6/modules/qtspeech.nix
··· 13 13 qtModule { 14 14 pname = "qtspeech"; 15 15 nativeBuildInputs = [ pkg-config ]; 16 - buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ]; 16 + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd ]; 17 17 propagatedBuildInputs = [ qtbase qtmultimedia ] 18 - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 18 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; 19 19 }
+1 -1
pkgs/development/libraries/qt-6/modules/qttools.nix
··· 16 16 llvmPackages.llvm 17 17 ]; 18 18 propagatedBuildInputs = [ qtbase qtdeclarative ] 19 - ++ lib.optionals stdenv.isDarwin [ cups ]; 19 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ]; 20 20 patches = [ 21 21 ../patches/qttools-paths.patch 22 22 ];
+9 -9
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
··· 105 105 which 106 106 gn 107 107 nodejs 108 - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ 108 + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ 109 109 autoSignDarwinBinariesHook 110 - ] ++ lib.optionals stdenv.isDarwin [ 110 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 111 111 bootstrap_cmds 112 112 cctools 113 113 xcbuild ··· 158 158 --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \ 159 159 --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\"" 160 160 '' 161 - + lib.optionalString stdenv.isLinux '' 161 + + lib.optionalString stdenv.hostPlatform.isLinux '' 162 162 sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ 163 163 src/3rdparty/chromium/device/udev_linux/udev?_loader.cc 164 164 165 165 sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ 166 166 src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc 167 167 '' 168 - + lib.optionalString stdenv.isDarwin '' 168 + + lib.optionalString stdenv.hostPlatform.isDarwin '' 169 169 substituteInPlace configure.cmake src/gn/CMakeLists.txt \ 170 170 --replace "AppleClang" "Clang" 171 171 substituteInPlace cmake/Functions.cmake \ ··· 190 190 # "-DQT_FEATURE_webengine_native_spellchecker=ON" 191 191 "-DQT_FEATURE_webengine_sanitizer=ON" 192 192 "-DQT_FEATURE_webengine_kerberos=ON" 193 - ] ++ lib.optionals stdenv.isLinux [ 193 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ 194 194 "-DQT_FEATURE_webengine_system_libxml=ON" 195 195 "-DQT_FEATURE_webengine_webrtc_pipewire=ON" 196 196 ··· 199 199 "-DQT_FEATURE_webengine_system_icu=ON" 200 200 ] ++ lib.optionals enableProprietaryCodecs [ 201 201 "-DQT_FEATURE_webengine_proprietary_codecs=ON" 202 - ] ++ lib.optionals stdenv.isDarwin [ 202 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 203 203 "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" 204 204 ]; 205 205 ··· 232 232 233 233 libevent 234 234 ffmpeg_4 235 - ] ++ lib.optionals stdenv.isLinux [ 235 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ 236 236 dbus 237 237 zlib 238 238 minizip ··· 275 275 276 276 libkrb5 277 277 mesa 278 - ] ++ lib.optionals stdenv.isDarwin [ 278 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 279 279 AGL 280 280 AVFoundation 281 281 Accelerate ··· 302 302 303 303 buildInputs = [ 304 304 cups 305 - ] ++ lib.optionals stdenv.isDarwin [ 305 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 306 306 libpm 307 307 sandbox 308 308 ];
+2 -2
pkgs/development/libraries/qt-6/modules/qtwebview.nix
··· 9 9 qtModule { 10 10 pname = "qtwebview"; 11 11 propagatedBuildInputs = [ qtdeclarative ] 12 - ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ] 13 - ++ lib.optionals stdenv.isDarwin [ WebKit ]; 12 + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ] 13 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit ]; 14 14 }
+1 -1
pkgs/development/libraries/qt-6/qtModule.nix
··· 21 21 22 22 buildInputs = args.buildInputs or [ ]; 23 23 nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] 24 - ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; 24 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; 25 25 propagatedBuildInputs = 26 26 (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ 27 27 (args.propagatedBuildInputs or []);
+3 -4
pkgs/development/ocaml-modules/magic-mime/default.nix
··· 2 2 3 3 buildDunePackage rec { 4 4 pname = "magic-mime"; 5 - version = "1.2.0"; 5 + version = "1.3.1"; 6 6 7 7 src = fetchurl { 8 - url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz"; 9 - sha256 = "sha256-8SG2dQD43Zfi/J/V0BxzJeTIS8XAI3RCd5+9b6IGlPU="; 8 + url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-${version}.tbz"; 9 + hash = "sha256-4CNNA2Jduh76xY5X44dnLXWl6aYh/0ms/g9gnADxOwg="; 10 10 }; 11 11 12 12 minimalOCamlVersion = "4.03"; 13 - useDune2 = true; 14 13 15 14 meta = with lib; { 16 15 description = "Convert file extensions to MIME types";
+2 -2
pkgs/development/python-modules/identify/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "identify"; 13 - version = "2.5.34"; 13 + version = "2.5.35"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.8"; ··· 19 19 owner = "pre-commit"; 20 20 repo = "identify"; 21 21 rev = "refs/tags/v${version}"; 22 - hash = "sha256-q1RVFdDFUkKGaKpcbasXHks+OZhVRZUy3ufuruBZiPA="; 22 + hash = "sha256-kUBAq9ttIdTLApJ0yW8Yk/NIXpmllApQGpR24wm0PHA="; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/slackclient/default.nix
··· 21 21 22 22 buildPythonPackage rec { 23 23 pname = "slackclient"; 24 - version = "3.26.2"; 24 + version = "3.27.0"; 25 25 format = "setuptools"; 26 26 27 27 disabled = pythonOlder "3.6"; ··· 30 30 owner = "slackapi"; 31 31 repo = "python-slack-sdk"; 32 32 rev = "refs/tags/v${version}"; 33 - hash = "sha256-pvD86kbNOnuNT6+WTAKziJDUTx3ebJUq029UbSVuxdw="; 33 + hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI="; 34 34 }; 35 35 36 36 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/wyoming/default.nix
··· 16 16 17 17 buildPythonPackage rec { 18 18 pname = "wyoming"; 19 - version = "1.5.2"; 19 + version = "1.5.3"; 20 20 pyproject = true; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "rhasspy"; 24 24 repo = "wyoming"; 25 25 rev = "refs/tags/${version}"; 26 - hash = "sha256-2bc5coKL5KlTeL9fdghPmRF66NXfimHOKGtE2yPXgrA="; 26 + hash = "sha256-SOPkvFMjoDQiWVP39+1Cx4fFmPH8wcBhZhaKapdZaeA="; 27 27 }; 28 28 29 29 nativeBuildInputs = [
+5
pkgs/development/r-modules/default.nix
··· 358 358 jqr = [ pkgs.jq.dev ]; 359 359 KFKSDS = [ pkgs.gsl ]; 360 360 kza = [ pkgs.fftw.dev ]; 361 + LOMAR = [ pkgs.gmp.dev ]; 361 362 lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; 362 363 lwgeom = with pkgs; [ proj geos gdal ]; 363 364 rvg = [ pkgs.libpng.dev ]; ··· 983 984 }); 984 985 985 986 curl = old.curl.overrideAttrs (attrs: { 987 + preConfigure = "patchShebangs configure"; 988 + }); 989 + 990 + Cyclops = old.Cyclops.overrideAttrs (attrs: { 986 991 preConfigure = "patchShebangs configure"; 987 992 }); 988 993
+4 -4
pkgs/games/osu-lazer/bin.nix
··· 7 7 8 8 let 9 9 pname = "osu-lazer-bin"; 10 - version = "2024.131.0"; 10 + version = "2024.219.0"; 11 11 12 12 src = { 13 13 aarch64-darwin = fetchzip { 14 14 url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; 15 - hash = "sha256-R25TAXU3gUcVKQMo8P+0/vTRzSoFrUdFz11inpch+7A="; 15 + hash = "sha256-U7i3rO7NVbBdOFMYpGrjI7LC//TEon3vdAHzjKeGsuk="; 16 16 stripRoot = false; 17 17 }; 18 18 x86_64-darwin = fetchzip { 19 19 url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; 20 - hash = "sha256-w7BK3pm0XrlzOv0oz+ZUfVRufzUCCfevlRL+RDLtoLU="; 20 + hash = "sha256-HEx1ZxxXnsHUD8Cqzld3RQoPZOfiXEmInlUMZVdDt6E="; 21 21 stripRoot = false; 22 22 }; 23 23 x86_64-linux = fetchurl { 24 24 url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; 25 - hash = "sha256-aNG6s942iTKyvM1XolMqmMs8XxoRYC/ZddCCJl0OtTE="; 25 + hash = "sha256-EqQJolzai0LrVpYE6yjbEUURNiUgi9Lw+otdmKIyoXo="; 26 26 }; 27 27 }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); 28 28
+6 -2
pkgs/games/osu-lazer/default.nix
··· 2 2 , stdenvNoCC 3 3 , buildDotnetModule 4 4 , fetchFromGitHub 5 + , dotnetCorePackages 5 6 , makeDesktopItem 6 7 , copyDesktopItems 7 8 , ffmpeg ··· 16 17 17 18 buildDotnetModule rec { 18 19 pname = "osu-lazer"; 19 - version = "2024.131.0"; 20 + version = "2024.219.0"; 20 21 21 22 src = fetchFromGitHub { 22 23 owner = "ppy"; 23 24 repo = "osu"; 24 25 rev = version; 25 - hash = "sha256-fsXs/AzvEQ141y/DPRvg7a7b0K30IfjigbRj0qh88rs="; 26 + hash = "sha256-xL/dTBcbrxTX1C4E5kfveHzzBNagnEvlAcPPcyYRsQk="; 26 27 }; 27 28 28 29 projectFile = "osu.Desktop/osu.Desktop.csproj"; 29 30 nugetDeps = ./deps.nix; 31 + 32 + dotnet-sdk = dotnetCorePackages.sdk_8_0; 33 + dotnet-runtime = dotnetCorePackages.runtime_8_0; 30 34 31 35 nativeBuildInputs = [ copyDesktopItems ]; 32 36
+7 -9
pkgs/games/osu-lazer/deps.nix
··· 62 62 (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) 63 63 (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) 64 64 (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) 65 - (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2022.2.3"; sha256 = "0ck4nkk8wlj2gcgs7j4j6z4yqrnf2f5rs2pgwa8kar026sc29xsl"; }) 65 + (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2023.3.3"; sha256 = "1cq7lj88r0nwypr157nd99g3wzk00wjinx84vasbga77kfcf4z9n"; }) 66 66 (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) 67 67 (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) 68 68 (fetchNuGet { pname = "MessagePack"; version = "2.5.140"; sha256 = "04iqlvcacbb37yf83xryd24n14dw780xx8dmc1zywi3x2nrqpjm9"; }) ··· 125 125 (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) 126 126 (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) 127 127 (fetchNuGet { pname = "NUnit"; version = "3.14.0"; sha256 = "19p8911lrfds1k9rv47jk1bbn665s0pvghkd06gzbg78j6mzzqqa"; }) 128 - (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) 128 + (fetchNuGet { pname = "NVika"; version = "3.0.0"; sha256 = "1v0n9li6lgfb2w4kbgxrs89h6k4s0zkcp73lch20w5c89dlkq26f"; }) 129 129 (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; sha256 = "14wc2rgnbi2ili6sx9iqnmcbn1zlmbsk49zbiz5cycib6rxkqfdm"; }) 130 130 (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.4"; sha256 = "0l7vf607i54y1xilr7bmjy9zlxacm00wz42mfbvzjf9rr54sy2pm"; }) 131 131 (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; sha256 = "1jsw2kwxxskwppk65i52yrxjjgbfbhicpmz30iaxlm68d5m6gwz2"; }) ··· 137 137 (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) 138 138 (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) 139 139 (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) 140 - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.131.0"; sha256 = "0pa80w67nnfp3y25l5a6f6p9x48lj8bw3b24vzi3l8ndgcmnpyxz"; }) 140 + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.217.0"; sha256 = "1rq6jpkkqf7wic2z4dp1l8ig7wf9jl9z80yl0dnm15d6prnkasgk"; }) 141 141 (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) 142 142 (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) 143 - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.129.0"; sha256 = "032jpqv86z4sc835063gzbshkdzx3qhnzxlyaggidmbwn6i9fja6"; }) 143 + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.207.0"; sha256 = "0960jg0a860f545phscimv5qw6bzijpc4pyplx126zcm1w1cpmfi"; }) 144 144 (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) 145 145 (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.693-alpha"; sha256 = "15fgd3j9cs3adldiscqm0ffixf68h06wqdz1xy1286z4gczhi954"; }) 146 - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; }) 147 - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; }) 148 - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; }) 146 + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0w0mimfwdgbywmvq2yv04p65wgi1plhlk1ya012yyxp13vvhfgi8"; }) 147 + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0i6bb79kprrmsfphjq26rgxqfvvf12pxr7dfwcq448dw2xgq6rpy"; }) 148 + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "06a4kkfidr7yj60xl3k4yfawz4wzwkkjpaki8fmsanif1yhz69l8"; }) 149 149 (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; }) 150 150 (fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; }) 151 151 (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; }) ··· 307 307 (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) 308 308 (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) 309 309 (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) 310 - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) 311 - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.4"; sha256 = "1khcg2r7i29rpbg4mqxncs6r88s9hbbjzxpj29d13zvd31wypyv9"; }) 312 310 (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) 313 311 (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) 314 312 (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
+2 -2
pkgs/games/osu-lazer/osu.runtimeconfig.json
··· 1 1 { 2 2 "runtimeOptions": { 3 - "tfm": "net6.0", 3 + "tfm": "net8.0", 4 4 "framework": { 5 5 "name": "Microsoft.NETCore.App", 6 - "version": "6.0.0" 6 + "version": "8.0.0" 7 7 } 8 8 } 9 9 }
+4 -4
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
··· 6 6 # NOTE: When updating these, please also take a look at the changes done to 7 7 # kernel config in the xanmod version commit 8 8 ltsVariant = { 9 - version = "6.1.76"; 10 - hash = "sha256-0nBdUFRGMWM3IL/q8CYiDEUA/sIrYPMkzsBQen30o2E="; 9 + version = "6.6.17"; 10 + hash = "sha256-WSWI3UByuD2SrcFC6El3ao0DINeG0IgtrvazDiHaIR0="; 11 11 variant = "lts"; 12 12 }; 13 13 14 14 mainVariant = { 15 - version = "6.6.15"; 16 - hash = "sha256-KHn4Ntm1QStgJRWzwmPYXEbEcuZcF4pWJ964wc6J2Wk="; 15 + version = "6.7.5"; 16 + hash = "sha256-achx+rElMOdPUD0qU2TStrlJXZU71E89HVlM4tKf7WE="; 17 17 variant = "main"; 18 18 }; 19 19
+5
pkgs/tools/audio/wyoming/faster-whisper.nix
··· 26 26 27 27 nativeBuildInputs = with python3.pkgs; [ 28 28 setuptools 29 + pythonRelaxDepsHook 30 + ]; 31 + 32 + pythonRelaxDeps = [ 33 + "wyoming" 29 34 ]; 30 35 31 36 propagatedBuildInputs = with python3.pkgs; [
+2 -2
pkgs/tools/audio/wyoming/openwakeword.nix
··· 5 5 6 6 python3Packages.buildPythonApplication rec { 7 7 pname = "wyoming-openwakeword"; 8 - version = "1.9.0"; 8 + version = "1.10.0"; 9 9 pyproject = true; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "rhasspy"; 13 13 repo = "wyoming-openwakeword"; 14 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-NceUFsIKZO6DOXae3QJ7JJGc7QdDHkMh20eLvl12p4U="; 15 + hash = "sha256-5suYJ+Z6ofVAysoCdHi5b5K0JTYaqeFZ32Cm76wC5LU="; 16 16 }; 17 17 18 18 nativeBuildInputs = with python3Packages; [
+3 -3
pkgs/tools/misc/flexoptix-app/default.nix
··· 1 1 { lib, appimageTools, fetchurl, asar }: let 2 2 pname = "flexoptix-app"; 3 - version = "5.16.0-latest"; 3 + version = "5.20.0-latest"; 4 4 5 5 src = fetchurl { 6 6 name = "${pname}-${version}.AppImage"; 7 7 url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; 8 - hash = "sha256-A10r8IUB3zWKWmjen90vLXPF7V/Cgo+DhFn/Hsc1Nhg="; 8 + hash = "sha256-/4vZaVLpSiufjNwwofPi+YBtTJ4aq7eYgFnYFv89LFY="; 9 9 }; 10 10 11 11 udevRules = fetchurl { ··· 19 19 20 20 # Get rid of the autoupdater 21 21 ${asar}/bin/asar extract $out/resources/app.asar app 22 - sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js 22 + patch -p0 < ${./disable-autoupdate.patch} 23 23 ${asar}/bin/asar pack app $out/resources/app.asar 24 24 ''; 25 25 });
+16
pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch
··· 1 + --- app/electron/jsComponents/mainWindowEvents.js 2024-02-18 12:53:41.115773007 -0500 2 + +++ app/electron/jsComponents/mainWindowEvents.js2 2024-02-18 23:22:20.003280203 -0500 3 + @@ -128,7 +128,12 @@ 4 + 5 + if (app.isPackaged) { 6 + global.mainWindow.webContents.once("did-finish-load", function () { 7 + - autoUpdater.checkForUpdates(); 8 + + global.mainWindow.loadURL( 9 + + url.format({ 10 + + ...global.APPLICATION_URL_OBJECT, 11 + + slashes: true, 12 + + }), 13 + + ); 14 + }); 15 + } else { 16 + global.mainWindow.webContents.openDevTools();
+3 -3
pkgs/tools/networking/croc/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "croc"; 5 - version = "9.6.10"; 5 + version = "9.6.11"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "schollz"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-SRSFbqwcMvzXVwwCxjIGnk/TisL3zGP2lQzy14HQrlU="; 11 + sha256 = "sha256-iePSDd/CR+YRRbUUszAU8v1oaf7s4kgX1cjTU+WVmOs="; 12 12 }; 13 13 14 - vendorHash = "sha256-mxEDatG1VIPhnk7RUuobGGbUUi7HmeJvyBJFEEx4NMg="; 14 + vendorHash = "sha256-pUWUYV1Ts/dFXUzufIWt5ETRQVpxIGzxRFq9jviG0Fs="; 15 15 16 16 subPackages = [ "." ]; 17 17
+3 -3
pkgs/tools/security/jwx/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "jwx"; 8 - version = "2.0.19"; 8 + version = "2.0.20"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "lestrrat-go"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - hash = "sha256-JR2Z1XOcTfocaXHA+q6INcIZFeuMjB+G16fRmYjOhzU="; 14 + hash = "sha256-+of0eYBwdGC9vb0DDqxMIuhXNTCRRv9iGOIVJGobMxc="; 15 15 }; 16 16 17 - vendorHash = "sha256-g97cSHGo0nw7Ker+S/qG0awUf1/UdcSkF55BjMyTfAY="; 17 + vendorHash = "sha256-HHq4B0MYP2gUtV9ywrXVmWN7OpV6NVb49rVMFblOgPc="; 18 18 19 19 sourceRoot = "${src.name}/cmd/jwx"; 20 20
-2
pkgs/top-level/all-packages.nix
··· 31029 31029 31030 31030 dsf2flac = callPackage ../applications/audio/dsf2flac { }; 31031 31031 31032 - dunst = callPackage ../applications/misc/dunst { }; 31033 - 31034 31032 dust = callPackage ../by-name/du/dust/package.nix { 31035 31033 inherit (darwin.apple_sdk_11_0.frameworks) AppKit; 31036 31034 };