diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index fef5ecbc37308..6ba29ecf3fd35 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.2.1.9"; # "Android Studio Ladybug | 2024.2.1" - sha256Hash = "sha256-18ppVeAvxx6kNBOjSKcZjbEMNt8khKmohMq3JErX7pY="; + version = "2024.2.1.12"; # "Android Studio Ladybug | 2024.2.1 Patch 3" + sha256Hash = "sha256-TfUax9c+RSAzg0GKU3yVYsWL72q4DUB0zZiss4flyqY="; }; betaVersion = { version = "2024.2.1.8"; # "Android Studio Ladybug | 2024.2.1 RC 1" diff --git a/pkgs/by-name/ga/galario/package.nix b/pkgs/by-name/ga/galario/package.nix index add2445f4462c..d601722efab4e 100644 --- a/pkgs/by-name/ga/galario/package.nix +++ b/pkgs/by-name/ga/galario/package.nix @@ -1,46 +1,62 @@ -{ lib, stdenv -, fetchzip -, fetchFromGitHub -, cmake -, fftw -, fftwFloat -, enablePython ? false -, pythonPackages ? null -, llvmPackages +{ + lib, + stdenv, + fetchzip, + fetchFromGitHub, + cmake, + fftw, + fftwFloat, + enablePython ? false, + pythonPackages ? null, + llvmPackages, }: + let # CMake recipes are needed to build galario # Build process would usually download them great-cmake-cookoff = fetchzip { url = "https://github.com/UCL/GreatCMakeCookOff/archive/v2.1.9.tar.gz"; - sha256 = "1yd53b5gx38g6f44jmjk4lc4igs3p25z6616hfb7aq79ly01q0w2"; + hash = "sha256-ggMcgKfpYHWWgyYY84u4Q79IGCVTVkmIMw+N/soapfk="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "galario"; version = "1.2.2"; src = fetchFromGitHub { owner = "mtazzari"; - repo = pname; - rev = "v${version}"; - sha256 = "0dw88ga50x3jwyfgcarn4azlhiarggvdg262hilm7rbrvlpyvha0"; + repo = "galario"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QMHtL9155VNphMKI1/Z7WUVIvyI2K/ac53J0UNRDiDc="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fftw fftwFloat ] - ++ lib.optional enablePython pythonPackages.python - ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp - ; + buildInputs = + [ + fftw + fftwFloat + ] + ++ lib.optional enablePython pythonPackages.python + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy - pythonPackages.cython + pythonPackages.cython_0 + pythonPackages.distutils pythonPackages.pytest ]; - nativeCheckInputs = lib.optionals enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; + postPatch = '' + substituteInPlace python/utils.py \ + --replace-fail "trapz" "trapezoid" \ + --replace-fail "np.int" "int" + ''; + + nativeCheckInputs = lib.optionals enablePython [ + pythonPackages.scipy + pythonPackages.pytest-cov + ]; preConfigure = '' mkdir -p build/external/src @@ -49,7 +65,12 @@ stdenv.mkDerivation rec { ''; preCheck = '' - ${if stdenv.hostPlatform.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} + ${ + if stdenv.hostPlatform.isDarwin then + "export DYLD_LIBRARY_PATH=$(pwd)/src/" + else + "export LD_LIBRARY_PATH=$(pwd)/src/" + } ${lib.optionalString enablePython "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh"} ''; @@ -65,7 +86,7 @@ stdenv.mkDerivation rec { install_name_tool -change libgalario_single.dylib $out/lib/libgalario_single.dylib $out/lib/python*/site-packages/galario/single/libcommon.so ''; - meta = with lib; { + meta = { description = "GPU Accelerated Library for Analysing Radio Interferometer Observations"; longDescription = '' Galario is a library that exploits the computing power of modern @@ -76,8 +97,8 @@ stdenv.mkDerivation rec { comparison to the observations. ''; homepage = "https://mtazzari.github.io/galario/"; - license = licenses.lgpl3; - maintainers = [ maintainers.smaret ]; - platforms = platforms.all; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.smaret ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sn/snapmaker-luban/package.nix b/pkgs/by-name/sn/snapmaker-luban/package.nix index af0cacb803063..f4adab052c178 100644 --- a/pkgs/by-name/sn/snapmaker-luban/package.nix +++ b/pkgs/by-name/sn/snapmaker-luban/package.nix @@ -1,18 +1,49 @@ -{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl -, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups -, gtk3, nss, glib, nspr, gdk-pixbuf, libdrm, libgbm -, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, pango -, gcc-unwrapped, udev +{ + lib, + stdenv, + autoPatchelfHook, + makeDesktopItem, + copyDesktopItems, + wrapGAppsHook3, + fetchurl, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + gtk3, + nss, + glib, + nspr, + gdk-pixbuf, + libdrm, + libgbm, + libX11, + libXScrnSaver, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXrandr, + libXrender, + libXtst, + libxcb, + libxshmfence, + pango, + gcc-unwrapped, + udev, }: stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.10.2"; + version = "4.14.0"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-unxI0L8pcF6iWWa57GpYv/aYsApKAKfRaes3uXE7izM="; + hash = "sha256-/cJxVhY9zJdsg8l+BxJDr53/Lsz4JMBGMIS2HD6NXvM="; }; nativeBuildInputs = [ @@ -42,10 +73,33 @@ stdenv.mkDerivation rec { ]; libPath = lib.makeLibraryPath [ - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups - gdk-pixbuf glib gtk3 libX11 libXcomposite libxshmfence - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango libXScrnSaver udev + stdenv.cc.cc + alsa-lib + atk + at-spi2-atk + at-spi2-core + cairo + cups + gdk-pixbuf + glib + gtk3 + libX11 + libXcomposite + libxshmfence + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + libxcb + pango + libXScrnSaver + udev ]; autoPatchelfIgnoreMissingDeps = [ @@ -83,16 +137,19 @@ stdenv.mkDerivation rec { icon = "snapmaker-luban"; desktopName = "Snapmaker Luban"; genericName = meta.description; - categories = [ "Office" "Printing" ]; + categories = [ + "Office" + "Printing" + ]; }) ]; - meta = with lib; { + meta = { description = "Snapmaker Luban is an easy-to-use 3-in-1 software tailor-made for Snapmaker machines"; homepage = "https://github.com/Snapmaker/Luban"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3; - maintainers = [ maintainers.simonkampe ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ simonkampe ]; platforms = [ "x86_64-linux" ]; knownVulnerabilities = [ "CVE-2023-5217" ]; }; diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index 5abe3dff4154c..f17642e26b191 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; rev = "refs/tags/v${version}"; - hash = "sha256-otsgMUdDp93J/ynquHDs6+oLh0CunyfqZwmcKXcXX0Q="; + hash = "sha256-NqessN2yo7H17zWsnnI1oNIRG5Z1Wxi8oTWETP9DHpk="; }; - cargoHash = "sha256-n3gqw4R8NZP8l2PmHWag+cBXlLx1GQPPADBmaYRTe6Q="; + cargoHash = "sha256-vhHlfGl6fSe8rKRv5u3iqomIlLpVKwOVbZDwuDgsdhs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index d4a5de263d2a6..f67e28ff950fe 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -103,6 +103,7 @@ tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json; tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json; tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json; + tree-sitter-twig = lib.importJSON ./tree-sitter-twig.json; tree-sitter-typescript = lib.importJSON ./tree-sitter-typescript.json; tree-sitter-typst = lib.importJSON ./tree-sitter-typst.json; tree-sitter-uiua = lib.importJSON ./tree-sitter-uiua.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json new file mode 100644 index 0000000000000..bb283c7ca6200 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/kaermorchen/tree-sitter-twig", + "rev": "082de47a4a9bab710a4b5284324bd9b60655859b", + "date": "2023-07-29T12:16:03+03:00", + "path": "/nix/store/0mgjx9hzgdnn8svyc89flhr2g6gav473-tree-sitter-twig", + "sha256": "0n9dgm9gld69k8x505y00lh922pacq51vzvfzn62claahvmq5kc2", + "hash": "sha256-gs2C64ZKUSaM/W7/HQpm6gqRIAXAF1A6msk0+lJ9LVk=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 386c178776bd2..6ce9ddf849fc9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -458,6 +458,10 @@ let orga = "grafana"; repo = "tree-sitter-river"; }; + "tree-sitter-twig" = { + orga = "kaermorchen"; + repo = "tree-sitter-twig"; + }; }; allGrammars = diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 53f07b447d423..653bc9c5ccfae 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.63"; + version = "2.65"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-yVTQhkRsyZ3L4LPSv6Ffj6cYKqP9bSty60JQ9BhQFxA="; + hash = "sha256-jzkimE4JPrlsHP0jPawhloXMDNaWG1Sgfp5NiZxm1xo="; }; buildInputs = [ curl openssl ];