diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
| commit | ef93931efff0323fd13c4270415b578c73b5ef35 (patch) | |
| tree | e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/applications/graphics | |
| parent | c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff) | |
| parent | a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff) | |
| download | nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip | |
Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics')
| -rw-r--r-- | nixpkgs/pkgs/applications/graphics/fondo/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/graphics/freecad/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/graphics/gimp/default.nix | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/nixpkgs/pkgs/applications/graphics/fondo/default.nix index af6eaa2904ae..f7d5f099f84c 100644 --- a/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "0mh3s2726zf3va6nj7kj2nbmq5q65xrbnsllss3sqf8a838zqfn6"; + sha256 = "1xflkqzdbyvdjybarvb13vw6p8f2xjlvpr155yaxgjjzjcr1j86y"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 298b03cf4302..92fc74242a24 100644 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -38,6 +38,10 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; + + postFixup = '' + mv $out/share/doc $out + ''; meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; diff --git a/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/default.nix index 657a9dd27e50..a2a6fe3c14f7 100644 --- a/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -9,11 +9,11 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.10"; + version = "2.10.12"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j"; + sha256 = "0wdcr8d2ink4swn5r4v13bsiya6s3xm4ya97sdbhs4l40y7bb03x"; }; nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; |