nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-24 01:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-24.05 into staging-next-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-10-07 00:17:32 +00:00
committed by GitHub
parent 687d872a41 8c66cff1a5
commit bee28caf72
6 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/hooks/desktop-file-utils.section.md Normal file
View File

@@ -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)).

1
doc/hooks/index.md
View File

@@ -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

4
pkgs/applications/misc/gallery-dl/default.nix
View File

@@ -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 = [

8
pkgs/applications/networking/browsers/brave/default.nix
View File

@@ -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

4
pkgs/by-name/re/rewind-ai/package.nix
View File

@@ -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 = ''

6
pkgs/development/compilers/unison/default.nix
View File

@@ -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.