diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
| commit | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (patch) | |
| tree | 96aeb2b4fb3aeff9ecc8c52d173c3b8d57a0ce59 /pkgs/applications/graphics | |
| parent | 0913e30c859f0071d0f0529c309d4256713acc41 (diff) | |
| parent | 60b2fe660e2bcb605650173b7b0a59a47bc6a7e5 (diff) | |
| download | nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.gz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.bz2 nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.lz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.xz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.zst nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/kodelife/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/pdfcpu/default.nix | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index b86560d1319e..22cd252a3e70 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "kodelife"; - version = "0.8.3.93"; + version = "0.8.5.99"; src = fetchzip { url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip"; - sha256 = "1gidh0745g5mc8h5ypm2wamv1paymnrq3nh3yx1j70jwjg8v2v7g"; + sha256 = "189i2j6kaygjb5pccynxv4pwqpy67jf9nfi7fjfhbrmjpqnmkp90"; }; dontConfigure = true; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9910b7bbadf2..9f7fbc8421ba 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -53,10 +53,6 @@ mkDerivation rec { # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory enableParallelBuilding = false; # true by default due to qmake - preBuild = '' - sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile - ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 7b1077d18a9d..3d6d04db5539 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0inlwrpv5zkcv48g5gq1xdrvd7w1zkhf8p57fpr2cpd7hd3am7n8"; + sha256 = "0fgdq8byb9pp9wiq3dm0vxw32kbspczqnk41agxpzjf303zmv75y"; }; modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs"; |