diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 187c33a8c374..b4b140190e7e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8302,6 +8302,12 @@ github = "eripa"; githubId = 1429673; }; + ErmitaVulpe = { + name = "Emily Wilczek"; + email = "emily.wilczek@proton.me"; + github = "ErmitaVulpe"; + githubId = 34629570; + }; ern775 = { email = "eren.demir2479090@gmail.com"; github = "ern775"; @@ -28943,6 +28949,14 @@ githubId = 110242808; name = "Vasilii Pustovoit"; }; + vavakado = { + email = "xor@vavakado.xyz"; + github = "vavakado"; + githubId = 80159210; + name = "Vladimir Rubin"; + matrix = "@vavakado:imagisphe.re"; + keys = [ { fingerprint = "A054 0374 CD37 2C71 FE6D E0CF CAB7 4472 7F36 B524"; } ]; + }; vbgl = { email = "Vincent.Laporte@gmail.com"; github = "vbgl"; diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 0a5a065e0ee3..2e1da91b8837 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -41,14 +41,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "9.13.0"; + version = "9.14.0"; __structuredAttrs = true; strictDeps = true; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-ONfYjXq8vGLG/jV1SD+1STzpYtJhqXihpNtNWLxLN5M="; + hash = "sha256-0bwkAksJQkKcYn6cXQsl1R35wa8eHY3KPlcvA7GUxWE="; }; patches = diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index d28885b64238..843c71ed2cc3 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -31,18 +31,18 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "19.8.3"; + version = "20.0"; src = fetchFromGitHub { owner = "ddnet"; repo = "ddnet"; tag = version; - hash = "sha256-/SfUDliB6fdc/yf2yVXHiqYlH+cIIoxz3RkP8SxsgA4="; + hash = "sha256-xFz4F7Gh8H3qxe6axjDHg0lg9aDbmLjNpzRHqdJyXUs="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0="; + hash = "sha256-n+1SlgmjSe0ul/iuK3kjTGSvyYwdxwcRrCAnZyavZA8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 0ecd436e621c..094111c60555 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -3,7 +3,7 @@ stdenv, buildNpmPackage, fetchFromGitHub, - electron_41, + electron_43, mpv-unwrapped, fetchPnpmDeps, pnpmConfigHook, @@ -15,28 +15,25 @@ makeDesktopItem, nix-update-script, webVersion ? false, + nixosTests, }: let + electron = electron_43; + + # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627 + pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; }; +in +buildNpmPackage (finalAttrs: { pname = "feishin"; version = "1.15.1"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw="; }; - electron = electron_41; - - # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627 - pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; }; -in -buildNpmPackage { - inherit pname version; - - inherit src; - __structuredAttrs = true; npmConfigHook = pnpmConfigHook; @@ -44,9 +41,9 @@ buildNpmPackage { npmDeps = null; pnpmDeps = fetchPnpmDeps { - inherit + inherit pnpm; + inherit (finalAttrs) pname - pnpm version src ; @@ -145,12 +142,19 @@ buildNpmPackage { }) ]; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + + # add a tests + tests = { + inherit (nixosTests.feishin) caddy nginx; + }; + }; meta = { description = "Full-featured Jellyfin, Navidrome, and OpenSubsonic Compatible Music Player"; homepage = "https://github.com/jeffvli/feishin"; - changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}"; + changelog = "https://github.com/jeffvli/feishin/releases/tag/v${finalAttrs.version}"; sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; @@ -161,4 +165,4 @@ buildNpmPackage { ]; } // lib.optionalAttrs (!webVersion) { mainProgram = "feishin"; }; -} +}) diff --git a/pkgs/by-name/fi/filebrowser-quantum/package.nix b/pkgs/by-name/fi/filebrowser-quantum/package.nix index a38354409ddd..21dd06b655e8 100644 --- a/pkgs/by-name/fi/filebrowser-quantum/package.nix +++ b/pkgs/by-name/fi/filebrowser-quantum/package.nix @@ -6,13 +6,13 @@ }: let - version = "1.4.0-stable"; + version = "1.5.2-stable"; src = fetchFromGitHub { owner = "gtsteffaniak"; repo = "filebrowser"; tag = "v${version}"; - hash = "sha256-Ojz1VTtlCFUTodQ66mr0ozLKsx3kUirm79HuFJu33yQ="; + hash = "sha256-1qG6IayTqL4x3CqJyvVSG8Fu4s6ywhWI9t1j9c+wTZM="; }; frontend = buildNpmPackage { @@ -20,7 +20,7 @@ let inherit version src; sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-tisZA7v0WsynNxgbww48eERz9+om4w8MW4IMzQIyh+Y="; + npmDepsHash = "sha256-J1PddXU79T0GVcAgxYEW/vraqYxbTvASw8RmW8dDeOw="; buildPhase = '' runHook preBuild @@ -47,7 +47,7 @@ buildGoModule { sourceRoot = "${src.name}/backend"; - vendorHash = "sha256-WvilFCwTGXecsD/afUpLL6TrGzr/cgkQeltCKKDc4AI="; + vendorHash = "sha256-YAMh0WMe1zDCJq8BuPcekb1J8RvRoxOmsZarKI1ZWcs="; preBuild = '' mkdir -p http/embed diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 72a33ae59aff..28df315920b5 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -53,13 +53,13 @@ let in buildGoModule (finalAttrs: { pname = "gitea"; - version = "1.27.2"; + version = "1.27.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${finalAttrs.version}"; - hash = "sha256-376YyRYcZGya/k5zg2zL2iqtrE7r2Q/DMd3DbOnKyOA="; + hash = "sha256-91hF7VpMDHyBj1dBlsVC/b3IhNAnUwK/qhZb77GPEnc="; }; proxyVendor = true; diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 8d10143de43d..7dbc0feb7370 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gogdl"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: { repo = "heroic-gogdl"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-qYarDcwrVrTpLHQYdWQvXL5+V1wMyL06+n5t6LXKBHI="; + hash = "sha256-tTd41ufxPObXwLpA1F0HXNEROnJwHt4WpojsRnNLml0="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/go/goupile/package.nix b/pkgs/by-name/go/goupile/package.nix index d497c20148ea..702068cce047 100644 --- a/pkgs/by-name/go/goupile/package.nix +++ b/pkgs/by-name/go/goupile/package.nix @@ -27,14 +27,14 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "goupile"; - version = "3.12.6"; + version = "3.12.7"; # https://github.com/Koromix/rygel/tags src = fetchFromGitHub { owner = "Koromix"; repo = "rygel"; tag = "goupile/${finalAttrs.version}"; - hash = "sha256-vwHcvvGWqdixMnE5FmhM2RtQl3OL0EIxoHjkDf8czj4="; + hash = "sha256-dGY8h55ugxdkMNIVcj2WgslfN7vcZD2VKoYWmOzBXIw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hash-slinger/package.nix b/pkgs/by-name/ha/hash-slinger/package.nix index 2e3f6c89130b..2b4eb5406dec 100644 --- a/pkgs/by-name/ha/hash-slinger/package.nix +++ b/pkgs/by-name/ha/hash-slinger/package.nix @@ -5,6 +5,7 @@ python3, unbound, libreswan, + openssl, }: stdenv.mkDerivation rec { @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { pythonPath = with python3.pkgs; [ dnspython m2crypto + openssl python-gnupg pyunbound ]; diff --git a/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch index 7b46473245f7..2c771441ca8a 100644 --- a/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch +++ b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch @@ -1,11 +1,11 @@ diff --git a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts -index ebef6aa4..c8bd853d 100644 +index 28c917ce..f3b09c55 100644 --- a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts +++ b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts -@@ -252,7 +252,7 @@ async function addNonSteamGame(props: { +@@ -255,7 +255,7 @@ async function addNonSteamGame(game: Game): Promise { // add new Entry const newEntry = {} as ShortcutEntry - newEntry.AppName = props.gameInfo.title + newEntry.AppName = gameInfo.title - newEntry.Exe = `"${app.getPath('exe')}"` + newEntry.Exe = `"heroic"` newEntry.StartDir = `"${process.cwd()}"` diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index 8f0bdf3cbe88..cf05d80bc405 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -12,7 +12,7 @@ makeWrapper, # Electron updates can break Heroic, so try to use same version as upstream. # If the used electron version is higher than upstream's then the node-abi package might need to be updated - electron, + electron_43, vulkan-helper, gogdl, nile, @@ -22,6 +22,7 @@ let pnpm = pnpm_10; + electron = electron_43; legendary = callPackage ./legendary.nix { }; epic-integration = callPackage ./epic-integration.nix { }; @@ -29,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; tag = "v${finalAttrs.version}"; - hash = "sha256-RDJDeL5exEzF2BhEWoiXWsTpV5hytrB6RDoXV0mTWTw="; + hash = "sha256-CpbCXmvfwXT16ZG/6fwPWSjBwK02ykJ/GuZk1VcW+tU="; }; pnpmDeps = fetchPnpmDeps { @@ -47,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 3; - hash = "sha256-lPHL6pA39hvEtq5WkcAXfcY3a0VPseQL/nI+oEjIZeE="; + hash = "sha256-NrglT9vtDMAYXmZ4G3vifvLXu1yS6xbp+cqE6B6vQFc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/hinoirisetr/package.nix b/pkgs/by-name/hi/hinoirisetr/package.nix new file mode 100644 index 000000000000..f81630e23e47 --- /dev/null +++ b/pkgs/by-name/hi/hinoirisetr/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromForgejo, + installShellFiles, + lib, + libnotify, + pandoc, + patchelf, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hinoirisetr"; + version = "1.6.3"; + + __structuredAttrs = true; + + src = fetchFromForgejo { + domain = "git.vavakado.xyz"; + owner = "me"; + repo = "hinoirisetr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XgIeeVCnlntf2RopA6SMuFCgbqTlTEZv6V5ezjEHVKA="; + }; + + cargoHash = "sha256-lydS9TWb+Y1PPC7C3Mn6KNVX1fsooAcDKJeKMnXWZY0="; + + nativeBuildInputs = [ + installShellFiles + pandoc + patchelf + ]; + + buildInputs = [ + libnotify + ]; + + postFixup = '' + patchelf --add-rpath "${lib.getLib libnotify}/lib" $out/bin/hinoirisetr + ''; + + postBuild = '' + pandoc manpages/hinoirisetr.1.md -s -t man -o hinoirisetr.1 + ''; + + postInstall = '' + installManPage hinoirisetr.1 + ''; + + meta = { + description = "a lightweight daemon that automatically adjusts your screen's color temperature and gamma"; + homepage = "https://git.vavakado.xyz/me/hinoirisetr"; + changelog = "https://git.vavakado.xyz/me/hinoirisetr/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + vavakado + ]; + mainProgram = "hinoirisetr"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/libcoap/package.nix b/pkgs/by-name/li/libcoap/package.nix index 42f6f9aa811e..f6bfbbcc92d3 100644 --- a/pkgs/by-name/li/libcoap/package.nix +++ b/pkgs/by-name/li/libcoap/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libcoap"; - version = "4.3.5a"; + version = "4.3.5b"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-mLVGIG2JkWMlnZOlLxFTZVGM0nF6q2PKJoEo0s4Vq54="; + hash = "sha256-QPRyySqUu3ZYcuhoJ7g49di66ZhVqYJacDP3wJgDEtY="; }; nativeBuildInputs = [ automake diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index e826b30803c0..41f5b97f6a2d 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - rustPlatform, + rustPackages_1_97, fetchFromGitHub, installShellFiles, pkg-config, @@ -9,19 +9,19 @@ versionCheckHook, }: -rustPlatform.buildRustPackage (finalAttrs: { +rustPackages_1_97.rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.29.0"; + version = "1.46.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-e/LKOQ+GAtdDye/poJdbX/98gDWle3NWIZ2zHwkGkcQ="; + hash = "sha256-yFmTUsTiNLmgZRbASWp0fm3pjmJgfx82YPGmzx6JcZY="; forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-stjjP8VRHy5k9zMXWGikVNExXRFte0gVBEsbKmPY6U4="; + cargoHash = "sha256-91tt31lKeeH0+PrsVTMSP+jKjt/1XFNJStqVtt0q8n0="; env = { # Get openssl-sys to use pkg-config @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/carthage-software/mago"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + atomicptr hythera patka ]; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 90b98eb5d7f9..b1e10843206c 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -164,11 +164,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "150.0.4078.105"; + version = "152.0.4191.53"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-cRQZLix+jBKu7LYEsnMjVeklcWA1cp6/igr+aJXNwBs="; + hash = "sha256-szIkRfvmzh4Lz/hOu+Dt6jZeDq9Jix72E23aUt6m46c="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -247,9 +247,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} - # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so - patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL* - # Edge specific set liboneauth patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 6bd63425dcad..7b6a2c8d0a22 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -121,13 +121,13 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname version src; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - dpkg - wrapGAppsHook3 - patchelf - ]; - - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; + nativeBuildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + dpkg + wrapGAppsHook3 + patchelf + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ]; dontUnpack = stdenv.hostPlatform.isLinux; dontFixup = stdenv.hostPlatform.isDarwin; @@ -158,7 +158,8 @@ stdenv.mkDerivation (finalAttrs: { patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true done - wrapGAppsHook $out/bin/mongodb-compass + gappsWrapperArgsHook + wrapGApp "$out/bin/mongodb-compass" ''; installPhase = '' diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 534e18bb6b4b..36674db8a9c1 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "150.0.4078.105"; + version = "152.0.4191.53"; src = fetchzip { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-dFXj22lTP3lBN8gLooHFn6OzBWb7ha+dEHl/+jFjctI="; + hash = "sha256-3akRs0D76LAJ8Lgr3P7X+cDrMNXiEC+LWNH8lUdBM9k="; stripRoot = false; }; diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index abdc18697804..f35d09986f02 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; - version = "8.8.1"; + version = "8.8.2"; src = fetchFromGitHub { owner = "redis"; repo = "redis"; tag = finalAttrs.version; - hash = "sha256-VIzIv7NOmvuXygMXyWpYpnwKQ2rGguaGRd48/QjyYD8="; + hash = "sha256-BlCSRaeqmOQb5+c2HLZJWjMPqFBnS7mOI30ssRXAO6U="; }; patches = lib.optional useSystemJemalloc (fetchpatch2 { diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index 767162a54185..ae7b124c5a9d 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustywind"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; tag = "v${finalAttrs.version}"; - hash = "sha256-VlmJJ9movoMumCChINLikz1HJ+KjMvZiTiBhrSCEAdk="; + hash = "sha256-DHZF/ftJqeKvjgaYUY8KNOkq7MBguPi2yXyrb1V91M8="; }; - cargoHash = "sha256-DAozCVsUBUp6TsbmtfZnU3G73OZE4qtDqtJzpv3fvp4="; + cargoHash = "sha256-A2bD4uXU4/9uMJjCHc83dfFVqjn/zgjZ31gDWiAhFVk="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix index 9de4c5154238..188449f9f589 100644 --- a/pkgs/by-name/so/songrec/package.nix +++ b/pkgs/by-name/so/songrec/package.nix @@ -12,24 +12,28 @@ ffmpeg, glib, libpulseaudio, + versionCheckHook, + nix-update-script, + pipewire, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "songrec"; - version = "0.6.7"; + version = "0.7.4"; src = fetchFromGitHub { owner = "marin-m"; repo = "songrec"; - rev = finalAttrs.version; - hash = "sha256-lCwFMBQ6IimNtXYMfTnFOpwOO2qbwijOEZ+oMsQKAP0="; + tag = finalAttrs.version; + hash = "sha256-U7THM8fagZREkleH6DWiusP3KcAtu/OrAg9USdCGRec="; }; - cargoHash = "sha256-BhDFGkvY6c8XbhJpFX1w8CSXK9IY/HiysNoooytFT9I="; + cargoHash = "sha256-O0YjeZCOe+cXjxUAgMT1l621rid4pexMZ3MbLDGxQsM="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 + rustPlatform.bindgenHook ]; buildInputs = [ @@ -40,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libadwaita libpulseaudio libsoup_3 + pipewire ]; preFixup = '' @@ -52,12 +57,21 @@ rustPlatform.buildRustPackage (finalAttrs: { mv packaging/rootfs/usr/share $out/share ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Open-source Shazam client for Linux, written in Rust"; homepage = "https://github.com/marin-m/SongRec"; + changelog = "https://github.com/marin-m/SongRec/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ tcbravo ]; + maintainers = with lib.maintainers; [ + tcbravo + tomasrivera + ]; mainProgram = "songrec"; }; }) diff --git a/pkgs/by-name/su/surge-downloader/package.nix b/pkgs/by-name/su/surge-downloader/package.nix new file mode 100644 index 000000000000..d67ee52f40d4 --- /dev/null +++ b/pkgs/by-name/su/surge-downloader/package.nix @@ -0,0 +1,63 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, + stdenv, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "surge-downloader"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "SurgeDM"; + repo = "Surge"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cUJwt4gRdlQvMnrEvYG7JZe/2oz4cN9k35TEur13Sks="; + }; + + vendorHash = "sha256-Ei2i7dQ9s42Gg6f2iLABbTG7OQspjHoRnqIhkfcNvFo="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-X github.com/SurgeDM/Surge/cmd.Version=${finalAttrs.version}" + ]; + + postInstall = + if stdenv.hostPlatform.isDarwin then + '' + mv $out/bin/Surge $out/bin/surge.tmp + mv $out/bin/surge.tmp $out/bin/surge + '' + else + '' + mv $out/bin/Surge $out/bin/surge + ln -s $out/bin/surge $out/bin/Surge + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + passthru.updateScript = nix-update-script { }; + + __structuredAttrs = true; + + meta = { + description = "TUI download manager"; + longDescription = '' + Surge is a blazing fast, open-source terminal (TUI) download manager built in Go. + Designed for power users who prefer a keyboard-driven workflow. It features a beautiful TUI, + as well as a background Headless Server and a CLI tool for automation. + ''; + homepage = "https://github.com/SurgeDM/Surge"; + changelog = "https://github.com/SurgeDM/Surge/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + mainProgram = "surge"; + maintainers = with lib.maintainers; [ ErmitaVulpe ]; + }; +}) diff --git a/pkgs/by-name/xe/xearth/package.nix b/pkgs/by-name/xe/xearth/package.nix index 49d17d289cdb..4efc5a2f9f04 100644 --- a/pkgs/by-name/xe/xearth/package.nix +++ b/pkgs/by-name/xe/xearth/package.nix @@ -50,11 +50,9 @@ stdenv.mkDerivation (finalAttrs: { By default, xearth updates the displayed image every five minutes. ''; maintainers = with lib.maintainers; [ mafo ]; - license = { - fullName = "xearth license"; - url = "https://xearth.org/copyright.html"; - free = true; - }; + # https://xearth.org/copyright.html + # > for non-commercial and not-for-profit purposes + license = lib.licenses.unfreeRedistributable; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/compilers/rust/1_97.nix b/pkgs/development/compilers/rust/1_97.nix new file mode 100644 index 000000000000..6e5d5f81c8d3 --- /dev/null +++ b/pkgs/development/compilers/rust/1_97.nix @@ -0,0 +1,104 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob//.gitmodules + +# Note: The way this is structured is: +# 1. Import default.nix, and apply arguments as needed for the file-defined function +# 2. Implicitly, all arguments to this file are applied to the function that is imported. +# if you want to add an argument to default.nix's top-level function, but not the function +# it instantiates, add it to the `removeAttrs` call below. +{ + stdenv, + lib, + newScope, + callPackage, + pkgsBuildTarget, + pkgsBuildBuild, + pkgsBuildHost, + pkgsHostTarget, + pkgsTargetTarget, + makeRustPlatform, + wrapRustcWith, + llvmPackages, + llvm, + cargo-auditable, + wrapCCWith, + overrideCC, + fetchpatch, +}@args: +let + llvmSharedFor = + pkgSet: + pkgSet.llvmPackages.libllvm.override ( + { + enableSharedLibraries = true; + } + // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { + # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM + stdenv = pkgSet.stdenv.override { + allowedRequisites = null; + cc = pkgSet.pkgsBuildHost.llvmPackages.clangUseLLVM; + }; + } + ); +in +import ./default.nix + { + rustcVersion = "1.97.1"; + rustcSha256 = "sha256-YiwrQpxTy/3A3TpR0DVU6RzWPr7BkSwfVwlkDN/vGp0="; + + llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; + llvmSharedForHost = llvmSharedFor pkgsBuildHost; + llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; + + inherit llvmPackages cargo-auditable; + + # For use at runtime + llvmShared = llvmSharedFor pkgsHostTarget; + + # Note: the version MUST be the same version that we are building. Upstream + # ensures that each released compiler can compile itself: + # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 + bootstrapVersion = "1.97.1"; + + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` + bootstrapHashes = { + i686-unknown-linux-gnu = "914c2702deada0b9cf1d64bb3495d76e55cb3eba07d508472dde8b55a93e3759"; + x86_64-unknown-linux-gnu = "b4cdbc7cc6b0ee0a2666b1872769fdb2ad8393b28b63952f6493b4b400e4832b"; + x86_64-unknown-linux-musl = "40dbea28193cf2b488cf3e4a89274ccfb60efa50883f19917a382f84fd05bdc4"; + arm-unknown-linux-gnueabihf = "ba62fe07ad85b507907705a14adc1e8bc258de5f6177ba41d77bbff9f469a4ce"; + armv7-unknown-linux-gnueabihf = "e89c5e33aaddc6ef56857000c9117875c2997e9a1a500bd7b16277c9874b002f"; + aarch64-unknown-linux-gnu = "2f2496c70bd336a66a4c8baf2d303ba161f3552f192444c3639ba903c7c1e2c5"; + aarch64-unknown-linux-musl = "c5f45b5c6eb7f8fdb277c54c08402b7c931516740fbd4eccc26ba148f7cd5d57"; + x86_64-apple-darwin = "5f4c84d2bcce7983468642855a45fc4978fba1324cfdd1ea0b182face3ab4ffa"; + aarch64-apple-darwin = "cbd14c36f039f6f11f38148a6295d8234d18ddf20bea53031c86f119423a8b26"; + powerpc64-unknown-linux-gnu = "2b507d5eb9b5c4c041b50e93e069db56d094f02e6df103dc74c016155141bfae"; + powerpc64le-unknown-linux-gnu = "ff524eef5a59d801df09ccad5cdaf9ea1f0a07d75cbed2a7e9f013a9eb76a3c1"; + powerpc64le-unknown-linux-musl = "15630f33fbea2dd9661f8482b6c612da271549aba40401444aaa53650e646b9b"; + riscv64gc-unknown-linux-gnu = "59bec35d8febb2ab918fa41cffbaa5b07146a63bdc33f029ff756d70a3151ece"; + s390x-unknown-linux-gnu = "808268af9e880d41b8cb32b242e38c9bd3ea7aba6409b02fbffa0fbc5370c538"; + loongarch64-unknown-linux-gnu = "d5a925962854730ae7641420d8337af93988ea4ff47b503a856ec53776c87841"; + loongarch64-unknown-linux-musl = "3fb653299d228e3e0726afb179b07dd10a51a2ecc3cdfcd740011b1d8420ca97"; + x86_64-unknown-freebsd = "77866a4c449bcccb40e9d6712bf3eb899d29018ed8e841fd9d8d59370751f152"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_97; + } + + ( + removeAttrs args [ + "llvmPackages" + "llvm" + "wrapCCWith" + "overrideCC" + "pkgsHostTarget" + "fetchpatch" + "cargo-auditable" + ] + ) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 7c3d4eb2a5e0..e5d2ef896d05 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage.override pname = "cargo"; inherit (rustc.unwrapped) version src; - patches = [ + patches = lib.optionals (lib.versionOlder rustc.unwrapped.version "1.97.0") [ (fetchpatch { name = "CVE-2026-5222.patch"; url = "https://github.com/rust-lang/cargo/commit/c4d63a44234de22dc745231c416b80ed848d997f.patch"; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index f18dfea5a2ca..e30d548bc606 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -77,8 +77,8 @@ in hash = "sha256-+cn00M12ksbj2jY81MpyqCakmuGPXtQwtvyue8KIHhg="; }; php84 = mkPhp { - version = "8.4.24"; - hash = "sha256-KGiQRHWIUQ3xEO3p6c4J8etPmFZjC0f9xA7OcOIDc88="; + version = "8.4.25"; + hash = "sha256-lSzMF4Uma5WPSh3PxYDgjqu7efRCItHv8ZK82Y2R9uM="; }; php85 = mkPhp { version = "8.5.10"; diff --git a/pkgs/development/python-modules/hatch-argparse-manpage/default.nix b/pkgs/development/python-modules/hatch-argparse-manpage/default.nix index a0efb0bac9f6..74103f6a1bd8 100644 --- a/pkgs/development/python-modules/hatch-argparse-manpage/default.nix +++ b/pkgs/development/python-modules/hatch-argparse-manpage/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "hatch-argparse-manpage"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "damonlynch"; repo = "hatch-argparse-manpage"; tag = "v${finalAttrs.version}"; - hash = "sha256-wkMLbbOkIRO83byUTJRYAS7uTYc2weL/viH1fI8xYh0="; + hash = "sha256-+0X/+jWKcgwhXqli9AD208ITQUyvlqeXMbEr/bTYAM0="; }; build-system = [ diff --git a/pkgs/development/python-modules/hatch-gettext/default.nix b/pkgs/development/python-modules/hatch-gettext/default.nix index 743cdbaf3f63..87db6fb6f1cb 100644 --- a/pkgs/development/python-modules/hatch-gettext/default.nix +++ b/pkgs/development/python-modules/hatch-gettext/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "hatch-gettext"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "damonlynch"; repo = "hatch-gettext"; tag = "v${finalAttrs.version}"; - hash = "sha256-hdYwDKRzv3iRoKUtPssOL2t4iPPsK+wlSydbMOeFyUs="; + hash = "sha256-EPyG9RYVdxEvgfHLb18zNCe5Wk6he+QAzxVCsNWu56k="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 1df2db016dc4..376d435808f0 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.30.1"; + version = "3.35.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AS2s9OUgXc5wW73HCogCWorq3BFLydLQrE/LEir6BFc="; + hash = "sha256-WDAHtWbRNGpNJIb6qw4ihY8ZQsRgZKtxuOfpMUbixT0="; }; build-system = [ diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index a389da6bef3d..80e85241175b 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -24,13 +24,13 @@ let in buildPythonPackage rec { pname = "tpm2-pytss"; - version = "3.0.0rc1"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "tpm2_pytss"; - hash = "sha256-9Wj7RKjcjCzPqlsA4PxgVGQBvqQKuANG2tMb/cI3ihE="; + hash = "sha256-wZPPGQi0gvk8SqRkEykg/jo31LnYAuJnl0/y3+N9RDM="; }; patches = [ diff --git a/pkgs/development/web/nodejs/v26.nix b/pkgs/development/web/nodejs/v26.nix index e7ba3bd59a44..182d4b35991e 100644 --- a/pkgs/development/web/nodejs/v26.nix +++ b/pkgs/development/web/nodejs/v26.nix @@ -23,8 +23,8 @@ let [ ]; in buildNodejs { - version = "26.7.0"; - sha256 = "e6b182cbeeab032d1082ca4ac4fe15e3a57de691d3bde78ecf8a761fd56ee356"; + version = "26.8.1"; + sha256 = "d1698832a1a10f050cdda044a3e3d6a748246811e2e7bc89ba9a8bd693dc45f2"; patches = (lib.optional (!(stdenv.hostPlatform.emulatorAvailable buildPackages)) (fetchpatch2 { url = "https://raw.githubusercontent.com/buildroot/buildroot/2f0c31bffdb59fb224387e35134a6d5e09a81d57/package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b65388b9af7..e5216081ba6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4326,6 +4326,7 @@ with pkgs; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; rust_1_95 = callPackage ../development/compilers/rust/1_95.nix { }; + rust_1_97 = callPackage ../development/compilers/rust/1_97.nix { }; rust = rust_1_95; mrustc = callPackage ../development/compilers/mrustc { }; @@ -4333,6 +4334,7 @@ with pkgs; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; rustPackages_1_95 = rust_1_95.packages.stable; + rustPackages_1_97 = rust_1_97.packages.stable; rustPackages = rustPackages_1_95; inherit (rustPackages)