diff options
Diffstat (limited to 'pkgs')
72 files changed, 710 insertions, 196 deletions
diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix deleted file mode 100644 index 768402f4e5a7..000000000000 --- a/pkgs/applications/editors/apostrophe/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja -, wrapGAppsHook3, pkg-config, desktop-file-utils -, appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium -, shared-mime-info, libhandy, fira, sassc -}: - -let - pythonEnv = pythonPackages.python.withPackages(p: with p; [ - regex setuptools levenshtein pyenchant - pygobject3 pycairo pypandoc chardet - ]); - -in stdenv.mkDerivation rec { - pname = "apostrophe"; - version = "2.6.3"; - - src = fetchFromGitLab { - owner = "World"; - repo = pname; - domain = "gitlab.gnome.org"; - rev = "v${version}"; - sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M="; - }; - - nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils - appstream-glib wrapGAppsHook3 sassc gobject-introspection ]; - - buildInputs = [ glib pythonEnv gtk3 - gnome.adwaita-icon-theme webkitgtk gspell texliveMedium - glib-networking libhandy ]; - - postPatch = '' - substituteInPlace data/media/css/web/base.css \ - --replace 'url("/app/share/fonts/FiraSans-Regular.ttf") format("ttf")' \ - 'url("${fira}/share/fonts/opentype/FiraSans-Regular.otf") format("otf")' \ - --replace 'url("/app/share/fonts/FiraMono-Regular.ttf") format("ttf")' \ - 'url("${fira}/share/fonts/opentype/FiraMono-Regular.otf") format("otf")' - - patchShebangs --build build-aux/meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" - --prefix PATH : "${texliveMedium}/bin" - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/apostrophe"; - description = "A distraction free Markdown editor for GNU/Linux"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.sternenseemann ]; - mainProgram = "apostrophe"; - }; -} diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 9b7f63edc74a..ad8c6a9eac46 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.4.1"; - hash = "sha256-huKu6yefGXOay5Az4vksopRt8heoLxvKUrg/J1NlQFo="; + version = "2024.5.1"; + hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 86258fa9805d..78a122528707 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.2.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-juFcVtHhqT6tw9YaKCDTUvX6NqqxEjqVK3Zom673IkQ="; + hash = "sha256-OxEo5fkRSdEZLyvK4Pt3EOWLO0ph6RkSD2OOeAWg72M="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-9G8GPTJRuPahNcEhAddZsUKc1fexp6IrCZlCGKW0T64="; + vendorHash = "sha256-X4pMes9hLMF8bZ6MX5cZdm4HfjnHYshGlA/lXlHr1Ow="; doCheck = false; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 0ff43b584bea..8e4b0c231f74 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.4.4"; + version = "24.5.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-nTRCW76UogaTOyxQ5HfWUln6Lip/LpoyPG+m+mMCb1I="; + hash = "sha256-ktf28AKNr0FcWzJ0A2s3mpU2qgmibpT0rUN9d18mE88="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index 90ee50c68280..0d968e016179 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -1,6 +1,9 @@ { lib, stdenv , fetchFromBitbucket , autoreconfHook + +# Reverse dependency +, sage }: stdenv.mkDerivation rec { @@ -20,6 +23,8 @@ stdenv.mkDerivation rec { autoreconfHook ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Littlewood-Richardson calculator"; homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 9673d7d479d0..ab11d833f70c 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-hlGNL7aMzxBxtATWJBqJTFEQqMv10oC3sRCdtRLHOww="; + hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 296fc5f783f3..a830c7ddd00e 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-X7IY2yXpZiyE+T2dl0G4tWpJ5O6MVCy/sOY3v9inma0="; + hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix new file mode 100644 index 000000000000..503e4ff2f194 --- /dev/null +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -0,0 +1,118 @@ +{ + lib, + fetchFromGitLab, + gtksourceview5, + libspelling, + fetchFromGitHub, + python3Packages, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + desktop-file-utils, + gobject-introspection, + libadwaita, + webkitgtk_6_0, + texliveMedium, + shared-mime-info, +}: + +let + version = "3.0"; + + src = fetchFromGitLab { + owner = "World"; + repo = "apostrophe"; + domain = "gitlab.gnome.org"; + rev = "v${version}"; + sha256 = "sha256-wKxRCU00nSk7F8IZNWoLRtGs3m6ol3UBnArtppUOz/g="; + }; + + # Patches are required by upstream. Without the patches + # typing `- aaa`, newline, `- bbb` the program crashes + gtksourceview5-patched = gtksourceview5.overrideAttrs (prev: { + patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/sourceview_text_commits.patch" ]; + }); + + libspelling-patched = + (libspelling.override { gtksourceview5 = gtksourceview5-patched; }).overrideAttrs + (prev: { + patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/libspelling_text_commits.patch" ]; + }); + + reveal-js = fetchFromGitHub { + owner = "hakimel"; + repo = "reveal.js"; + + # keep in sync with upstream shipped version + # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json + rev = "4.6.0"; + hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; + }; +in +python3Packages.buildPythonApplication rec { + inherit version src; + pname = "apostrophe"; + pyproject = false; + + postPatch = + '' + substituteInPlace build-aux/meson_post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' + + patchShebangs --build build-aux/meson_post_install.py + '' + # Should be done in postInstall, but meson checks this eagerly before build + + '' + install -d $out/share/apostrophe/libs + cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + libadwaita + gtksourceview5-patched + libspelling-patched + webkitgtk_6_0 + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pypandoc + chardet + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix PATH : "${texliveMedium}/bin" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + inherit gtksourceview5-patched libspelling-patched reveal-js; + }; + + meta = { + homepage = "https://gitlab.gnome.org/World/apostrophe"; + description = "A distraction free Markdown editor for GNU/Linux"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + sternenseemann + aleksana + ]; + mainProgram = "apostrophe"; + }; +} diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 1ee53112cff1..f16b0424031d 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.85"; + version = "1.0.86"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-2i9FAWF9b1tNdDbTwCzQY8Mh/h85uigR5IT9kzPft00="; + hash = "sha256-wp4JYuAHtZrHer4db0vBCchf8mQIt6jXWqjqpGKws4o="; }; - cargoHash = "sha256-Vl0zC9TPhiFv2SiZtzIUV7GftB1y9K1gLy1ajisP8Y0="; + cargoHash = "sha256-QNH3G34yTEecZyVgw2a1RJnd1CMfV4aw1OJqes/cK2s="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/by-name/ca/castxml/package.nix index bceafd504dcc..2b0a255bbdc8 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -1,14 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libffi -, libxml2 -, zlib -, withManual ? true -, withHTML ? true -, llvmPackages -, python3 +{ + cmake, + fetchFromGitHub, + lib, + libffi, + libxml2, + llvmPackages, + python3, + stdenv, + zlib, + # Boolean flags + withHTML ? true, + withManual ? true, }: let @@ -17,19 +19,20 @@ let |