diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e29fd89dc3d..82ec8c217134 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3407,6 +3407,12 @@ github = "blenderfreaky"; githubId = 14351657; }; + blghnks = { + email = "bilgehankuch@gmail.com"; + name = "Bilgehan Kuş"; + github = "blghnks"; + githubId = 175811412; + }; blinry = { name = "blinry"; email = "mail@blinry.org"; @@ -7651,6 +7657,12 @@ github = "ErinvanderVeen"; githubId = 10973664; }; + ern775 = { + email = "eren.demir2479090@gmail.com"; + github = "ern775"; + githubId = 188162351; + name = "Eren Demir"; + }; erooke = { email = "ethan@roo.ke"; name = "Ethan Rooke"; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 2c4061da23bb..6213da291bd8 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.56.1"; + version = "3.56.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-39/lmRCdI5vFbajpYlssGVcGegGujv81BmOj2q50vRY="; + hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index dd8665d419f6..ba8eeade0a0f 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -13,12 +13,12 @@ let pname = "autobrr"; - version = "1.62.0"; + version = "1.63.1"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-lygDs92WiIzHYgYqel2nseWcXgBFEQV+i5tC0NYpYUE="; + hash = "sha256-yQ7gS2nKqMiEGDifiCe/Mfat3xx+LYrJiPC7ltVeQlU="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -40,7 +40,7 @@ let src sourceRoot ; - hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc="; + hash = "sha256-TbdRJqLdNI7wchUsx2Kw1LlDyv50XlCiKyn6rhZyN1U="; }; postBuild = '' @@ -60,7 +60,7 @@ buildGoModule rec { src ; - vendorHash = "sha256-/MOP06po885vg1C6j+let8UC710j68oP+L3j9oEU0Lw="; + vendorHash = "sha256-kaHTH3gR0bTD89L8GLgntiOJ8S5dIzvpU27ma4cb/Do="; preBuild = '' cp -r ${autobrr-web}/* web/dist diff --git a/pkgs/by-name/bl/blst/package.nix b/pkgs/by-name/bl/blst/package.nix index 34c66eeb0eb5..2fe0713166b6 100644 --- a/pkgs/by-name/bl/blst/package.nix +++ b/pkgs/by-name/bl/blst/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blst"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; - rev = "v${finalAttrs.version}"; - hash = "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q9/zGN93TnJt2c8YvSaURstoxT02ts3nVkO5V08m4TI="; }; buildPhase = '' @@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; meta = with lib; { + changelog = "https://github.com/supranational/blst/releases/tag/${finalAttrs.src.tag}"; description = "Multilingual BLS12-381 signature library"; homepage = "https://github.com/supranational/blst"; license = licenses.isc; diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index d0eeef7184b7..9c4530cbc0f2 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -104,9 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -rf updater # patch cargo-deps - pushd $cargoDepsCopy/tauri-plugin-shell-* - patch -p1 < /build/source/src-tauri/patches/tauri-plugin-shell+*.patch - popd + patch -d $cargoDepsCopy/tauri-plugin-shell-* -p1 < ./src-tauri/patches/tauri-plugin-shell+*.patch substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -120,7 +118,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -s ${shelter} src-tauri/injection/shelter.js # link html/frontend data - ln -s /build/source/src /build/source/src-tauri/html + ln -s $(pwd)/src src-tauri/html ''; configurePhase = '' @@ -130,7 +128,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildPhase = '' ninjaBuildPhase - cd /build/source + cd ../.. tauriBuildHook ''; diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index f64006f7c529..8d1ce60fd6ef 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.56.1"; + version = "3.56.2"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; - hash = "sha256-ZGzAA32j+fKVeUxjfZU5StdvjJvuImi+LEGD4ncgwTc="; + hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw="; }; patches = [ diff --git a/pkgs/by-name/ge/gexiv2/package.nix b/pkgs/by-name/ge/gexiv2/package.nix index 7913d8aeb268..602a9332c4e1 100644 --- a/pkgs/by-name/ge/gexiv2/package.nix +++ b/pkgs/by-name/ge/gexiv2/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.14.3"; + version = "0.14.5"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IeZNLFbpszPUT+8/KkslZT2SLEGazZcvqW+raVIX4sg="; + sha256 = "CRPFPaq6sfGrWGr9VbtVNweW8rirzG43ZAq3cErZnOE="; }; nativeBuildInputs = diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index 3704cac926f3..849131c3ee53 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "48.0"; + version = "48.2.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; - hash = "sha256-LWuqAR7peATHVh9+HL2NR2PjC1W4gY3aePn3WvuNjQU="; + hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 2faeedb56dd3..7bfeb7923797 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -75,11 +75,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "48.1"; + version = "48.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-AYPbNlqqj4W0SyPMnK5nXRyDNgSf7BGoym6pvb6MSP4="; + hash = "sha256-0uxKXifhkdkvmO1NvEqGHX8axKWiS2UktJKhIAfdRgw="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix index 3da03ba6a6da..9a9d68d7f960 100644 --- a/pkgs/by-name/gn/gnome-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -28,9 +28,9 @@ withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-desktop"; - version = "44.1"; + version = "44.3"; outputs = [ "out" @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-rnylXcngiRSZl0FSOhfSnOIjkVYmvSRioSC/lvR6eas="; + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40="; }; patches = lib.optionals stdenv.hostPlatform.isLinux [ @@ -114,4 +114,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; teams = [ teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 5e1ad264b1a4..5f4ae7a457be 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "48.2"; + version = "48.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-rW3WEmiF+xaG7kv0mnh6clfHzF93nlQTQVWmgKMKjLk="; + hash = "sha256-rocWuLCz/r0+0iwX6QYuuA9tbSXFBQHATUIwuXzuRco="; }; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index 9d437660787e..dcf5cf77f51e 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.54.2"; + version = "3.54.3"; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-D389KcBmb/vMUD8+DzOWNi7/25MX1BZkzmXfFH7zU3I="; + hash = "sha256-vPZV3R3cIrwleTtoQNoZ9crXugtyJ/+WntnCUvA2qsU="; }; mesonFlags = [ diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index 4f6772825787..3d5dc92ddb82 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "48.1"; + version = "48.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-m2f8LFgC2hcTp3sZ/6BCMY3XHnva6EN3lsX1GXlTOTw="; + hash = "sha256-6Sh+hjSJ5fpqLFWuW+ocqRCuQBbe6zQXNiZ4sEqR7P8="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index 8333dad8a2fa..1d383b1d6cb1 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -69,7 +69,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "48.1"; + version = "48.2"; outputs = [ "out" @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-uk9FWv1iE/OHVFlG482dqjnJBPerFt2DCsd6c/8QAso="; + hash = "sha256-XSbMfvymNIW33bbHo5Msoa+fqPy+OLjJnqP0qyFzpqk="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index d6d62b5775b7..dda5eef005eb 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "48.1"; + version = "48.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-CEqYUEApTDZFS0ZKIUT5gcAnSQa0xJ1xYT5hztapbo8="; + hash = "sha256-q/0wZDqGxl9IhrZ2XrO7YhXJ6gmBfWvRZcUAVokIIsk="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index 4bcf840b4397..2bae985a569d 100644 --- a/pkgs/by-name/gn/gnome-terminal/package.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-terminal"; - version = "3.56.1"; + version = "3.56.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz"; - hash = "sha256-ojB1PlC9Qx27EwDhV7/XMXMA4lIm/zCJMxY2OhOGT/g="; + hash = "sha256-I1vAnfo0zF8elRIum/YCA6hNr4Yc+s9+RJbF9UgjmXg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 289c59cabc83..753f4b247b07 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "48.2"; + version = "48.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-/B9dR1vdJ9TAQ5pbj+ENbkAbQvHbo9BLdWeDkDbuICs="; + hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix index cb51a99aeba8..92f83a105f28 100644 --- a/pkgs/by-name/gn/gnome-user-docs/package.nix +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "48.1"; + version = "48.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-rJc9kk4AVFoUWNhqEQ1Hc+a743w3KEDXbtZAyyaMYf0="; + hash = "sha256-Z4Kfdkumctf5n/cu9lE7QMyTH7QBv3vX21+AXnv6Pbk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/grilo/package.nix b/pkgs/by-name/gr/grilo/package.nix index 8b04f025f60b..20334e4cda1b 100644 --- a/pkgs/by-name/gr/grilo/package.nix +++ b/pkgs/by-name/gr/grilo/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.16"; # if you change minor, also change ./setup-hook.sh + version = "0.3.19"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "iEWA6MXs4oDfI6pj/1I0t9SJiKQE331r/M0ed7RzvZY="; + sha256 = "CGnIHRmrE5xmfXlWfBTdy2y1y/wBCNBMreKH6ylTZwY="; }; mesonFlags = [ diff --git a/pkgs/by-name/hy/hypercore/package.nix b/pkgs/by-name/hy/hypercore/package.nix index fc5364dd3088..59e1ec8948c8 100644 --- a/pkgs/by-name/hy/hypercore/package.nix +++ b/pkgs/by-name/hy/hypercore/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "hypercore"; - version = "11.8.3"; + version = "11.9.1"; src = fetchFromGitHub { owner = "holepunchto"; repo = "hypercore"; tag = "v${finalAttrs.version}"; - hash = "sha256-3b1Q2fDEGEqI/HW/zKgxbzqFn368V5kHVETqRcJF+1U="; + hash = "sha256-aOF/wsq3m+CBrnZkkheukSmYuujOzRb8nJKp4AhZ3kc="; }; npmDepsHash = "sha256-ZJxVmQWKgHyKkuYfGIlANXFcROjI7fibg6mxIhDZowM="; diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 9a82987720fc..102698250980 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.217"; + version = "1.218"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-x5wxexU9hvVCR50f89dbg1HAW+qh6j3ZUJ0CormeBYo="; + hash = "sha256-TGl4J4r7ueAahrTgsJH0DlucuT2OrW3NzR1jQGwQA7E="; }; dontUnpack = true; diff --git a/pkgs/by-name/mm/mm-common/package.nix b/pkgs/by-name/mm/mm-common/package.nix index 439a9e597ed8..608d090485f8 100644 --- a/pkgs/by-name/mm/mm-common/package.nix +++ b/pkgs/by-name/mm/mm-common/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "tVxGA3282rxc7js4nqEcw5EK22jr6IPpR3hHqmYIYuc="; + sha256 = "SUq/zngUGCWbHp2IiMc69N5LbzvjbMddm6qLqg8qejk="; }; strictDeps = true; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 6985d2186110..aadec9a67011 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "48.2"; + version = "48.3.1"; outputs = [ "out" @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-PBi6Tgk+qaN4ET3K+nvbXB+db1r5dlAmt+Zst42vYU4="; + hash = "sha256-BvimrX/0+HOa9q8uF1PJHfp7mDl+UpRmMloQGMeVCmo="; }; mesonFlags = [ diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index b226b106f290..c1078773bb1a 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "48.1"; + version = "48.2"; outputs = [ "out" @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-eZWioXwp1LCav53ZrKFLje597DvXR3bdN5US8ubXNH8="; + hash = "sha256-oDD2Fj+KaAZPrlqeieN/Gcuyk94uEqGd1eIQlW0N9LU="; }; patches = [ diff --git a/pkgs/by-name/ne/nero-umu/nerofs.patch b/pkgs/by-name/ne/nero-umu/nerofs.patch new file mode 100644 index 000000000000..cb310004970f --- /dev/null +++ b/pkgs/by-name/ne/nero-umu/nerofs.patch @@ -0,0 +1,57 @@ +--- a/src/nerofs.cpp ++++ b/src/nerofs.cpp +@@ -173,31 +173,19 @@ + + QString NeroFS::GetIcoextract() + { +- // TODO: this is for flexibility in sandboxed environments(?) +- // idk what the "good" path should be for Flatpak, so... +- if(QDir("/usr/bin").exists("icoextract")) { +- return "/usr/bin/icoextract"; +- } else return ""; ++ return QStandardPaths::findExecutable("icoextract"); + } + + + QString NeroFS::GetIcoutils() + { +- // TODO: this is for flexibility in sandboxed environments(?) +- // idk what the "good" path should be for Flatpak, so... +- if(QDir("/usr/bin").exists("icotool")) { +- return "/usr/bin/icotool"; +- } else return ""; ++ return QStandardPaths::findExecutable("icotool"); + } + + + QString NeroFS::GetUmU() + { +- // TODO: this is for flexibility in sandboxed environments(?) +- // idk what the "good" path should be for Flatpak, so... +- if(QDir("/usr/bin").exists("umu-run")) { +- return "/usr/bin/umu-run"; +- } else return ""; ++ return QStandardPaths::findExecutable("umu-run"); + } + + QString NeroFS::GetWinetricks(const QString &runner) +@@ -207,17 +195,13 @@ + return protonsPath.path() + '/' + runner + "/protonfixes/winetricks"; + else { + // fall back to system winetricks +- if(QDir("/usr/bin").exists("winetricks")) +- return "/usr/bin/winetricks"; +- else return ""; ++ return QStandardPaths::findExecutable("winetricks"); + } + } else if(QDir(protonsPath.path() + '/' + currentRunner + "/protonfixes").exists("winetricks")) + return protonsPath.path() + '/' + currentRunner + "/protonfixes/winetricks"; + else { + // fall back to system winetricks +- if(QDir("/usr/bin").exists("winetricks")) +- return "/usr/bin/winetricks"; +- else return ""; ++ return QStandardPaths::findExecutable("winetricks"); + } + } + diff --git a/pkgs/by-name/ne/nero-umu/neroprefix.patch b/pkgs/by-name/ne/nero-umu/neroprefix.patch new file mode 100644 index 000000000000..733237d6cdf6 --- /dev/null +++ b/pkgs/by-name/ne/nero-umu/neroprefix.patch @@ -0,0 +1,11 @@ +--- a/src/neroprefixsettings.cpp ++++ b/src/neroprefixsettings.cpp +@@ -598,7 +598,7 @@ + tmpDir.mkdir("nero-manager"); + QProcess process; + process.setWorkingDirectory(tmpDir.path()+"/nero-manager"); +- process.start("/usr/bin/curl", { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" }); ++ process.start(QStandardPaths::findExecutable("curl"), { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" }); + printf("Downloading Discord RPC Bridge...\n"); + + NeroPrefixSettingsWindow::blockSignals(true); diff --git a/pkgs/by-name/ne/nero-umu/package.nix b/pkgs/by-name/ne/nero-umu/package.nix new file mode 100644 index 000000000000..a0374f0925ad --- /dev/null +++ b/pkgs/by-name/ne/nero-umu/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + qt6, + qt6Packages, + icu, + icoextract, + icoutils, + umu-launcher, + winetricks, + curl, + mangohud, + gamescope, + gamemode, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "nero-umu"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "SeongGino"; + repo = "Nero-umu"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sX/Z/b5stauut8qg6IV/DdsCIkdx1N3+y1jwoXHr1LY="; + }; + + #Replace quazip git submodule with pre-packaged quazip + postUnpack = '' + rmdir source/lib/quazip/ + ln -s ${qt6Packages.quazip.src} source/lib/quazip + ''; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + pkg-config + ]; + + buildInputs = [ + qt6.qtbase + qt6.qttools + qt6.qt5compat + qt6Packages.quazip + icu + ]; + + runtimeDeps = [ + icoextract + icoutils + winetricks + curl + umu-launcher + mangohud + gamescope + gamemode + ]; + + cmakeFlags = [ + (lib.cmakeFeature "NERO_QT_VERSION" "Qt6") + ]; + + #Fixes to be able to find binaries for nix + patches = [ + ./nerofs.patch + ./neroprefix.patch + ]; + + installPhase = '' + runHook preInstall + install -Dm755 "nero-umu" "$out/bin/nero-umu" + for size in 32 48 64 128; do + install -Dm644 "$src/img/ico/ico_"$size".png" "$out/share/icons/hicolor/"$size"x"$size"/apps/xyz.TOS.Nero.png" + done + install -Dm644 "$src/xyz.TOS.Nero.desktop" "$out/share/applications/xyz.TOS.Nero.desktop" + runHook postInstall + ''; + + preFixup = '' + qtWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} + ) + ''; + + meta = { + homepage = "https://github.com/SeongGino/Nero-umu"; + description = "Fast and efficient Proton prefix runner and manager using umu as backend"; + license = lib.licenses.gpl3Plus; + mainProgram = "nero-umu"; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + ern775 + blghnks + keenanweaver + ]; + }; +}) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 56c51de76b72..e298c65f80f6 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -61,14 +61,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2025.1.0"; + version = "2025.2.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; tag = version; fetchSubmodules = true; - hash = "sha256-KufQjBSzhj1N+T95PjlNU3Tc9V5/X2OLwCbXoI2fdZk="; + hash = "sha256-EtXHMOIk4hGcLiaoC0ZWYF6XZCD2qNtt1HeJoJIuuTA="; }; outputs = [ diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index ae9ddec8febe..b600b2abd46c 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -29,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "48.1"; + version = "48.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-ZsbwmCIUnaJDpGM6fYSnsduq8UU0qf653yv+AaUFF4o="; + hash = "sha256-oIPaV4ZLVLoqPl9IG1QM/L5hiASjZDZoJ3Jw4mNTaf4="; }; patches = [ diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix index 350a2157def2..24048c5d31f4 100644 --- a/pkgs/by-name/pi/pipeline/package.nix +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "pipeline"; - version = "2.1.1"; + version = "2.5.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "pipeline"; - rev = "v${finalAttrs.version}"; - hash = "sha256-51ru1L+wxPtrNlnHyTouVxR6oZjanYvCoouB+eNOSD0="; + rev = finalAttrs.version; + hash = "sha256-Q1Y8a9EQUwgxlkYy+vbilHz7RVwkxXknVhc3u+dlNBE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-G6E+V4hXqz/ec5qKV43IUlwM866iurbptYFxidASJz0="; + hash = "sha256-pbYpJ2TyrBg3CMCshHnzb4hjq6SLfxXJyAElllicFDM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vo/vobcopy/fix-darwin.patch b/pkgs/by-name/vo/vobcopy/fix-darwin.patch new file mode 100644 index 000000000000..93ffdb6f5149 --- /dev/null +++ b/pkgs/by-name/vo/vobcopy/fix-darwin.patch @@ -0,0 +1,28 @@ +diff --git a/vobcopy.h b/vobcopy.h +index dcf4266..d34c2b4 100644 +--- a/vobcopy.h ++++ b/vobcopy.h +@@ -115,6 +115,7 @@ typedef enum { FALSE=0, TRUE=1 } bool; + + #ifdef HAVE_SYS_STATVFS_H + #include ++#ifndef __APPLE__ + #ifndef USE_STATFS + #define USE_STATVFS + #ifndef USE_STATFS_FOR_DEV +@@ -122,6 +123,7 @@ typedef enum { FALSE=0, TRUE=1 } bool; + #endif + #endif + #endif ++#endif + + #ifdef HAVE_MNTENT_H + #include +@@ -164,6 +166,6 @@ char *safestrncpy(char *dest, const char *src, size_t n); + int check_progress( void ); /* this can be removed because the one below supersedes it */ + int progressUpdate( int starttime, int cur, int tot, int force ); + +-#ifndef HAVE_FDATASYNC ++#if !defined(HAVE_FDATASYNC) || defined(__APPLE__) + #define fdatasync(fd) 0 + #endif diff --git a/pkgs/by-name/vo/vobcopy/package.nix b/pkgs/by-name/vo/vobcopy/package.nix index fbbd641f0910..61a073f1d1d9 100644 --- a/pkgs/by-name/vo/vobcopy/package.nix +++ b/pkgs/by-name/vo/vobcopy/package.nix @@ -1,32 +1,41 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, + gettext, libdvdread, libdvdcss, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vobcopy"; - version = "1.2.0"; + version = "1.2.1-unstable-2023-08-29"; - src = fetchurl { - url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2"; - sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9"; + src = fetchFromGitHub { + owner = "barak"; + repo = "vobcopy"; + rev = "cb560b3a67358f51d51ecc0e511f49f09f304a13"; + hash = "sha256-2EtSO39yOFoCZ5GMqtp+SvmzqSevlqYDo73p0lVHZ3o="; }; + # Based on https://github.com/barak/vobcopy/issues/14, but also fixes + # "error: call to undeclared function 'fdatasync'". The latter patch + # is inspired by https://github.com/php/php-src/commit/e69729f2ba02ddc26c70b4bd88ef86c0a2277bdc + patches = [ ./fix-darwin.patch ]; + + nativeBuildInputs = [ + autoreconfHook + ]; buildInputs = [ + gettext # Fails on Darwin otherwise libdvdread libdvdcss ]; - makeFlags = [ - "DESTDIR=$(out)" - "PREFIX=/" - ]; meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; - homepage = "http://vobcopy.org/projects/c/c.shtml"; + homepage = "https://github.com/barak/vobcopy"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; mainProgram = "vobcopy"; diff --git a/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch b/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch deleted file mode 100644 index 36886d7c4a2a..000000000000 --- a/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl -index 77aed075..82832fb4 100644 ---- a/xslt/common/html.xsl -+++ b/xslt/common/html.xsl -@@ -266,6 +266,16 @@ certain tokens, and you can add your own with {html.sidebar.mode}. See - --> - - -+ -+ - -