diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 42413d2f482f..18d9edeec429 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -45,6 +45,8 @@ - `databricks-cli` has been updated from `0.290.2` to `1.x.x`, the first major release. OAuth tokens for interactive logins (`auth_type = databricks-cli`) are now stored in the OS-native secure store by default (Secret Service on Linux) instead of `~/.databricks/token-cache.json`; cached tokens from older versions are not migrated, so run `databricks auth login` once per profile after upgrading. To keep the previous file-backed storage, set `DATABRICKS_AUTH_STORAGE=plaintext` or add `auth_storage = plaintext` under `[__settings__]` in `~/.databrickscfg`. Additionally, the `vector_search_endpoints` DABs resource renamed `min_qps` to `target_qps` (and the `vector-search-endpoints` command renamed `--min-qps` to `--target-qps`). See the [upstream changelog](https://github.com/databricks/cli/blob/main/CHANGELOG.md) for details. +- Gradle 7 has been removed because it is end-of-life. Please [upgrade to a newer version of Gradle](https://docs.gradle.org/current/userguide/upgrading_version_7.html). + - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details. - The existing `wasm32-wasi` target has become `wasm32-wasip1` and `pkgsCross.wasi32` has become `pkgsCross.wasm32-wasip1`, aligning with LLVM's nomenclature. Aliases are in place and old forms will continue to be parsed but there might be some breakage if you're relying on the exact form of these (e.g., in sysroot paths). diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 28c23a1cbf11..03a43ee33dc8 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "beekeeper-studio"; - version = "6.0.4"; + version = "6.0.5"; src = let @@ -54,9 +54,9 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}"; hash = selectSystem { - x86_64-linux = "sha256-smRbK5CxvpB/8kq3WqjBnpI229ygHUTElOadDi8Njsk="; - aarch64-linux = "sha256-bL/oCoyIVbC0J1wXcHo5a/flzOGuNIZkIJPOHbv9EKQ="; - aarch64-darwin = "sha256-DClBYrXriZXnOkSTXygLZ3tSnr6hin5CRF+OjFNQ+jQ="; + x86_64-linux = "sha256-AlimxfT2aMPXJQKU7NxSmhqhQApIWp1K5qd3wFRvo/w="; + aarch64-linux = "sha256-W+Avv/yKefGk64Wvz3rF7ehYkD73EbsMXqeQi/tXjtw="; + aarch64-darwin = "sha256-+NFFtfX4CxlzjBA8iAgexGIOx+5thEJ4iZR9ngkTsjI="; }; }; diff --git a/pkgs/by-name/fu/fuse-overlayfs/package.nix b/pkgs/by-name/fu/fuse-overlayfs/package.nix index f151dbfca6e5..cd47d86653d3 100644 --- a/pkgs/by-name/fu/fuse-overlayfs/package.nix +++ b/pkgs/by-name/fu/fuse-overlayfs/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fuse-overlayfs"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "containers"; repo = "fuse-overlayfs"; rev = "v${finalAttrs.version}"; - hash = "sha256-oXSqyxe5+hsuFXKajuviqh2nKIz8Kw6rjLnb6XTF6GI="; + hash = "sha256-Us7FKKJrZH5l+NRIEw2b3RTAGw08YfsIBauwH866P8E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/README.md b/pkgs/by-name/li/libretroPackages/README.md similarity index 93% rename from pkgs/applications/emulators/libretro/README.md rename to pkgs/by-name/li/libretroPackages/README.md index e444ab50a2b0..2b8c71779049 100644 --- a/pkgs/applications/emulators/libretro/README.md +++ b/pkgs/by-name/li/libretroPackages/README.md @@ -9,7 +9,7 @@ The basic steps to add a new core are: 1. Add a new core using `mkLibretroCore` function (use one of the existing cores as an example) -2. Add your new core to [`default.nix`](./default.nix) file. +2. Add your new core to [`packages.nix`](./packages.nix). 3. Try to build your core with `nix-build -A libretro.`. ## Using RetroArch with cores diff --git a/pkgs/applications/emulators/libretro/cores/atari800.nix b/pkgs/by-name/li/libretroPackages/cores/atari800.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/atari800.nix rename to pkgs/by-name/li/libretroPackages/cores/atari800.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-gba.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-gba.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-gba.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-gba.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-lynx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-lynx.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-lynx.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-ngp.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-ngp.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-ngp.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-pce-fast.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-pce-fast.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-pce.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-pce.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-pce.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pcfx.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-pcfx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-pcfx.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-pcfx.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-psx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-psx.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-psx.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-saturn.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-saturn.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-saturn.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-supafaust.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-supafaust.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-supergrafx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-supergrafx.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-vb.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-vb.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-vb.nix diff --git a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix b/pkgs/by-name/li/libretroPackages/cores/beetle-wswan.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/beetle-wswan.nix rename to pkgs/by-name/li/libretroPackages/cores/beetle-wswan.nix diff --git a/pkgs/applications/emulators/libretro/cores/blastem.nix b/pkgs/by-name/li/libretroPackages/cores/blastem.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/blastem.nix rename to pkgs/by-name/li/libretroPackages/cores/blastem.nix diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/by-name/li/libretroPackages/cores/bluemsx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/bluemsx.nix rename to pkgs/by-name/li/libretroPackages/cores/bluemsx.nix diff --git a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix b/pkgs/by-name/li/libretroPackages/cores/bsnes-hd.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/bsnes-hd.nix rename to pkgs/by-name/li/libretroPackages/cores/bsnes-hd.nix diff --git a/pkgs/applications/emulators/libretro/cores/bsnes-mercury.nix b/pkgs/by-name/li/libretroPackages/cores/bsnes-mercury.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/bsnes-mercury.nix rename to pkgs/by-name/li/libretroPackages/cores/bsnes-mercury.nix diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/by-name/li/libretroPackages/cores/bsnes.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/bsnes.nix rename to pkgs/by-name/li/libretroPackages/cores/bsnes.nix diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/by-name/li/libretroPackages/cores/citra.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/citra.nix rename to pkgs/by-name/li/libretroPackages/cores/citra.nix diff --git a/pkgs/applications/emulators/libretro/cores/desmume.nix b/pkgs/by-name/li/libretroPackages/cores/desmume.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/desmume.nix rename to pkgs/by-name/li/libretroPackages/cores/desmume.nix diff --git a/pkgs/applications/emulators/libretro/cores/desmume2015.nix b/pkgs/by-name/li/libretroPackages/cores/desmume2015.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/desmume2015.nix rename to pkgs/by-name/li/libretroPackages/cores/desmume2015.nix diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/by-name/li/libretroPackages/cores/dolphin.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/dolphin.nix rename to pkgs/by-name/li/libretroPackages/cores/dolphin.nix diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/by-name/li/libretroPackages/cores/dosbox-pure.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/dosbox-pure.nix rename to pkgs/by-name/li/libretroPackages/cores/dosbox-pure.nix diff --git a/pkgs/applications/emulators/libretro/cores/dosbox.nix b/pkgs/by-name/li/libretroPackages/cores/dosbox.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/dosbox.nix rename to pkgs/by-name/li/libretroPackages/cores/dosbox.nix diff --git a/pkgs/applications/emulators/libretro/cores/easyrpg.nix b/pkgs/by-name/li/libretroPackages/cores/easyrpg.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/easyrpg.nix rename to pkgs/by-name/li/libretroPackages/cores/easyrpg.nix diff --git a/pkgs/applications/emulators/libretro/cores/eightyone.nix b/pkgs/by-name/li/libretroPackages/cores/eightyone.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/eightyone.nix rename to pkgs/by-name/li/libretroPackages/cores/eightyone.nix diff --git a/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix b/pkgs/by-name/li/libretroPackages/cores/fbalpha2012.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/fbalpha2012.nix rename to pkgs/by-name/li/libretroPackages/cores/fbalpha2012.nix diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/by-name/li/libretroPackages/cores/fbneo.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/fbneo.nix rename to pkgs/by-name/li/libretroPackages/cores/fbneo.nix diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/by-name/li/libretroPackages/cores/fceumm.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/fceumm.nix rename to pkgs/by-name/li/libretroPackages/cores/fceumm.nix diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/by-name/li/libretroPackages/cores/flycast.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/flycast.nix rename to pkgs/by-name/li/libretroPackages/cores/flycast.nix diff --git a/pkgs/applications/emulators/libretro/cores/fmsx.nix b/pkgs/by-name/li/libretroPackages/cores/fmsx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/fmsx.nix rename to pkgs/by-name/li/libretroPackages/cores/fmsx.nix diff --git a/pkgs/applications/emulators/libretro/cores/freeintv.nix b/pkgs/by-name/li/libretroPackages/cores/freeintv.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/freeintv.nix rename to pkgs/by-name/li/libretroPackages/cores/freeintv.nix diff --git a/pkgs/applications/emulators/libretro/cores/fuse.nix b/pkgs/by-name/li/libretroPackages/cores/fuse.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/fuse.nix rename to pkgs/by-name/li/libretroPackages/cores/fuse.nix diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/by-name/li/libretroPackages/cores/gambatte.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/gambatte.nix rename to pkgs/by-name/li/libretroPackages/cores/gambatte.nix diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/by-name/li/libretroPackages/cores/genesis-plus-gx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix rename to pkgs/by-name/li/libretroPackages/cores/genesis-plus-gx.nix diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/by-name/li/libretroPackages/cores/gpsp.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/gpsp.nix rename to pkgs/by-name/li/libretroPackages/cores/gpsp.nix diff --git a/pkgs/applications/emulators/libretro/cores/gw.nix b/pkgs/by-name/li/libretroPackages/cores/gw.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/gw.nix rename to pkgs/by-name/li/libretroPackages/cores/gw.nix diff --git a/pkgs/applications/emulators/libretro/cores/handy.nix b/pkgs/by-name/li/libretroPackages/cores/handy.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/handy.nix rename to pkgs/by-name/li/libretroPackages/cores/handy.nix diff --git a/pkgs/applications/emulators/libretro/cores/hatari.nix b/pkgs/by-name/li/libretroPackages/cores/hatari.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/hatari.nix rename to pkgs/by-name/li/libretroPackages/cores/hatari.nix diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/by-name/li/libretroPackages/cores/mame.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mame.nix rename to pkgs/by-name/li/libretroPackages/cores/mame.nix diff --git a/pkgs/applications/emulators/libretro/cores/mame2000.nix b/pkgs/by-name/li/libretroPackages/cores/mame2000.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mame2000.nix rename to pkgs/by-name/li/libretroPackages/cores/mame2000.nix diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/by-name/li/libretroPackages/cores/mame2003-plus.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mame2003-plus.nix rename to pkgs/by-name/li/libretroPackages/cores/mame2003-plus.nix diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/by-name/li/libretroPackages/cores/mame2003.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mame2003.nix rename to pkgs/by-name/li/libretroPackages/cores/mame2003.nix diff --git a/pkgs/applications/emulators/libretro/cores/mame2010.nix b/pkgs/by-name/li/libretroPackages/cores/mame2010.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mame2010.nix rename to pkgs/by-name/li/libretroPackages/cores/mame2010.nix diff --git a/pkgs/applications/emulators/libretro/cores/mame2015.nix b/pkgs/by-name/li/libretroPackages/cores/mame2015.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mame2015.nix rename to pkgs/by-name/li/libretroPackages/cores/mame2015.nix diff --git a/pkgs/applications/emulators/libretro/cores/mame2016.nix b/pkgs/by-name/li/libretroPackages/cores/mame2016.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mame2016.nix rename to pkgs/by-name/li/libretroPackages/cores/mame2016.nix diff --git a/pkgs/applications/emulators/libretro/cores/melonds.nix b/pkgs/by-name/li/libretroPackages/cores/melonds.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/melonds.nix rename to pkgs/by-name/li/libretroPackages/cores/melonds.nix diff --git a/pkgs/applications/emulators/libretro/cores/melondsds.nix b/pkgs/by-name/li/libretroPackages/cores/melondsds.nix similarity index 98% rename from pkgs/applications/emulators/libretro/cores/melondsds.nix rename to pkgs/by-name/li/libretroPackages/cores/melondsds.nix index 67a04500c12d..982d90d4af5f 100644 --- a/pkgs/applications/emulators/libretro/cores/melondsds.nix +++ b/pkgs/by-name/li/libretroPackages/cores/melondsds.nix @@ -125,7 +125,7 @@ mkLibretroCore rec { })} src=$(nix-build --no-out-link -A "$UPDATE_NIX_ATTR_PATH.src") - core_file="pkgs/applications/emulators/libretro/cores/melondsds.nix" + core_file="pkgs/by-name/li/libretroPackages/cores/melondsds.nix" # find lines in the format: # fetch_dependency(name url rev) diff --git a/pkgs/applications/emulators/libretro/cores/mesen-s.nix b/pkgs/by-name/li/libretroPackages/cores/mesen-s.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mesen-s.nix rename to pkgs/by-name/li/libretroPackages/cores/mesen-s.nix diff --git a/pkgs/applications/emulators/libretro/cores/mesen.nix b/pkgs/by-name/li/libretroPackages/cores/mesen.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mesen.nix rename to pkgs/by-name/li/libretroPackages/cores/mesen.nix diff --git a/pkgs/applications/emulators/libretro/cores/meteor.nix b/pkgs/by-name/li/libretroPackages/cores/meteor.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/meteor.nix rename to pkgs/by-name/li/libretroPackages/cores/meteor.nix diff --git a/pkgs/applications/emulators/libretro/cores/mgba.nix b/pkgs/by-name/li/libretroPackages/cores/mgba.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mgba.nix rename to pkgs/by-name/li/libretroPackages/cores/mgba.nix diff --git a/pkgs/applications/emulators/libretro/cores/mrboom.nix b/pkgs/by-name/li/libretroPackages/cores/mrboom.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mrboom.nix rename to pkgs/by-name/li/libretroPackages/cores/mrboom.nix diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/by-name/li/libretroPackages/cores/mupen64plus.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/mupen64plus.nix rename to pkgs/by-name/li/libretroPackages/cores/mupen64plus.nix diff --git a/pkgs/applications/emulators/libretro/cores/neocd.nix b/pkgs/by-name/li/libretroPackages/cores/neocd.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/neocd.nix rename to pkgs/by-name/li/libretroPackages/cores/neocd.nix diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/by-name/li/libretroPackages/cores/nestopia.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/nestopia.nix rename to pkgs/by-name/li/libretroPackages/cores/nestopia.nix diff --git a/pkgs/applications/emulators/libretro/cores/np2kai.nix b/pkgs/by-name/li/libretroPackages/cores/np2kai.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/np2kai.nix rename to pkgs/by-name/li/libretroPackages/cores/np2kai.nix diff --git a/pkgs/applications/emulators/libretro/cores/nxengine.nix b/pkgs/by-name/li/libretroPackages/cores/nxengine.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/nxengine.nix rename to pkgs/by-name/li/libretroPackages/cores/nxengine.nix diff --git a/pkgs/applications/emulators/libretro/cores/o2em.nix b/pkgs/by-name/li/libretroPackages/cores/o2em.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/o2em.nix rename to pkgs/by-name/li/libretroPackages/cores/o2em.nix diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/by-name/li/libretroPackages/cores/opera.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/opera.nix rename to pkgs/by-name/li/libretroPackages/cores/opera.nix diff --git a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix b/pkgs/by-name/li/libretroPackages/cores/parallel-n64.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/parallel-n64.nix rename to pkgs/by-name/li/libretroPackages/cores/parallel-n64.nix diff --git a/pkgs/applications/emulators/libretro/cores/patches/citra-gcc-15.patch b/pkgs/by-name/li/libretroPackages/cores/patches/citra-gcc-15.patch similarity index 100% rename from pkgs/applications/emulators/libretro/cores/patches/citra-gcc-15.patch rename to pkgs/by-name/li/libretroPackages/cores/patches/citra-gcc-15.patch diff --git a/pkgs/applications/emulators/libretro/cores/patches/mame2015-python311.patch b/pkgs/by-name/li/libretroPackages/cores/patches/mame2015-python311.patch similarity index 100% rename from pkgs/applications/emulators/libretro/cores/patches/mame2015-python311.patch rename to pkgs/by-name/li/libretroPackages/cores/patches/mame2015-python311.patch diff --git a/pkgs/applications/emulators/libretro/cores/patches/mame2016-python311.patch b/pkgs/by-name/li/libretroPackages/cores/patches/mame2016-python311.patch similarity index 100% rename from pkgs/applications/emulators/libretro/cores/patches/mame2016-python311.patch rename to pkgs/by-name/li/libretroPackages/cores/patches/mame2016-python311.patch diff --git a/pkgs/applications/emulators/libretro/cores/patches/melondsds-zlib-no-zconf-rename.patch b/pkgs/by-name/li/libretroPackages/cores/patches/melondsds-zlib-no-zconf-rename.patch similarity index 100% rename from pkgs/applications/emulators/libretro/cores/patches/melondsds-zlib-no-zconf-rename.patch rename to pkgs/by-name/li/libretroPackages/cores/patches/melondsds-zlib-no-zconf-rename.patch diff --git a/pkgs/applications/emulators/libretro/cores/patches/parallel-n64-gcc15.patch b/pkgs/by-name/li/libretroPackages/cores/patches/parallel-n64-gcc15.patch similarity index 100% rename from pkgs/applications/emulators/libretro/cores/patches/parallel-n64-gcc15.patch rename to pkgs/by-name/li/libretroPackages/cores/patches/parallel-n64-gcc15.patch diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/by-name/li/libretroPackages/cores/pcsx-rearmed.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix rename to pkgs/by-name/li/libretroPackages/cores/pcsx-rearmed.nix diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/by-name/li/libretroPackages/cores/pcsx2.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/pcsx2.nix rename to pkgs/by-name/li/libretroPackages/cores/pcsx2.nix diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/by-name/li/libretroPackages/cores/picodrive.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/picodrive.nix rename to pkgs/by-name/li/libretroPackages/cores/picodrive.nix diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/by-name/li/libretroPackages/cores/play.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/play.nix rename to pkgs/by-name/li/libretroPackages/cores/play.nix diff --git a/pkgs/applications/emulators/libretro/cores/pokemini.nix b/pkgs/by-name/li/libretroPackages/cores/pokemini.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/pokemini.nix rename to pkgs/by-name/li/libretroPackages/cores/pokemini.nix diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/by-name/li/libretroPackages/cores/ppsspp.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/ppsspp.nix rename to pkgs/by-name/li/libretroPackages/cores/ppsspp.nix diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/by-name/li/libretroPackages/cores/prboom.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/prboom.nix rename to pkgs/by-name/li/libretroPackages/cores/prboom.nix diff --git a/pkgs/applications/emulators/libretro/cores/prosystem.nix b/pkgs/by-name/li/libretroPackages/cores/prosystem.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/prosystem.nix rename to pkgs/by-name/li/libretroPackages/cores/prosystem.nix diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/by-name/li/libretroPackages/cores/puae.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/puae.nix rename to pkgs/by-name/li/libretroPackages/cores/puae.nix diff --git a/pkgs/applications/emulators/libretro/cores/puae2021.nix b/pkgs/by-name/li/libretroPackages/cores/puae2021.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/puae2021.nix rename to pkgs/by-name/li/libretroPackages/cores/puae2021.nix diff --git a/pkgs/applications/emulators/libretro/cores/quicknes.nix b/pkgs/by-name/li/libretroPackages/cores/quicknes.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/quicknes.nix rename to pkgs/by-name/li/libretroPackages/cores/quicknes.nix diff --git a/pkgs/applications/emulators/libretro/cores/same_cdi.nix b/pkgs/by-name/li/libretroPackages/cores/same_cdi.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/same_cdi.nix rename to pkgs/by-name/li/libretroPackages/cores/same_cdi.nix diff --git a/pkgs/applications/emulators/libretro/cores/sameboy.nix b/pkgs/by-name/li/libretroPackages/cores/sameboy.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/sameboy.nix rename to pkgs/by-name/li/libretroPackages/cores/sameboy.nix diff --git a/pkgs/applications/emulators/libretro/cores/scummvm.nix b/pkgs/by-name/li/libretroPackages/cores/scummvm.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/scummvm.nix rename to pkgs/by-name/li/libretroPackages/cores/scummvm.nix diff --git a/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix b/pkgs/by-name/li/libretroPackages/cores/smsplus-gx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/smsplus-gx.nix rename to pkgs/by-name/li/libretroPackages/cores/smsplus-gx.nix diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/by-name/li/libretroPackages/cores/snes9x.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/snes9x.nix rename to pkgs/by-name/li/libretroPackages/cores/snes9x.nix diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2002.nix b/pkgs/by-name/li/libretroPackages/cores/snes9x2002.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/snes9x2002.nix rename to pkgs/by-name/li/libretroPackages/cores/snes9x2002.nix diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2005.nix b/pkgs/by-name/li/libretroPackages/cores/snes9x2005.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/snes9x2005.nix rename to pkgs/by-name/li/libretroPackages/cores/snes9x2005.nix diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix b/pkgs/by-name/li/libretroPackages/cores/snes9x2010.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/snes9x2010.nix rename to pkgs/by-name/li/libretroPackages/cores/snes9x2010.nix diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/by-name/li/libretroPackages/cores/stella.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/stella.nix rename to pkgs/by-name/li/libretroPackages/cores/stella.nix diff --git a/pkgs/applications/emulators/libretro/cores/stella2014.nix b/pkgs/by-name/li/libretroPackages/cores/stella2014.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/stella2014.nix rename to pkgs/by-name/li/libretroPackages/cores/stella2014.nix diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/by-name/li/libretroPackages/cores/swanstation.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/swanstation.nix rename to pkgs/by-name/li/libretroPackages/cores/swanstation.nix diff --git a/pkgs/applications/emulators/libretro/cores/tgbdual.nix b/pkgs/by-name/li/libretroPackages/cores/tgbdual.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/tgbdual.nix rename to pkgs/by-name/li/libretroPackages/cores/tgbdual.nix diff --git a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix b/pkgs/by-name/li/libretroPackages/cores/thepowdertoy.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/thepowdertoy.nix rename to pkgs/by-name/li/libretroPackages/cores/thepowdertoy.nix diff --git a/pkgs/applications/emulators/libretro/cores/tic80.nix b/pkgs/by-name/li/libretroPackages/cores/tic80.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/tic80.nix rename to pkgs/by-name/li/libretroPackages/cores/tic80.nix diff --git a/pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix b/pkgs/by-name/li/libretroPackages/cores/twenty-fortyeight.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix rename to pkgs/by-name/li/libretroPackages/cores/twenty-fortyeight.nix diff --git a/pkgs/applications/emulators/libretro/cores/vba-m.nix b/pkgs/by-name/li/libretroPackages/cores/vba-m.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/vba-m.nix rename to pkgs/by-name/li/libretroPackages/cores/vba-m.nix diff --git a/pkgs/applications/emulators/libretro/cores/vba-next.nix b/pkgs/by-name/li/libretroPackages/cores/vba-next.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/vba-next.nix rename to pkgs/by-name/li/libretroPackages/cores/vba-next.nix diff --git a/pkgs/applications/emulators/libretro/cores/vecx.nix b/pkgs/by-name/li/libretroPackages/cores/vecx.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/vecx.nix rename to pkgs/by-name/li/libretroPackages/cores/vecx.nix diff --git a/pkgs/applications/emulators/libretro/cores/vice.nix b/pkgs/by-name/li/libretroPackages/cores/vice.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/vice.nix rename to pkgs/by-name/li/libretroPackages/cores/vice.nix diff --git a/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix b/pkgs/by-name/li/libretroPackages/cores/virtualjaguar.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/virtualjaguar.nix rename to pkgs/by-name/li/libretroPackages/cores/virtualjaguar.nix diff --git a/pkgs/applications/emulators/libretro/cores/yabause.nix b/pkgs/by-name/li/libretroPackages/cores/yabause.nix similarity index 100% rename from pkgs/applications/emulators/libretro/cores/yabause.nix rename to pkgs/by-name/li/libretroPackages/cores/yabause.nix diff --git a/pkgs/applications/emulators/libretro/mkLibretroCore.nix b/pkgs/by-name/li/libretroPackages/mkLibretroCore.nix similarity index 100% rename from pkgs/applications/emulators/libretro/mkLibretroCore.nix rename to pkgs/by-name/li/libretroPackages/mkLibretroCore.nix diff --git a/pkgs/by-name/li/libretroPackages/package.nix b/pkgs/by-name/li/libretroPackages/package.nix new file mode 100644 index 000000000000..5b2cfe80c563 --- /dev/null +++ b/pkgs/by-name/li/libretroPackages/package.nix @@ -0,0 +1,28 @@ +{ + stdenvNoCC, +}: + +# The only reason this package exists is to pass nixpkgs-vet validations. +# https://github.com/NixOS/nixpkgs/pull/522287 +stdenvNoCC.mkDerivation { + pname = "libretroPackages"; + version = "0"; + + strictDeps = true; + __structuredAttrs = true; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + runHook postInstall + ''; + + meta = { + description = "Dummy package for the libretro package set"; + platforms = [ ]; + }; +} diff --git a/pkgs/applications/emulators/libretro/default.nix b/pkgs/by-name/li/libretroPackages/packages.nix similarity index 100% rename from pkgs/applications/emulators/libretro/default.nix rename to pkgs/by-name/li/libretroPackages/packages.nix diff --git a/pkgs/by-name/li/liteparse/package.nix b/pkgs/by-name/li/liteparse/package.nix index 6ac98311ce23..95925f4c852b 100644 --- a/pkgs/by-name/li/liteparse/package.nix +++ b/pkgs/by-name/li/liteparse/package.nix @@ -64,14 +64,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "liteparse"; - version = "2.13.0"; + version = "2.14.2"; __structuredAttrs = true; src = fetchFromGitHub { owner = "run-llama"; repo = "liteparse"; tag = "crates-v${finalAttrs.version}"; - hash = "sha256-owKu03Gxou53hQbU9O+UniJTCxtGKshgO11sF6DNudI="; + hash = "sha256-57orag1GemhqlGVDGWDLyer9H53xR8pBoOnMHIyEBz0="; }; postPatch = '' @@ -106,7 +106,7 @@ rustPlatform.buildRustPackage (finalAttrs: { tesseract ]; - cargoHash = "sha256-rb/3L/SJqe1qKOIe33IfhORcFRtaJmB8TN70sdxhXkc="; + cargoHash = "sha256-EfZOu8aAi1S/hnmvzMZfreHxyeI25ul/OBKrhionJ+o="; cargoBuildFlags = [ "--package" "liteparse" diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index 20480057ba12..e1b15f65189e 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -13,16 +13,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.84.3"; + version = "0.84.4"; src = fetchFromGitHub { owner = "earendil-works"; repo = "pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-fC9pKgP2qD61ae5d7iOqP8anl88J1N1Bq8X8+aAjA2A="; + hash = "sha256-7z8OXao1PzmBEepDkIqVqyfQBPHulBlKcGymDYsnMvc="; }; - npmDepsHash = "sha256-cDx28+c4bwtQpiy5+BCvZhZezoZb4WRqfZj2eoEeMbw="; + npmDepsHash = "sha256-35GC3Q4Jf4URvqoEYHeM63x49tTmrth62//PvKm4I7Q="; # The provider model catalog (packages/ai/src/providers/data/) is generated by # a network fetch (models.dev plus provider APIs) and is gitignored upstream, @@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: { # under dist/providers/data/. Bump this hash alongside version. modelData = fetchurl { url = "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-${finalAttrs.version}.tgz"; - hash = "sha256-nECvL0OVD46U57vNDBs1SPAAly2gDE+5wNBSnU19VDE="; + hash = "sha256-39PJKc7lpzhxmaCiTfwb4glvHqj1n/uChRmKDtAev5M="; }; preConfigure = '' diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index dab9422ac763..2e18ef945811 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-VxJJ6mirADzZEDaxnAVr4eOFmYcePy39pZMsGdwr7Eo="; + hash = "sha256-RUs7506e3RIUhqDUTecXPR478eW0fRh5M+H+YMlgGxs="; }; - cargoHash = "sha256-aCOW2jSZ7BxlAh6QZcxYDeQAeqn7jn5QnhguRIAP9Gs="; + cargoHash = "sha256-KZSyXvuFp7Ax6WlLIs19nah/FEyRM0mhzKDeVUuD4Bs="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/vi/visidata/package.nix b/pkgs/by-name/vi/visidata/package.nix index aa8a2f9bd70a..a3e96a0d0150 100644 --- a/pkgs/by-name/vi/visidata/package.nix +++ b/pkgs/by-name/vi/visidata/package.nix @@ -2,8 +2,6 @@ lib, python3Packages, fetchFromGitHub, - # other - gitMinimal, withPcap ? true, withXclip ? stdenv.hostPlatform.isLinux, xclip, @@ -13,14 +11,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "visidata"; - version = "3.3"; + version = "3.4"; format = "setuptools"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${finalAttrs.version}"; - hash = "sha256-y+HqRww/Fm+YeiNYH0a2TcUYOc72qL+9tC0PRudptrA="; + hash = "sha256-h5utXfafQP6uZ7vXQAYXfV26y0qHbk6vulPl6DXbVX4="; }; propagatedBuildInputs = @@ -66,6 +64,7 @@ python3Packages.buildPythonApplication (finalAttrs: { sh psutil numpy + shapely #requests_cache beautifulsoup4 @@ -87,10 +86,6 @@ python3Packages.buildPythonApplication (finalAttrs: { ) ++ lib.optional withXclip xclip; - nativeCheckInputs = [ - gitMinimal - ]; - # check phase uses the output bin, which is not possible when cross-compiling doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -98,23 +93,15 @@ python3Packages.buildPythonApplication (finalAttrs: { runHook preCheck # disable some tests which require access to the network - rm -f tests/load-http.vd # http - rm -f tests/graph-cursor-nosave.vd # http - rm -f tests/messenger-nosave.vd # dns + rm tests/load-http-flaky.vd # http + rm tests/messenger-nosave.vd # dns # tests to disable because we don't have a package to load such files - rm -f tests/load-conllu.vdj # no 'pyconll' - rm -f tests/load-sav.vd # no 'savReaderWriter' - rm -f tests/load-fec.vdj # no 'fecfile' + rm tests/load-conllu.vdj # no 'pyconll' + rm tests/load-fec.vdj # no 'fecfile' - # tests use git to compare outputs to references - git init -b "test-reference" - git config user.name "nobody" - git config user.email "no@where" - git add . - git commit -m "test reference" - - substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd" + patchShebangs tests/ + substituteInPlace tests/test-vdx.sh --replace-fail "bin/vd" "$out/bin/vd" bash dev/test.sh runHook postCheck ''; diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix index d22191ee9366..fa4675023135 100644 --- a/pkgs/by-name/yu/yutto/package.nix +++ b/pkgs/by-name/yu/yutto/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "yutto"; - version = "2.3.0"; + version = "2.3.1"; pyproject = true; pythonRelaxDeps = true; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "yutto-dev"; repo = "yutto"; tag = "v${finalAttrs.version}"; - hash = "sha256-1k4VqnOKozlPrSebVp0vdaJI/Ra+v7akV6zLZMYMJ88="; + hash = "sha256-TofIXOqeUbIL8iW3SnEspQlSsr21YbDl/dFPzgPFmKo="; }; cargoRoot = "rust"; @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: { src cargoRoot ; - hash = "sha256-9KJlEaOLKVNTz+OsiX3p7Bbv1wFzoi6UaLKksrXMbdw="; + hash = "sha256-qiLjCAUrRe8vm0uZuToA1AbfJjF/Yhs1V+lUC6hLNCM="; }; build-system = with rustPlatform; [ diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 56e62453113a..fcb383936249 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,6 +1,7 @@ { stdenv, lib, + bashNonInteractive, elixir, erlang, hex, @@ -120,7 +121,13 @@ lib.extendMkDerivation { makeWrapper ]; - buildInputs = buildInputs ++ lib.optionals (escriptBinName != null) [ erlang ]; + buildInputs = [ + bashNonInteractive + ] + ++ buildInputs + ++ lib.optionals (escriptBinName != null) [ + erlang + ]; __structuredAttrs = true; strictDeps = true; diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix index 595b68c9427c..7e884a4d2fd6 100644 --- a/pkgs/development/python-modules/hikari-crescent/default.nix +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -5,6 +5,7 @@ poetry-core, hikari, sigparse, + pyprojectVersionPatchHook, pytestCheckHook, python-dotenv, pytest-asyncio, @@ -31,6 +32,11 @@ buildPythonPackage (finalAttrs: { sigparse ]; + nativeBuildInputs = [ + # .dist-info/METADATA specifies version '0' + pyprojectVersionPatchHook + ]; + pythonImportsCheck = [ "crescent" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index be1c47043ecd..c57df4425040 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage (finalAttrs: { pname = "hikari"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; tag = finalAttrs.version; - hash = "sha256-dOYaGWxhLefWIhaaIPM80cpYtcB/ywibFBzWDr3hKsw="; + hash = "sha256-Da/gBYyhEUge9KteK3U5lNeGCFglazt/g2yfuqR1+2U="; # The git commit is part of the `hikari.__git_sha1__` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index 38bf42d4f09d..9f230fde98c9 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2026.6"; + version = "2026.7"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-vvUALDL09QvVWwBdoSz/ZOyoeD5+r4agamJBAWS6tyU="; + hash = "sha256-X7yqyyLE9KrIaaEn3OKD9npLTPzDfUlvJEZgPm1orvo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 68a092bf6fc6..346a8d2244bb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -382,14 +382,6 @@ rec { defaultJava = jdk21; updateScriptMajorVersion = "8"; }; - gradle_7 = mkGradle { - version = "7.6.6"; - hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A="; - defaultJava = jdk17; - meta.knownVulnerabilities = [ - "Gradle 7 no longer receives security updates with the release of Gradle 9 on 31 July 2025. https://endoflife.date/gradle" - ]; - }; # Default version of Gradle in nixpkgs. gradle = gradle_8; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix index bcd68f82eb0a..58300e364888 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "hourly-weather"; - version = "6.9.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "decompil3d"; repo = "lovelace-hourly-weather"; rev = version; - hash = "sha256-5GbHKzhU3vsZrpMxWCd2deQN7KVilGbc8oTX9l4VxzY="; + hash = "sha256-sy21so7D5IbbiEnt1mAKFhxVJDzMWjOIhSOpGRRyMXk="; }; - npmDepsHash = "sha256-tmlONv2BAh/PqFp0wa/xop0gaj/HwI7eCUP3Gkvj8vw="; + npmDepsHash = "sha256-ZB/M8SO6Dw523CMKSAisoy5y4r1AouKXLY7Z1lgK4jU="; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8165b2de64f1..50cdb9e8730c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1067,6 +1067,8 @@ mapAliases { graalvm-oracle = throw "'graalvm-oracle' has been renamed to/replaced by 'graalvmPackages.graalvm-oracle'"; # Converted to throw 2025-10-27 graalvmCEPackages = throw "'graalvmCEPackages' has been renamed to/replaced by 'graalvmPackages'"; # Converted to throw 2025-10-27 gradience = throw "`gradience` has been removed because it was archived upstream."; # Added 2025-09-20 + gradle_7 = throw "Gradle 7 has been removed because it is end-of-life. Please upgrade to a newer version of Gradle: https://docs.gradle.org/current/userguide/upgrading_version_7.html"; # Added 2026-01-22 + gradle_7-unwrapped = throw "Gradle 7 has been removed because it is end-of-life. Please upgrade to a newer version of Gradle: https://docs.gradle.org/current/userguide/upgrading_version_7.html"; # Added 2026-01-22 gradleGen = throw "'gradleGen' has been moved to `gradle-packages.mkGradle`."; # Added 2025-11-02 grafana_reporter = throw "'grafana_reporter' has been renamed to/replaced by 'grafana-reporter'"; # Converted to throw 2025-10-27 graphia = throw "'graphia' has been removed due to being unmaintained and broken"; # Added 2026-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71dfbe3230cc..f2484c2faa1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1203,7 +1203,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/RETROARCH - libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { }); + libretro = recurseIntoAttrs (callPackage ../by-name/li/libretroPackages/packages.nix { }); retroarch = wrapRetroArch { }; @@ -5090,12 +5090,10 @@ with pkgs; gradle-packages = callPackage ../development/tools/build-managers/gradle { }; - gradle_7-unwrapped = gradle-packages.gradle_7; gradle_8-unwrapped = gradle-packages.gradle_8; gradle_9-unwrapped = gradle-packages.gradle_9; gradle-unwrapped = gradle-packages.gradle; - gradle_7 = gradle-packages.gradle_7.wrapped; gradle_8 = gradle-packages.gradle_8.wrapped; gradle_9 = gradle-packages.gradle_9.wrapped; gradle = gradle-packages.gradle.wrapped;