diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 12:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 12:01:04 +0000 |
| commit | 2d73797da48f676717877fea6dfe4468f15d2413 (patch) | |
| tree | 209b8a7f85057517695cbbbf523a7102bf3538a9 /pkgs/applications/graphics | |
| parent | d96b3a86e56291a57628bc3dc76be1ab086dc29e (diff) | |
| parent | 7f24be48bee10e83ce784e67e72b8924877cb921 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/dia/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/vengi-tools/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 093a53978a06f..eb9d54d5cfc17 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -15,6 +15,7 @@ , pkg-config , poppler , python3 +, wrapGAppsHook # Building with docs are still failing in unstable-2023-09-28 , withDocs ? false }: @@ -59,6 +60,7 @@ stdenv.mkDerivation { meson ninja pkg-config + wrapGAppsHook ] ++ lib.optionals withDocs [ dblatex diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 66ed4b4fa54f2..dd13f8ba4503d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.26"; + version = "0.0.27"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - hash = "sha256-p+ZL3oxzwKhh+j1bxakgyStH+1GAu2aEwNmsqo6fNFo="; + hash = "sha256-A37IY66wZZK7Tv0zWsORO6CuRRRj7YmKLnEPSbfAvwI="; }; nativeBuildInputs = [ |