diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5804f3407c9e..4ca444cecfd5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27542,6 +27542,15 @@ githubId = 40352765; name = "Yoctocell"; }; + yogansh = { + email = "yogansh@yogansh.tech"; + github = "YoganshSharma"; + githubId = 38936915; + name = "Yogansh Sharma"; + keys = [ + { fingerprint = "D2A8 A906 ACA7 B6D6 575E 9A2F 3A49 5054 6EA6 9E5C"; } + ]; + }; yomaq = { name = "yomaq"; github = "yomaq"; diff --git a/pkgs/README.md b/pkgs/README.md index 6c5c54f437a7..0442822765b9 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -529,14 +529,19 @@ In the interest of keeping our maintenance burden and the size of Nixpkgs to a m { patches = [ (fetchpatch2 { - name = "fix-check-for-using-shared-freetype-lib.patch"; - url = "https://cgit.ghostscript.com/cgi-bin/cgit.cgi/ghostpdl.git/patch/?id=8f5d28536e4518716fdfe974e580194c8f57871d"; - hash = "sha256-uRcxaCjd+WAuGrXOmGfFeu79cUILwkRdBu48mwcBE7g="; + name = "make-no-atomics-a-soft-failure.patch"; + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch?full_index=1"; + hash = "sha256-9Goa0NTUdSOs1Vm+FnkoSFhw0o8ZLNOw6cLUqCVnF5Y="; }) ]; } ``` +> [!Warning] +> If the patch file contains short commit hashes, use `fetchpatch` instead of `fetchpatch2` ([tracking issue](https://github.com/NixOS/nixpkgs/issues/257446)). +> This is the case if the patch contains a line similar to `index 0c97fcc35..f533e464a 100644`. +> Depending on the patch source it is possible to expand the commit hash, in which case using `fetchpatch2` is acceptable (e.g. GitHub supports appending `?full_index=1` to the URL, as seen above). + If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch2`. Check [the `fetchpatch` reference](https://nixos.org/manual/nixpkgs/unstable/#fetchpatch) for details. When adding patches in this manner you should be reasonably sure that the used URL is stable. Patches referencing open pull requests will change when the PR is updated and code forges (such as GitHub) usually garbage collect commits that are no longer reachable due to rebases/amends. diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 1a1211d6bf84..abb61a2a228c 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -35,6 +35,7 @@ libXft, libXi, libXpm, + libXrandr, libgccjit, libjpeg, libotf, @@ -339,6 +340,7 @@ mkDerivation (finalAttrs: { giflib libXaw libXpm + libXrandr libjpeg libpng librsvg diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index 811dc33858cc..257ce5ea44ac 100644 --- a/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix @@ -4,6 +4,7 @@ cmake, pkg-config, gobject-introspection, + vala, glib, libsndfile, zlib, @@ -48,6 +49,7 @@ stdenv.mkDerivation { pkg-config intltool gobject-introspection + vala ]; propagatedBuildInputs = [ pcre diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 56a43e10e360..60cfc60bd138 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -12,6 +12,7 @@ qttools, qmake, wrapQtAppsHook, + makeWrapper, }: stdenv.mkDerivation rec { @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { qmake qttools wrapQtAppsHook + makeWrapper ]; qmakeFlags = [ @@ -60,6 +62,14 @@ stdenv.mkDerivation rec { }" ]; + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + mkdir -p $out/Applications + cp -r main/QtPass.app $out/Applications + makeWrapper $out/Applications/QtPass.app/Contents/MacOS/QtPass $out/bin/qtpass + runHook postInstall + ''; + postInstall = '' install -D qtpass.desktop -t $out/share/applications install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg diff --git a/pkgs/by-name/bl/blackshades/package.nix b/pkgs/by-name/bl/blackshades/package.nix index ec2bdfe33d4e..137c4c902555 100644 --- a/pkgs/by-name/bl/blackshades/package.nix +++ b/pkgs/by-name/bl/blackshades/package.nix @@ -25,25 +25,14 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' ln -s ${ - runCommand "${finalAttrs.finalPackage.name}-zig-deps" - { - inherit (finalAttrs) src; - - nativeBuildInputs = [ zig_0_14 ]; - - outputHashAlgo = null; - outputHashMode = "recursive"; - outputHash = "sha256-wBIfLeaKtTow2Z7gjEgIFmqcTGWgpRWI+k0t294BslM="; - } - '' - export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) - - runHook unpackPhase - cd $sourceRoot - - zig build --fetch - mv $ZIG_GLOBAL_CACHE_DIR/p $out - '' + zig_0_14.fetchDeps { + inherit (finalAttrs) + src + pname + version + ; + hash = "sha256-wBIfLeaKtTow2Z7gjEgIFmqcTGWgpRWI+k0t294BslM="; + } } $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/di/dix/package.nix b/pkgs/by-name/di/dix/package.nix index 05bf4c748aed..b2eff77fb95f 100644 --- a/pkgs/by-name/di/dix/package.nix +++ b/pkgs/by-name/di/dix/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dix"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bloxx12"; repo = "dix"; tag = "v${finalAttrs.version}"; - hash = "sha256-hsTw0MyxYD4UtUEeXgNRjmp1yla9Renl6xD19XQ5/LY="; + hash = "sha256-CCHWxQjronLhyt5MB2bb2vgmOgvjYaIr2HNbmUmT+gw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9uGtkWBShoge5tyeIdgJhthaBDF2nzCUbeY8HcaLWYc="; + cargoHash = "sha256-/3uL++0IEI2Yw3xrkS0UQmDZX3p0tQCqMyuUCcol1A0="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 32643f1bf2eb..0646ce5bd7f7 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.209.0"; + version = "0.210.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "eksctl"; rev = version; - hash = "sha256-iyxO/KMVxSbf/1WijVg0+56BKdyG7gBsfNouyVNMDIA="; + hash = "sha256-d5P9bfneUpyAB9cxnu7Hw4ZOykWf8/GSVclNtIjTe6g="; }; vendorHash = "sha256-vhYexIdkn8Y5U5YZewj/O8sJCt/VimZU4E4kn0/1lU4="; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix new file mode 100644 index 000000000000..f59e81215cb4 --- /dev/null +++ b/pkgs/by-name/li/libglycin/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + rustc, + cargo, + rustPlatform, + vala, + gi-docgen, + libseccomp, + lcms2, + gtk4, + gobject-introspection, + gnome, + buildPackages, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libglycin"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "glycin"; + tag = finalAttrs.version; + hash = "sha256-M4DcWLE40OPB7zIkv4uLj6xTac3LTDcZ2uAO2S/cUz4="; + }; + + nativeBuildInputs = + [ + meson + ninja + pkg-config + rustc + cargo + rustPlatform.cargoSetupHook + ] + ++ lib.optionals withIntrospection [ + vala + gi-docgen + ]; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-iNSpLvIi3oZKSRlkwkDJp5i8MdixRvmWIOCzbFHIdHw="; + }; + + buildInputs = [ + libseccomp + lcms2 + gtk4 + ] ++ lib.optionals withIntrospection [ gobject-introspection ]; + + propagatedBuildInputs = [ + libseccomp + lcms2 + ]; + + mesonFlags = [ + (lib.mesonBool "glycin-loaders" false) + (lib.mesonBool "libglycin" true) + (lib.mesonBool "introspection" withIntrospection) + (lib.mesonBool "vapi" withIntrospection) + (lib.mesonBool "capi_docs" withIntrospection) + ]; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "libglycin"; + packageName = "glycin"; + }; + }; + + meta = { + description = "Sandboxed and extendable image loading library"; + homepage = "https://gitlab.gnome.org/GNOME/glycin"; + changelog = "https://gitlab.gnome.org/GNOME/glycin/-/tags/${finalAttrs.version}"; + license = with lib.licenses; [ + mpl20 # or + lgpl21Plus + ]; + maintainers = with lib.maintainers; [ normalcea ]; + platforms = lib.platforms.linux; + pkgConfigModules = [ + "glycin-1" + "glycin-gtk4-1" + ]; + }; +}) diff --git a/pkgs/by-name/mi/minesector/package.nix b/pkgs/by-name/mi/minesector/package.nix new file mode 100644 index 000000000000..28d8ff2ff85e --- /dev/null +++ b/pkgs/by-name/mi/minesector/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + libtiff, + libwebp, + SDL2, + SDL2_image, + SDL2_ttf, + SDL2_mixer, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "minesector"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "grassdne"; + repo = "minesector"; + tag = finalAttrs.version; + hash = "sha256-VMTXZ4CIk9RpE4R9shHPl0R/T7mJUKY2b8Zi0DPW0/Q="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + libtiff + libwebp + SDL2 + SDL2_image + SDL2_ttf + SDL2_mixer + ]; + + strictDeps = true; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "set(STATIC_LINK" "# set(STATIC_LINK" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "minesector"; + description = "Snazzy Minesweeper-based game built with SDL2"; + homepage = "https://github.com/grassdne/minesector"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 666a5f0f9aae..81b1010a6c7e 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "1.19.1"; + version = "1.19.2"; passthru.updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { }) @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "containers"; repo = "podman-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-HTfrbMwXw+GGseVzJR2eagBJ7AmuPeFMuy/lO7EADmY="; + hash = "sha256-Yw4HPHtMMxaI7MLamZy+MglvHHpO6h4/kHY2TBXWErg="; }; pnpmDeps = pnpm_10.fetchDeps { diff --git a/pkgs/by-name/s-/s-search/package.nix b/pkgs/by-name/s-/s-search/package.nix new file mode 100644 index 000000000000..3e8ba938eeb7 --- /dev/null +++ b/pkgs/by-name/s-/s-search/package.nix @@ -0,0 +1,61 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, + testers, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "s-search"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "zquestz"; + repo = "s"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5hkorROs11nrDK5/BBEPIugVYeVUWtAnpCBBuKTj15g="; + }; + + vendorHash = "sha256-0E/9fONanSxb2Tv5wKIpf1J/A6Hdge23xy3r6pFyV9E="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd s \ + --bash <($out/bin/s --completion bash) \ + --fish <($out/bin/s --completion fish) \ + --zsh <($out/bin/s --completion zsh) + ''; + + passthru = { + # `versionCheckHook` fails due to the program requires `sh` to be available in `PATH` + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "s --version"; + }; + + updateScript = nix-update-script { }; + }; + + meta = { + description = "Web search from the terminal"; + longDescription = '' + Command-line tool that generates a search query link and opens it in the + browser of your choice. + ''; + homepage = "https://github.com/zquestz/s"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + yzx9 + ]; + mainProgram = "s"; + }; +}) diff --git a/pkgs/by-name/sa/sameboy/package.nix b/pkgs/by-name/sa/sameboy/package.nix index a2eb80b3c075..a242b5e6af42 100644 --- a/pkgs/by-name/sa/sameboy/package.nix +++ b/pkgs/by-name/sa/sameboy/package.nix @@ -7,22 +7,26 @@ SDL2, wrapGAppsHook3, glib, + gdk-pixbuf, + pkg-config, }: stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.16.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-KUvhmORI3hIJFMCW8U2BZYnIwzg7h+GZZA4+U0IPS9E="; + sha256 = "sha256-rNP1jGnGqZG5jz8vQzqDNEKticg51uCcZQaUteawlPU="; }; enableParallelBuilding = true; # glib and wrapGAppsHook3 are needed to make the Open ROM menu work. nativeBuildInputs = [ + pkg-config + gdk-pixbuf rgbds glib wrapGAppsHook3 @@ -35,6 +39,10 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; + patches = [ + ./xdg-install-patch.diff + ]; + postPatch = '' substituteInPlace OpenDialog/gtk.c \ --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"' diff --git a/pkgs/by-name/sa/sameboy/xdg-install-patch.diff b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff new file mode 100644 index 000000000000..91e09f5fa12e --- /dev/null +++ b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff @@ -0,0 +1,29 @@ +diff --git a/Makefile b/Makefile +index 3377b3f..4492f96 100644 +--- a/Makefile ++++ b/Makefile +@@ -788,15 +788,7 @@ install: $(BIN)/XdgThumbnailer/sameboy-thumbnailer sdl $(shell find FreeDesktop) + install -m 755 $(BIN)/SDL/sameboy $(DESTDIR)$(PREFIX)/bin/sameboy + install -m 755 $(BIN)/XdgThumbnailer/sameboy-thumbnailer $(DESTDIR)$(PREFIX)/bin/sameboy-thumbnailer + install -m 644 XdgThumbnailer/sameboy.thumbnailer $(DESTDIR)$(PREFIX)/share/thumbnailers/sameboy.thumbnailer +-ifeq ($(DESTDIR),) +- xdg-mime install --novendor FreeDesktop/sameboy.xml +- xdg-desktop-menu install --novendor FreeDesktop/sameboy.desktop +- for size in 16 32 64 128 256 512; do \ +- xdg-icon-resource install --novendor --theme hicolor --size $$size --context apps FreeDesktop/AppIcon/$${size}x$${size}.png sameboy; \ +- xdg-icon-resource install --novendor --theme hicolor --size $$size --context mimetypes FreeDesktop/Cartridge/$${size}x$${size}.png x-gameboy-rom; \ +- xdg-icon-resource install --novendor --theme hicolor --size $$size --context mimetypes FreeDesktop/ColorCartridge/$${size}x$${size}.png x-gameboy-color-rom; \ +- done +-else ++ + install -m 644 FreeDesktop/sameboy.xml $(DESTDIR)$(PREFIX)/share/mime/sameboy.xml + install -m 644 FreeDesktop/sameboy.desktop $(DESTDIR)$(PREFIX)/share/applications/sameboy.desktop + for size in 16x16 32x32 64x64 128x128 256x256 512x512; do \ +@@ -807,7 +799,6 @@ else + install -m 644 FreeDesktop/ColorCartridge/$$size.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/$$size/mimetypes/x-gameboy-color-rom.png; \ + done + endif +-endif + + ios: bootroms + @$(MAKE) _ios diff --git a/pkgs/by-name/sy/syrics/package.nix b/pkgs/by-name/sy/syrics/package.nix new file mode 100644 index 000000000000..520b67d3887c --- /dev/null +++ b/pkgs/by-name/sy/syrics/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "syrics"; + version = "0.1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "akashrchandran"; + repo = "syrics"; + tag = "v${version}"; + hash = "sha256-YoH5rgj0kt9fDILc9dTAFO5erOBWexuqT9hY7e6bj6Q="; + }; + + build-system = [ + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + + dependencies = with python3.pkgs; [ + requests + spotipy + tinytag + tqdm + ]; + + pythonImportsCheck = [ + "syrics" + ]; + + meta = { + description = "Command line tool to fetch lyrics from spotify and save it to lrc file"; + homepage = "https://github.com/akashrchandran/syrics/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ yogansh ]; + mainProgram = "syrics"; + }; +} diff --git a/pkgs/by-name/ta/taskflow/package.nix b/pkgs/by-name/ta/taskflow/package.nix index 8cc90436fbd3..7b69f94b39dd 100644 --- a/pkgs/by-name/ta/taskflow/package.nix +++ b/pkgs/by-name/ta/taskflow/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "taskflow"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; tag = "v${finalAttrs.version}"; - hash = "sha256-omon02xgf4vV7JzpLFtHgf2MXxR6JowI+pDyAswXMUY="; + hash = "sha256-s0A8zJoq0VfmAks9h4v63J7tPX5JnlNTzJJMilzc5yM="; }; patches = [ diff --git a/pkgs/by-name/vi/violet/package.nix b/pkgs/by-name/vi/violet/package.nix index 522f49c8ab45..c52728b84051 100644 --- a/pkgs/by-name/vi/violet/package.nix +++ b/pkgs/by-name/vi/violet/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "violet"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "violet"; rev = "v${finalAttrs.version}"; - hash = "sha256-aoBTmhz/rwz2ucRrRti3K8SYt9D/EBPn6s5iTjQ9bpQ="; + hash = "sha256-OBrEydVqhbxJZED8mUjV605kvtbXPqb35X1XeNBNvjg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 52963744974a..0676e9288632 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.10.1", + "version": "1.10.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/1c62a60cfa8be3ea8c2f98e0b2e3440d30b508dd/Windsurf-darwin-arm64-1.10.1.zip", - "sha256": "26bad53b1a37e82471d6f95f0967d0e7a64b9a98715477e299a3ccddefe62f59" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-darwin-arm64-1.10.3.zip", + "sha256": "1d48996a9a695ddce474e4a268e687752c5f856446298c58fdbca3b21f19ec88" }, "x86_64-darwin": { - "version": "1.10.1", + "version": "1.10.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/1c62a60cfa8be3ea8c2f98e0b2e3440d30b508dd/Windsurf-darwin-x64-1.10.1.zip", - "sha256": "bbec36bbe725909a0ca310c9f753abe5def3d13aac9cdf70c7bd84831d333361" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-darwin-x64-1.10.3.zip", + "sha256": "ab46ad5bed1c8e577fee8cfe249981af88c504a357f82a769cd698b3bc9c2b4d" }, "x86_64-linux": { - "version": "1.10.1", + "version": "1.10.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/1c62a60cfa8be3ea8c2f98e0b2e3440d30b508dd/Windsurf-linux-x64-1.10.1.tar.gz", - "sha256": "c054599887b0a69446187e4e777c634b248f812d6240ee6b765425494847fd1a" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-linux-x64-1.10.3.tar.gz", + "sha256": "638f31624714189f6c3272635d1089debbe1fb9a96eb290a8b5b4471eb288dfb" } } diff --git a/pkgs/development/compilers/zig/fetcher.nix b/pkgs/development/compilers/zig/fetcher.nix new file mode 100644 index 000000000000..abb8acaa0838 --- /dev/null +++ b/pkgs/development/compilers/zig/fetcher.nix @@ -0,0 +1,32 @@ +{ + lib, + zig, + runCommand, +}: +{ + pname, + version, + name ? "${pname}-${version}", + src, + hash ? lib.fakeHash, +}@args: +runCommand "${name}-zig-deps" + { + inherit (args) src; + + nativeBuildInputs = [ zig ]; + + outputHashAlgo = null; + outputHashMode = "recursive"; + outputHash = hash; + } + '' + export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + + runHook unpackPhase + + cd $sourceRoot + zig build --fetch + + mv $ZIG_GLOBAL_CACHE_DIR/p $out + '' diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 5b95d7fd6b52..2f81039821b2 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -142,28 +142,17 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; - passthru = { - hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; }; - - bintools-unwrapped = callPackage ./bintools.nix { zig = finalAttrs.finalPackage; }; - bintools = wrapBintoolsWith { bintools = finalAttrs.finalPackage.bintools-unwrapped; }; - - cc-unwrapped = callPackage ./cc.nix { zig = finalAttrs.finalPackage; }; - cc = wrapCCWith { - cc = finalAttrs.finalPackage.cc-unwrapped; - bintools = finalAttrs.finalPackage.bintools; - extraPackages = [ ]; - nixSupport.cc-cflags = - [ - "-target" - "${stdenv.targetPlatform.system}-${stdenv.targetPlatform.parsed.abi.name}" - ] - ++ lib.optional ( - stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false) - ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}"; - }; - - stdenv = overrideCC stdenv finalAttrs.finalPackage.cc; + passthru = import ./passthru.nix { + inherit + lib + stdenv + callPackage + wrapCCWith + wrapBintoolsWith + overrideCC + targetPackages + ; + zig = finalAttrs.finalPackage; }; meta = { diff --git a/pkgs/development/compilers/zig/passthru.nix b/pkgs/development/compilers/zig/passthru.nix new file mode 100644 index 000000000000..094142fbc16e --- /dev/null +++ b/pkgs/development/compilers/zig/passthru.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + zig, + callPackage, + wrapCCWith, + wrapBintoolsWith, + overrideCC, + targetPackages, +}: +{ + hook = callPackage ./hook.nix { inherit zig; }; + + bintools-unwrapped = callPackage ./bintools.nix { inherit zig; }; + bintools = wrapBintoolsWith { bintools = zig.bintools-unwrapped; }; + + cc-unwrapped = callPackage ./cc.nix { inherit zig; }; + cc = wrapCCWith { + cc = zig.cc-unwrapped; + bintools = zig.bintools; + extraPackages = [ ]; + nixSupport.cc-cflags = + [ + "-target" + "${stdenv.targetPlatform.system}-${stdenv.targetPlatform.parsed.abi.name}" + ] + ++ lib.optional ( + stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false) + ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}"; + }; + + stdenv = overrideCC stdenv zig.cc; + + fetchDeps = callPackage ./fetcher.nix { inherit zig; }; +} diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 5d7f0f492e52..606fbea053ce 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-YCQdScBCgmyallocGB8JGgkNkKTfy53/KPStq97S6wU="; + hash = "sha256-qvylwn4wHBWUcyqGWKUt7MMmTsttDQGmN5ySj1pHnkU="; fetchSubmodules = true; }; diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix index 714cd7904556..c4a007031441 100644 --- a/pkgs/development/php-packages/php-codesniffer/default.nix +++ b/pkgs/development/php-packages/php-codesniffer/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "php-codesniffer"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "PHPCSStandards"; repo = "PHP_CodeSniffer"; tag = finalAttrs.version; - hash = "sha256-ReWLRVKkVY2fiPgZ3MQnHXDUGQYV1zci5B3Musxq5Q0="; + hash = "sha256-4znDEHFdDvshpa6BTyr+YV+IcSB486jTtnAk1fzPFt8="; }; - vendorHash = "sha256-+e80bUeTQ6bSvI/rFlCC7vwuM8pMTSnylEnPhH1LD14="; + vendorHash = "sha256-j4SFRDf+JO3vnB7yo3wP9U00zjSPURr0fMuSvn4leAk="; meta = { changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index cdc3f391b780..d60db2dc4269 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "granian"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-pXMoNqcLrj8y2MK6NKQszBlGSrvZJShD/zzOzQbi/Rw="; + hash = "sha256-PoNHpxumBdVllfpbVMYDV8KnDqIDP+XQcrkvs6tdNKg="; }; # Granian forces a custom allocator for all the things it runs, @@ -39,7 +39,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-KPIOpvqPYRJeMbokQRQb3UXDfXosdCZscSyzjSBhkEY="; + hash = "sha256-0tEYewojStfXRrcI8LVR1T7c5EETkYXVfClsHCUNPrM="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 8ae3726a2c3f..d7ac4bcde75a 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, cmake, cython, ninja, @@ -27,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-vwAqlTq4HIbmCL1HsHcgfVWETImxdqTsnenmX2RGXw8="; }; + patches = [ + # https://github.com/rapidfuzz/RapidFuzz/pull/446 + (fetchpatch { + name = "support-taskflow-3.10.0.patch"; + url = "https://github.com/rapidfuzz/RapidFuzz/commit/bba3281cc61ecc4ab4affe5d2d50389a4f6d7556.patch"; + hash = "sha256-kAS6xsPY7eUTfKO+EAOW8bktY4cApvLEpRMciJEsPgk="; + }) + ]; + build-system = [ cmake cython