diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
| commit | 8dca8b9ccb05e7abe6b769485a4d224987c15c06 (patch) | |
| tree | 80f8e212628d458ecc6d9e9af22661813eed8aa7 /pkgs/applications/graphics/freecad/default.nix | |
| parent | 1ba64dad7c7b29a03ace672b2ff1a01343e853fe (diff) | |
| parent | 22906321fbc0d38372d7ae2657adb2597fc384c1 (diff) | |
| download | nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.gz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.bz2 nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.lz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.xz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.zst nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.zip | |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/applications/graphics/freecad/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index ee7586709dc..eb087c42ce0 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode , eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile , zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU , makeWrapper, pkgconfig, mpi ? null }: @@ -9,11 +9,13 @@ let pythonPackages = python3Packages; in mkDerivation rec { pname = "freecad"; - version = "0.18.3"; + version = "0.18.4"; - src = fetchurl { - url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "07j7azgnicmd8cqnyskp15y44ykgj5qqz5y3w1jdynrv3yrvk1kz"; + src = fetchFromGitHub { + owner = "FreeCAD"; + repo = "FreeCAD"; + rev = version; + sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; }; nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; |