diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 945c9823dc68..90d5bc9c18e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1335,12 +1335,6 @@ githubId = 373; name = "Alexandre Girard Davila"; }; - alxsimon = { - email = "alexis.simon@normalesup.org"; - github = "alxsimon"; - githubId = 9567176; - name = "Alexis Simon"; - }; amadaluzia = { email = "amad@atl.tools"; github = "amadaluzia"; @@ -3353,6 +3347,12 @@ githubId = 10164833; name = "Birk Bohne"; }; + bizmyth = { + email = "andrew.p.council@gmail.com"; + github = "bizmythy"; + githubId = 45700916; + name = "Drew Council"; + }; bjesus = { email = "nixpkgs@yoavmoshe.com"; github = "bjesus"; @@ -5379,6 +5379,12 @@ githubId = 176372446; name = "Katja Kwast"; }; + cupcakearmy = { + name = "Niccolo Borgioli"; + email = "nix@nicco.io"; + github = "cupcakearmy"; + githubId = 14948823; + }; curious = { email = "curious@curious.host"; matrix = "@curious:curious.host"; @@ -16696,6 +16702,12 @@ githubId = 92937; name = "Breland Miley"; }; + minegameYTB = { + name = "Minegame YTB"; + github = "minegameYTB"; + githubId = 53137994; + matrix = "@minegame2018:matrix.org"; + }; minersebas = { email = "scherthan_sebastian@web.de"; github = "MinerSebas"; diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 68731ddc1783..66b0aeb83c7a 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -104,7 +104,7 @@ in { assertions = [ { - assertion = pkgs.stdenv.hostPlatform.isx86; + assertion = pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isAarch64; message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}"; } ]; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index 7e0bc8f367bb..5eca08b9f684 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2025-08-10"; + version = "0-unstable-2025-08-11"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "f6c78e954d7f38498f82145d20a916acea6cbc57"; - hash = "sha256-oFKO9y6t0BXeykuqZYfe2KKJpkm7Y2b7JuMJYspkL3g="; + rev = "b33f2afb33c61d675aaf0319bd3b8cc8d6924d49"; + hash = "sha256-hhe52Ob+WC+wktXIYUoEfOq/FKyKGfeeX+BYyQ3xgXE="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ee2ef0629f68..b965c98db549 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,16 +9,16 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.103"; - ptb = "0.0.154"; - canary = "0.0.730"; + stable = "0.0.104"; + ptb = "0.0.156"; + canary = "0.0.740"; development = "0.0.84"; } else { - stable = "0.0.355"; - ptb = "0.0.184"; - canary = "0.0.836"; + stable = "0.0.356"; + ptb = "0.0.186"; + canary = "0.0.844"; development = "0.0.97"; }; version = versions.${branch}; @@ -26,15 +26,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-WNLyBBQFqAEiPpv1JpoFrgKgCH3PBOTxFWxdHcqNAl8="; + hash = "sha256-4w8C9YHRNTgkUBzqkW1IywKtRHvtlkihjo3/shAgPac="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-ZAjewH/lOby3O7dQXy4igKd0DiZuwuhBitSlbr3hyjs="; + hash = "sha256-IU2zV/PviEXniupYz4sUGdu2PugDPiXaH64+SZTRK/0="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-lDmhJhhI9oD89fIGctcalO0pf2SjikRdsIWVIpkfGpk="; + hash = "sha256-Z8gTydEX8Bd5TCHACY5iOJqRuZ6YSOyYa3lSBr3PYLQ="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -44,15 +44,15 @@ let x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-RV/qyguxpdgL0T6AJHvP40LzFxSLI57bCGEpgZxLZmI="; + hash = "sha256-oATRY8cpdpTZr7iMQ/SIvSbXDxhsCviQQFqytDG9u/c="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-BWsnv22blA+1oAWGbYxXgwo0i9LvaAAqjUuwSRlfkTw="; + hash = "sha256-f5qoDpwcp1qBDyD+0QPE7KU6pJLALZPO7auGoo3JJiA="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-XVznNMnhEgX2YXUj0+5cQNxB2RR2ybUS3UcHqlSiHOk="; + hash = "sha256-i5ffkto9QoMorqsLQSUF9KnSHOK0tEFcPqkhSJ9cV+s="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index cd33498902e5..982b7d9cbc32 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -19,6 +19,7 @@ zlib, withIPv6 ? true, withDebug ? false, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -66,6 +67,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = { description = "Advanced IRC bouncer"; homepage = "https://wiki.znc.in/ZNC"; @@ -75,5 +80,6 @@ stdenv.mkDerivation (finalAttrs: { ]; license = lib.licenses.asl20; platforms = lib.platforms.unix; + pkgConfigModules = [ "znc" ]; }; }) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index a955a9551ed4..732b3923249a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -23,6 +23,7 @@ virtualboxVersion, virtualboxSubVersion, virtualboxSha256, + platform, }: let @@ -77,13 +78,15 @@ stdenv.mkDerivation (finalAttrs: { rm -r src/libs/zlib*/ ''; + # Apply fix for: https://www.virtualbox.org/ticket/22397 + patches = lib.optional stdenv.hostPlatform.isAarch64 ./guest-additions-aarch64-fix.patch; + postPatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++17 \1"@' \ -i configure - ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 - ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 + ls kBuild/bin/linux.${platform}/k* tools/linux.${platform}/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} substituteInPlace ./include/VBox/dbus-calls.h --replace-fail libdbus-1.so.3 ${dbus.lib}/lib/libdbus-1.so.3 @@ -166,11 +169,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out - cp -rv ./out/linux.${ - if stdenv.hostPlatform.is32bit then "x86" else "amd64" - }/${buildType}/bin/additions/VBoxGuestAdditions-${ - if stdenv.hostPlatform.is32bit then "x86" else "amd64" - }.tar.bz2 $out/ + cp -rv ./out/linux.${platform}/${buildType}/bin/additions/VBoxGuestAdditions-${platform}.tar.bz2 $out/ runHook postInstall ''; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9a7d0e2e6227..7c360b9a18cf 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -16,8 +16,21 @@ let virtualboxSubVersion = ""; virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276"; + platform = + if stdenv.hostPlatform.isAarch64 then + "arm64" + else if stdenv.hostPlatform.is32bit then + "x86" + else + "amd64"; + virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { - inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; + inherit + virtualboxVersion + virtualboxSubVersion + virtualboxSha256 + platform + ; }; # Specifies how to patch binaries to make sure that libraries loaded using @@ -54,9 +67,7 @@ stdenv.mkDerivation { pname = "VirtualBox-GuestAdditions"; version = "${virtualboxVersion}${virtualboxSubVersion}-${kernel.version}"; - src = "${virtualBoxNixGuestAdditionsBuilder}/VBoxGuestAdditions-${ - if stdenv.hostPlatform.is32bit then "x86" else "amd64" - }.tar.bz2"; + src = "${virtualBoxNixGuestAdditionsBuilder}/VBoxGuestAdditions-${platform}.tar.bz2"; sourceRoot = "."; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -159,6 +170,7 @@ stdenv.mkDerivation { platforms = [ "i686-linux" "x86_64-linux" + "aarch64-linux" ]; broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); }; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/guest-additions-aarch64-fix.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/guest-additions-aarch64-fix.patch new file mode 100644 index 000000000000..e787da94dcc1 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/guest-additions-aarch64-fix.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure +index e845993..a5b526e 100644q +--- a/configure ++++ b/configure +@@ -422,6 +422,10 @@ check_environment() + BUILD_MACHINE='sparc32' + BUILD_CPU='blend' + ;; ++ aarch64) ++ BUILD_MACHINE='arm64' ++ BUILD_CPU='blend' ++ ;; + *) + log_failure "Cannot determine system" + exit 1 \ No newline at end of file diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 9ef7bcf46a5f..b5730d72dc13 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1754827277-g1b1a5d" + "@sourcegraph/amp": "^0.0.1755532879-g2b6e3d" } }, "node_modules/@colors/colors": { @@ -28,15 +28,24 @@ "kuler": "^2.0.0" } }, + "node_modules/@msgpack/msgpack": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz", + "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==", + "license": "ISC", + "engines": { + "node": ">= 10" + } + }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1754827277-g1b1a5d", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1754827277-g1b1a5d.tgz", - "integrity": "sha512-P7PAvlEuRFz0dfpgErRe9brm00+1/I0xK2ym8QWt+hY6ITXtAFMbxJKELcsVpJwgSTJeFs3LUyj9glrJHdNMmw==", + "version": "0.0.1755532879-g2b6e3d", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1755532879-g2b6e3d.tgz", + "integrity": "sha512-Xv3C/E6KHlq0gpEzMqaK9Fo3QhmvftBH8TcJGk5oGLhxEh/u49kRTifojDNjOh3A3HWneB1/SoYqLplOKn5QFg==", "dependencies": { "ansi-regex": "^6.1.0", "commander": "^11.1.0", - "fuse.js": "^7.0.0", "jsonc-parser": "^3.3.1", + "neovim": "^5.3.0", "open": "^10.1.2", "open-simplex-noise": "^2.5.0", "runes": "^0.4.3", @@ -227,15 +236,6 @@ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", "license": "MIT" }, - "node_modules/fuse.js": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz", - "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==", - "license": "Apache-2.0", - "engines": { - "node": ">=10" - } - }, "node_modules/get-east-asian-width": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", @@ -355,6 +355,44 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, + "node_modules/neovim": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/neovim/-/neovim-5.3.0.tgz", + "integrity": "sha512-32Cypq6qh7vzJ5wuVPPzIsBdOlvwo0do8/3jxLu+RGdneFSJjh5CYi0ScHHAw/2HLtIjRKhRjJMXeze21M+uyw==", + "license": "MIT", + "dependencies": { + "@msgpack/msgpack": "^2.8.0", + "winston": "3.14.1" + }, + "bin": { + "neovim-node-host": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/neovim/node_modules/winston": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz", + "integrity": "sha512-CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA==", + "license": "MIT", + "dependencies": { + "@colors/colors": "^1.6.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.6.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.7.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, "node_modules/one-time": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index e250425e0055..7f7fc10902d4 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1754827277-g1b1a5d"; + version = "0.0.1755532879-g2b6e3d"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-7LOp4/jpdxkeKi++vZGogobNiQpMqd5zMeCQywgc/wg="; + hash = "sha256-i3YZcyaeq8CkMsEKhJg/39/0ijJGym2DcRFsZpBRXe0="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-6n+1fzet/JwLzaL9Z0ALIFY7Z0yaCwRCrv+73DxNkiY="; + npmDepsHash = "sha256-pZNvuSf9ioiv3UPmtdbXC0RXgtelrBl5ZtW/y/KnSqQ="; propagatedBuildInputs = [ ripgrep diff --git a/pkgs/by-name/ap/apotris/package.nix b/pkgs/by-name/ap/apotris/package.nix new file mode 100644 index 000000000000..4b09797fba01 --- /dev/null +++ b/pkgs/by-name/ap/apotris/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + fetchFromGitea, + meson, + libGLU, + ninja, + python3, + cmake, + pkg-config, + xxd, + libopus, + libogg, + zlib, + SDL2, + SDL2_mixer, + libopenmpt, + libXrandr, + libXext, + libXfixes, + libXcursor, + libXi, + libXScrnSaver, + makeDesktopItem, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "apotris"; + version = "4.1.0"; + + src = fetchFromGitea { + domain = "gitea.com"; + owner = "akouzoukos"; + repo = "apotris"; + rev = "v${finalAttrs.version}"; + hash = "sha256-jP0fmfAAjWkgI5I3OTLS5+7+xLvcGhV8yP80qDWDjC8="; + fetchSubmodules = true; + }; + + postPatch = '' + patchShebangs tools/bin2s.py + ''; + + nativeBuildInputs = [ + meson + ninja + python3 + cmake + pkg-config + xxd + ]; + + buildInputs = [ + libGLU + libopus + libogg + zlib + SDL2_mixer + libopenmpt + SDL2 + libXrandr + libXext + libXfixes + libXcursor + libXi + libXScrnSaver + ]; + + strictDeps = true; + + dontUseCmakeConfigure = true; + + desktopItem = makeDesktopItem { + name = "Apotris"; + exec = "Apotris"; + comment = "A block stacking game"; + desktopName = "Apotris"; + categories = [ + "Game" + ]; + }; + + meta = { + description = "Block stacking game"; + longDescription = '' + Apotris is a multiplatform open-source block stacking game! What sets + Apotris apart from other block stacking games is its extensive + customization options, complemented by ultra-responsive controls that let + you execute your moves with precision. With 14 unique game modes and a + plethora of settings, you can tailor the game to your preferences, + ensuring a fresh and challenging experience every time you play. Whether + you're a casual player or a hardcore enthusiast, Apotris has something for + everyone. You can even battle your friends using the Gameboy Advance Link + Cable or Wireless Adapters in 2-Player Battle! While Apotris was + originally designed for Gameboy Advance, it now supports all kinds of + platforms, so between the ports and emulation you can play Apotris on + almost anything. + ''; + homepage = "https://akouzoukos.com/apotris/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + oluceps + bizmyth + ]; + mainProgram = "Apotris"; + inherit (SDL2.meta) platforms; + broken = stdenv.hostPlatform.isDarwin; + }; +}) diff --git a/pkgs/by-name/bl/bleachbit/package.nix b/pkgs/by-name/bl/bleachbit/package.nix index 83fe2c62eb06..d43caf27811f 100644 --- a/pkgs/by-name/bl/bleachbit/package.nix +++ b/pkgs/by-name/bl/bleachbit/package.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "bleachbit"; - version = "4.6.0"; + version = "5.0.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UwUphuUeXFy71I+tmKnRH858dPrA2+xDxnG9h26a+kE="; + sha256 = "sha256-CU5IW8NVWuPl4PHu6mYpD5mOpRiDq6oZk9pDmuz8PjA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cortex-command-community-project/package.nix b/pkgs/by-name/co/cortex-command-community-project/package.nix new file mode 100644 index 000000000000..ec2f85a455bf --- /dev/null +++ b/pkgs/by-name/co/cortex-command-community-project/package.nix @@ -0,0 +1,82 @@ +{ + stdenv, + fetchFromGitHub, + fetchpatch, + flac, + lib, + libGL, + libpng, + libpulseaudio, + lz4, + luajit, + meson, + minizip, + ninja, + nix-update-script, + pkg-config, + SDL2, + SDL2_image, + tbb, +}: + +stdenv.mkDerivation rec { + pname = "cortex-command-community-project"; + version = "6.2.2"; + + src = fetchFromGitHub { + owner = "cortex-command-community"; + repo = "Cortex-Command-Community-Project"; + tag = "v${version}"; + hash = "sha256-srbV6Nh+ecyV0dkY835vhzpMSzmnvANym453L72cmGI="; + }; + + patches = [ + (fetchpatch { + name = "runner.patch"; + url = "https://github.com/cortex-command-community/Cortex-Command-Community-Project/commit/0aa22156567d48cb12ac39e31aec8aeb0ea7fb83.patch"; + hash = "sha256-2rpJtKjRebjVOjj3wlNfFBQjbn9UdEcIBWCkyZgzd+8="; + }) + ]; + + postFixup = '' + patchelf --set-rpath ${lib.makeLibraryPath [ libpulseaudio ]} $out/lib/CortexCommand/libfmod.so* + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + flac + libpng + libpulseaudio + libGL + lz4 + luajit + minizip + SDL2_image + tbb + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cortex Command Community Project"; + longDescription = '' + The Cortex Command Community Project is Free/Libre and Open Source under GNU AGPL v3. + This is a community-driven effort to continue the development of Cortex Command. + ''; + homepage = "https://cortex-command-community.github.io/"; + changelog = "https://github.com/cortex-command-community/Cortex-Command-Community-Project/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ + agpl3Only # Cortex Command Community Project + unfreeRedistributable # fmod + ]; + maintainers = with lib.maintainers; [ gileri ]; + mainProgram = "CortexCommand"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/de/deezer-enhanced/package.nix b/pkgs/by-name/de/deezer-enhanced/package.nix new file mode 100644 index 000000000000..d5d581facd37 --- /dev/null +++ b/pkgs/by-name/de/deezer-enhanced/package.nix @@ -0,0 +1,129 @@ +{ + ### Tools + lib, + stdenvNoCC, + fetchurl, + makeWrapper, + autoPatchelfHook, + dpkg, + gnutar, + + ### Libs + xorg, + libxkbcommon, + glib, + nss, + dbus, + at-spi2-atk, + cups, + gtk3, + pango, + cairo, + expat, + systemdLibs, + alsa-lib, + nwjs, + libGL, +}: + +stdenvNoCC.mkDerivation rec { + pname = "deezer-enhanced"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb"; + hash = "sha256-zHgrLzPByAPww0aSEDETsddX71O/GU80AZH729YjQQ0="; + }; + + nativeBuildInputs = [ + ### To unpack deezer-enhanced + dpkg + gnutar + + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + + ### Xorg libs + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + + ### Systemd libs + systemdLibs + dbus + + ### Other libs + libxkbcommon + nss + glib + at-spi2-atk + cups + gtk3 + libGL + nwjs # For libffmpeg.so + ]; + + unpackPhase = '' + runHook preUnpack + + dpkg-deb --fsys-tarfile $src | tar --no-same-owner --no-same-permissions -xvf - + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + ### Create directory and copy files + mkdir -p $out + mv usr/* $out + + ### Wrap deezer-enhanced to include all libraries in the environment + wrapProgram $out/bin/${pname} \ + --set LD_LIBRARY_PATH ${ + lib.makeLibraryPath [ + ### Xorg libs + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + + ### Systemd libs + systemdLibs + dbus + + ### Other libs + libxkbcommon + nss + glib + at-spi2-atk + cups + gtk3 + nwjs + libGL + ] + } + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/duzda/deezer-enhanced"; + changelog = "https://github.com/duzda/deezer-enhanced/releases/tag/v${version}"; + description = "Unofficial application for Deezer with enhanced features"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + mainProgram = "deezer-enhanced"; + maintainers = with lib.maintainers; [ minegameYTB ]; + }; +} diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index da1723128764..410005991c8d 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-KH2tcQngc3LVgybdmw/obhbMiLoj3GZVnyWaDXXBJNs="; + hash = "sha256-5/hGTU8jQQvGp0c4FpB29H9wBbae8lVjlohivcVFFwI="; }; - cargoHash = "sha256-GCnzqfTBvckWtgXCz0Yd0SHh82bC3bS7uLOAdY37z+s="; + cargoHash = "sha256-Cz0qR24zRXivF3pAo95GNnx8bjUKK96GFnntb68Lz1U="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/go/gogh/package.nix b/pkgs/by-name/go/gogh/package.nix new file mode 100644 index 000000000000..e33a87955f32 --- /dev/null +++ b/pkgs/by-name/go/gogh/package.nix @@ -0,0 +1,100 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + ncurses, + bashNonInteractive, + python3, + rustpython, + nix-update-script, +}: + +let + pythonEnv = python3.withPackages ( + ps: with ps; [ + ruamel-yaml + unidecode + pyyaml + tomli + tomli-w + configobj + ] + ); +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gogh"; + version = "361"; + + src = fetchFromGitHub { + owner = "Gogh-Co"; + repo = "Gogh"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kzJiI1w8CYVYMcHo8mMqLseyFsU/PekjMkkk0gG+RH4="; + }; + + postPatch = '' + # Remove the `SCRIPT_PATH` variable definition from `gogh.sh`, + # see `makeWrapperArgs`: `--set SCRIPT_PATH "$out/lib"` in `postInstall` + sed -i '/^SCRIPT_PATH=/d' gogh.sh + + patchShebangs . + + substituteInPlace {gogh.sh,installs/*.sh} \ + --replace-fail 'bash ' '${lib.getExe bashNonInteractive} ' + + substituteInPlace apply-colors.sh \ + --replace-fail 'python3' '${lib.getExe' rustpython "rustpython"}' + ''; + + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir --parents $out/lib + cp --recursive {*.py,apply-colors.sh,installs,themes} $out/lib + install -Dm755 gogh.sh $out/bin/${finalAttrs.meta.mainProgram} + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ + --set SCRIPT_PATH "$out/lib" \ + --prefix PATH : "${lib.getBin bashNonInteractive}/bin" \ + --prefix PATH : "${lib.getBin rustpython}/bin" \ + --prefix PATH : "${lib.getBin ncurses}/bin" \ + --prefix PATH : "${pythonEnv}/bin" \ + --prefix PYTHONPATH : "${pythonEnv}/${pythonEnv.sitePackages}" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Collection of color schemes for terminal emulators"; + longDescription = '' + Gogh is a collection of color schemes for various terminal + emulators, including Gnome Terminal, Pantheon Terminal, Tilix + and XFCE4 Terminal. These schemes are designed to make your + terminal more visually appealing and improve your productivity + by providing a better contrast and color differentiation. (This + fork of Gogh includes a color scheme named "Vaombe".) + + The inspiration for Gogh came from the clean and minimalistic + design of Elementary OS, but the project has since grown to + include a variety of unique and beautiful options. Not only does + Gogh work on Linux systems, but it's also compatible with iTerm + on macOS, providing a consistent and visually appealing + experience across platforms. + ''; + homepage = "https://github.com/Gogh-Co/Gogh"; + changelog = "https://github.com/Gogh-Co/Gogh/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yiyu ]; + mainProgram = "gogh"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index a240061cf6e2..86238601ec2d 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.37"; + version = "3.0.38"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; tag = "v${version}"; - hash = "sha256-EMNWt84mEKy96NAygRVhwTKFNYoEZEKggI37MllQTW0="; + hash = "sha256-G6oz72/q7EAjkBeUzeoHTMcKqRjLtTy+ZUnVFCXGjRE="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-JIs0HQrUk/oTf7eVd558qe9BgfKFcbprj1zn3ZebApA="; + vendorHash = "sha256-cvYjkf2TOi327MjcUvjyME5JRTJzxF4J0HssfiH9P7E="; subPackages = [ "." ]; diff --git a/pkgs/by-name/nv/nvs/package.nix b/pkgs/by-name/nv/nvs/package.nix new file mode 100644 index 000000000000..a445c397b79c --- /dev/null +++ b/pkgs/by-name/nv/nvs/package.nix @@ -0,0 +1,50 @@ +{ + buildGoModule, + fetchFromGitHub, + installShellFiles, + writableTmpDirAsHomeHook, + lib, +}: +buildGoModule (finalAttrs: { + pname = "nvs"; + version = "1.10.6"; + + src = fetchFromGitHub { + owner = "y3owk1n"; + repo = "nvs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hqIauWbAsWbD7P58BGnj6NlLtfuaR5YxOLgPOrpN++w="; + }; + + vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA="; + + ldflags = [ + "-s" + "-w" + ]; + + # Completions + nativeBuildInputs = [ + installShellFiles + writableTmpDirAsHomeHook + ]; + postInstall = '' + installShellCompletion --cmd nvs \ + --bash <($out/bin/nvs completion bash) \ + --fish <($out/bin/nvs completion fish) \ + --zsh <($out/bin/nvs completion zsh) + ''; + + __darwinAllowLocalNetworking = true; + + meta = { + mainProgram = "nvs"; + description = "Lightweight Neovim Version & Config Manager CLI tool to install, switch, list, uninstall, and reset Neovim versions"; + homepage = "https://github.com/y3owk1n/nvs"; + changelog = "https://github.com/y3owk1n/nvs/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + cupcakearmy + ]; + }; +}) diff --git a/pkgs/by-name/pl/platformsh/versions.json b/pkgs/by-name/pl/platformsh/versions.json index cd44984844ea..fd52dbd0a8a0 100644 --- a/pkgs/by-name/pl/platformsh/versions.json +++ b/pkgs/by-name/pl/platformsh/versions.json @@ -1,19 +1,19 @@ { - "version": "5.1.1", + "version": "5.2.0", "darwin-amd64": { - "hash": "sha256-wj8zEyYxalEauCOv6VLPgvkfXlf/uA/xwEiHOqxRFic=", - "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_darwin_all.tar.gz" + "hash": "sha256-BTco0witrbm64UDdNBKTDjZG3LaZsy1LURM5oznAar4=", + "url": "https://github.com/platformsh/cli/releases/download/5.2.0/platform_5.2.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-wj8zEyYxalEauCOv6VLPgvkfXlf/uA/xwEiHOqxRFic=", - "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_darwin_all.tar.gz" + "hash": "sha256-BTco0witrbm64UDdNBKTDjZG3LaZsy1LURM5oznAar4=", + "url": "https://github.com/platformsh/cli/releases/download/5.2.0/platform_5.2.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-2teph6Ozgl5GTckeNExRqCpoUSCCNF7mRRy3wWxOc2U=", - "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_linux_amd64.tar.gz" + "hash": "sha256-ouEaLFNzjONz3eZasbrW6sWq/CEjKi8z0N005p74KZU=", + "url": "https://github.com/platformsh/cli/releases/download/5.2.0/platform_5.2.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-iqeErUjouQEsdwEo+6fNQqfULZ9V1lCwsJXDC0lZNdM=", - "url": "https://github.com/platformsh/cli/releases/download/5.1.1/platform_5.1.1_linux_arm64.tar.gz" + "hash": "sha256-wQGIlZsXVwsJyQUdfFmF7igIsQI8Q7wHVxvAcqbR+cU=", + "url": "https://github.com/platformsh/cli/releases/download/5.2.0/platform_5.2.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index f0913c68e175..f288a085f464 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "7.3.5"; + version = "7.3.6"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-tRdm7kps4YfEeFCqk3gxFTrySRfVM7aN6F9uFeicXwk="; + hash = "sha256-NkuqgJjGWMal9bUEtS5pqsCrn+smBxZA6Cad8t9wpCc="; }; # Fix build on darwin diff --git a/pkgs/by-name/ti/timeline/package.nix b/pkgs/by-name/ti/timeline/package.nix index 6182a8dd78dc..ce3ec303d66b 100644 --- a/pkgs/by-name/ti/timeline/package.nix +++ b/pkgs/by-name/ti/timeline/package.nix @@ -10,12 +10,12 @@ python3.pkgs.buildPythonApplication rec { pname = "timeline"; - version = "2.10.0"; + version = "2.11.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; - sha256 = "sha256-xUWIIpnOohcpD/1esjHQTUxndo4j91hyyAXTmV3Eo0k="; + sha256 = "sha256-XJ5Gu3nFLtSaEedzxBZERtPydIFMWWGi5frXWmgKxVA="; }; nativeBuildInputs = [ @@ -91,16 +91,16 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { homepage = "https://thetimelineproj.sourceforge.net/"; changelog = "https://thetimelineproj.sourceforge.net/changelog.html"; description = "Display and navigate information on a timeline"; mainProgram = "timeline"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Only cc-by-sa-30 ]; - platforms = with platforms; unix; - maintainers = with maintainers; [ davidak ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ davidak ]; }; } diff --git a/pkgs/by-name/yy/yyjson/package.nix b/pkgs/by-name/yy/yyjson/package.nix index 7958e5fcc7d6..59d447c92d36 100644 --- a/pkgs/by-name/yy/yyjson/package.nix +++ b/pkgs/by-name/yy/yyjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yyjson"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ibireme"; repo = "yyjson"; rev = finalAttrs.version; - hash = "sha256-V5wjhclZaLgViVsIJCwoRhYyacyflc4+BshkM6tR9ME="; + hash = "sha256-1CYnEgUMUc7eqdkv6M/KyL/MdVQBMov9HgLCycF6++w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zr/zram-generator/package.nix b/pkgs/by-name/zr/zram-generator/package.nix index b433aa08ab63..18cfabbd3b0c 100644 --- a/pkgs/by-name/zr/zram-generator/package.nix +++ b/pkgs/by-name/zr/zram-generator/package.nix @@ -52,6 +52,9 @@ rustPlatform.buildRustPackage rec { export SYSTEMD_UTIL_DIR=$($PKG_CONFIG --variable=systemdutildir systemd) ''; + # error[E0432]: unresolved import `self::consts` + doCheck = !stdenv.hostPlatform.isLoongArch64; + dontCargoInstall = true; installFlags = [ diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index d0907faa8c66..c95687257749 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -7,10 +7,10 @@ llvm_12, libffi, cmake, + perl, python3, zlib, libxml2, - openssl, pkg-config, curl, which, @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { cmake mrustc mrustc-minicargo + perl pkg-config python3 time @@ -68,8 +69,7 @@ stdenv.mkDerivation rec { zlib libxml2 # for cargo - openssl - (curl.override { inherit openssl; }) + curl ]; makeFlags = [ diff --git a/pkgs/development/compilers/mrustc/default.nix b/pkgs/development/compilers/mrustc/default.nix index 4f11f37915fb..351f26aef5ff 100644 --- a/pkgs/development/compilers/mrustc/default.nix +++ b/pkgs/development/compilers/mrustc/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.10.1"; + version = "0.11.2"; tag = "v${version}"; rev = "b6754f574f8846eb842feba4ccbeeecb10bdfacc"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "thepowersgang"; repo = "mrustc"; rev = tag; - hash = "sha256-sYnx5dUTaQbK4ugnSzAJwIUwZKPUhThmNA+WlY+LEWc="; + hash = "sha256-HW9+2mXri3ismeNeaDoTsCY6lxeH8AELegk+YbIn7Jw="; }; postPatch = '' diff --git a/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch b/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch index 7b92958af498..a595e5b1c8e5 100644 --- a/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch +++ b/pkgs/development/compilers/mrustc/patches/0001-dont-download-rustc.patch @@ -1,14 +1,14 @@ The $(RUSTC_SRC_DL) file already exists, but for some reason Make wants to rebuild this target when it has $(RUSTC_SRC_TARBALL) as a dependency. ---- a/minicargo.mk 2023-04-06 08:26:18.408817572 +0200 -+++ b/minicargo.mk 2023-04-06 08:27:11.553536996 +0200 -@@ -176,7 +176,7 @@ - @echo [CURL] $@ - @rm -f $@ - @curl -sS https://static.rust-lang.org/dist/$@ -o $@ --$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rustc-$(RUSTC_VERSION)-src.patch -+$(RUSTC_SRC_DL): rustc-$(RUSTC_VERSION)-src.patch - tar -xf $(RUSTC_SRC_TARBALL) - cd $(RUSTCSRC) && patch -p0 < ../rustc-$(RUSTC_VERSION)-src.patch; - touch $(RUSTC_SRC_DL) +--- a/minicargo.mk ++++ b/minicargo.mk +@@ -220,7 +220,7 @@ $(RUSTC_SRC_DL): rustc-$(RUSTC_VERSION)-src/extracted rustc-$(RUSTC_VERSION)-src + # - libstd, libpanic_unwind, libtest and libgetopts + # - libproc_macro (mrustc) + ifeq ($(USE_MERGED_BUILD),1) +-$(RUSTCSRC)mrustc-stdlib/Cargo.toml: $(RUSTC_SRC_DL) minicargo.mk ++$(RUSTCSRC)mrustc-stdlib/Cargo.toml: minicargo.mk + @mkdir -p $(dir $@) + @echo "#![no_core]" > $(dir $@)/lib.rs + @echo "[package]" > $@ diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 747b6b7a05ba..0b8ad797b5ef 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioslimproto"; tag = version; - hash = "sha256-3soqvZld92ohCEwTFaMIOC+cvOjBQyVQOoLmKr53aMA="; + hash = "sha256-L52Y6nOE77t0+vx4t2Ix39Xk0zxJklaGbBDuwWo1qek="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control Squeezebox players"; homepage = "https://github.com/home-assistant-libs/aioslimproto"; - changelog = "https://github.com/home-assistant-libs/aioslimproto/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/aioslimproto/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 8ba153ab1792..c8969cf654ef 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.62.0"; + version = "0.63.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-7bjCfss7xqUqAd5NcfkfmAuyQBxDT/K3/vLMPc/rcNE="; + hash = "sha256-6y2I+a13aWafnkDL5P0uqOWoLAm5BbMhNU/XJHABRjA="; }; build-system = [ diff --git a/pkgs/development/python-modules/demes/default.nix b/pkgs/development/python-modules/demes/default.nix index a3f73c6821b1..6a67be764272 100644 --- a/pkgs/development/python-modules/demes/default.nix +++ b/pkgs/development/python-modules/demes/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { mainProgram = "demes"; homepage = "https://github.com/popsim-consortium/demes-python"; license = licenses.isc; - maintainers = with maintainers; [ alxsimon ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/demesdraw/default.nix b/pkgs/development/python-modules/demesdraw/default.nix index 35a51048d81d..63fb0f38e06b 100644 --- a/pkgs/development/python-modules/demesdraw/default.nix +++ b/pkgs/development/python-modules/demesdraw/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { mainProgram = "demesdraw"; homepage = "https://github.com/grahamgower/demesdraw"; license = licenses.isc; - maintainers = with maintainers; [ alxsimon ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index e998bd6141b7..e2b7b8cbab75 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -83,6 +83,6 @@ buildPythonPackage rec { homepage = "https://github.com/tskit-dev/msprime"; changelog = "https://github.com/tskit-dev/msprime/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ alxsimon ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/newick/default.nix b/pkgs/development/python-modules/newick/default.nix index a45ae6c25294..7a0687c537c8 100644 --- a/pkgs/development/python-modules/newick/default.nix +++ b/pkgs/development/python-modules/newick/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Python package to read and write the Newick format"; homepage = "https://github.com/dlce-eva/python-newick"; license = licenses.asl20; - maintainers = with maintainers; [ alxsimon ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index a7a2ba944732..3cd50a43bd36 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.22"; + version = "0.11.23"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-+0m6Y90z9BSI6mAOdDuCyZnjoJOvKQgwKvAQB1TZC88="; + hash = "sha256-bP6gkHxbWraXCjnSPntYKFCU0qjT9trXwnrP9pI/93k="; }; sourceRoot = "${src.name}/checkpoint"; diff --git a/pkgs/development/python-modules/pyslim/default.nix b/pkgs/development/python-modules/pyslim/default.nix index 4d26124cdafb..ae0755440694 100644 --- a/pkgs/development/python-modules/pyslim/default.nix +++ b/pkgs/development/python-modules/pyslim/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Tools for dealing with tree sequences coming to and from SLiM"; homepage = "https://github.com/tskit-dev/pyslim"; license = licenses.mit; - maintainers = with maintainers; [ alxsimon ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index b8572e0f3541..2ae3bd9faa8d 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { mainProgram = "tskit"; homepage = "https://github.com/tskit-dev/tskit"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ alxsimon ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/word2number/default.nix b/pkgs/development/python-modules/word2number/default.nix index fbfc25cf889f..0d5d92686d4d 100644 --- a/pkgs/development/python-modules/word2number/default.nix +++ b/pkgs/development/python-modules/word2number/default.nix @@ -5,6 +5,7 @@ setuptools-scm, future, python, + pythonOlder, }: buildPythonPackage rec { @@ -23,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ + dependencies = lib.optionals (pythonOlder "3.13") [ future ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c32dd6702bf..632e953f75b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5818,9 +5818,7 @@ with pkgs; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; - mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { - openssl = openssl_1_1; - }; + mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; rustPackages_1_89 = rust_1_89.packages.stable; rustPackages = rustPackages_1_89;