From e3296bd4b14dc4b0009059c242cabd589db8979b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 28 Sep 2024 12:57:58 +0300 Subject: [PATCH 1/5] gallery-dl: 1.27.4 -> 1.27.5 Changelog: https://github.com/mikf/gallery-dl/releases/tag/v1.27.5 Diff: https://github.com/mikf/gallery-dl/compare/v1.27.4...v1.27.5 (cherry picked from commit c7ad3a761946476f2a7045ded7dc3885b3ebc9f9) --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 3c0b631ed0a1..b235cabde998 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.4"; + version = "1.27.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-28y5sU9onPHIqlTIYzIQ+J2KElJocbuwKQN/E50JGI8="; + hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4="; }; propagatedBuildInputs = [ From d4eb7924598b8bd830e85c93aeb6aa7c5294de9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Oct 2024 22:01:06 +0000 Subject: [PATCH 2/5] brave: 1.70.119 -> 1.70.123 (cherry picked from commit 07196b859d851803a7393dc2283146ea41a18cf8) --- pkgs/applications/networking/browsers/brave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 44f42cf89d32..51e85e0047a9 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then rec { pname = "brave"; - version = "1.70.119"; + version = "1.70.123"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-we/M1/hMdnxxKfhS6q+Lc3G2OCj+wyBpoC6pfd0Ta08="; + hash = "sha256-YqSZYQinNyQQQds5ACyDCeZA+D4sBxyMvMiOvD6CVeU="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then rec { pname = "brave"; - version = "1.70.119"; + version = "1.70.123"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-GtFkE0R4s0G9pO2Omt1V+YvBv0kvyJrcPc41ba07TTQ="; + hash = "sha256-Hr7/Yry7fhSDe1gzpZqtjuIDrbB6HuC1PSeBQ3HlAdE="; platform = "x86_64-linux"; } else From 0984dd85078e81c4d9c383b4554bee3af91e9641 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:56:37 +0300 Subject: [PATCH 3/5] rewind-ai: 1.5284-15284.1-dcd0176-20240504 -> 1.5310-15310.1-5f6bcc5-20240930 (cherry picked from commit b3b6abf1e04b0a84a8286091f48e446c620fabbe) --- pkgs/by-name/re/rewind-ai/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/rewind-ai/package.nix b/pkgs/by-name/re/rewind-ai/package.nix index cfd1db484671..d1ca6ddf5389 100644 --- a/pkgs/by-name/re/rewind-ai/package.nix +++ b/pkgs/by-name/re/rewind-ai/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # 15284.1 (build number) # dcd0176 (commit hash) # 20240504 (pub date) - version = "1.5284-15284.1-dcd0176-20240504"; + version = "1.5310-15310.1-5f6bcc5-20240930"; src = fetchzip { url = @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { commitHash = lib.elemAt (lib.splitString "-" finalAttrs.version) 2; in "https://updates.rewind.ai/builds/main/b${buildNumber}-main-${commitHash}.zip"; - hash = "sha256-Y7iAYHH/msZoXFzAZHJb6YoDz5fwMPHJx1kg7TqP5Gw="; + hash = "sha256-uNqblEOezCj1JanDl6MZZO3GLX5jgWh19VeMcmwZvZg="; }; installPhase = '' From e82dc77a6a3d4605226d0119c197430f489b64ed Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Wed, 11 Sep 2024 17:54:37 -0700 Subject: [PATCH 4/5] doc/hooks/desktop-file-utils: document hook (cherry picked from commit 9baf2743ad56503631b11d0a1e4adfae4f44a159) --- doc/hooks/desktop-file-utils.section.md | 5 +++++ doc/hooks/index.md | 1 + 2 files changed, 6 insertions(+) create mode 100644 doc/hooks/desktop-file-utils.section.md diff --git a/doc/hooks/desktop-file-utils.section.md b/doc/hooks/desktop-file-utils.section.md new file mode 100644 index 000000000000..41cc3cad0d0c --- /dev/null +++ b/doc/hooks/desktop-file-utils.section.md @@ -0,0 +1,5 @@ +# desktop-file-utils {#desktop-file-utils} + +This setup hook removes the MIME cache (located at `$out/share/applications/mimeinfo.cache`) in the `preFixupPhase`. + +This hook is necessary because `mimeinfo.cache` can be created when a package uses `desktop-file-utils`, resulting in collisions if multiple packages are installed that contain this file (as in [#48295](https://github.com/NixOS/nixpkgs/issues/48295)). diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 1534ef85ccb9..bf9965bd681f 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -11,6 +11,7 @@ autopatchelf.section.md bmake.section.md breakpoint.section.md cmake.section.md +desktop-file-utils.section.md gdk-pixbuf.section.md ghc.section.md gnome.section.md From f6d4ec34d80b4067cee6046ebdf70e193a351714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sun, 6 Oct 2024 12:01:33 +0200 Subject: [PATCH 5/5] unison-ucm: 0.5.26 -> 0.5.27 (cherry picked from commit f5f81deeaf85a626e4265793a96b9440a9bcf846) --- pkgs/development/compilers/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 2dd2b7a15897..d3370a6a1890 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.26"; + version = "0.5.27"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-RF2Q5sCxT9F3IGM/8UP6bEe9sOjtpMVYHREuAPOzh8g="; + hash = "sha256-bmEmox+CfkGZP9GCfwDyspTult0WV+6jfQzehT33p8U="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-t0rc1f4PfjHRu/tzoW8sJ/6R0KBbYQPiWHqsIaqc+SY="; + hash = "sha256-js7MgzJQShy6z1QNsIRwjtZfrNOGwUA001SWlKWgMoA="; }; # The tarball is just the prebuilt binary, in the archive root.