git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #85330 from chkno/openmvg

openmvg: 1.3 -> 1.5 (unbreak)

commit3ab2bf69ce4394f99f5c512d95c26e6d44618786 authorDaniël de Kok <me@danieldk.eu> dateSun 16 Aug 2020, 09:39 (6 years ago) parenta37961705a16be
1 file changed+7−9
pkgs/applications/science/misc/openmvg/default.nix+7−9
pkgs/applications/science/misc/openmvg/default.nix+7−9
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, pkgconfig, cmake
1+{ stdenv, fetchFromGitHub, pkgconfig, cmake
22, libjpeg ? null
33, zlib ? null
44, libpng ? null
@@ -8,15 +8,14 @@
88, enableDocs ? false }:
99
1010stdenv.mkDerivation rec {
11− version = "1.3";
11+ version = "1.6";
1212 pname = "openmvg";
1313
14− src = fetchgit {
15− url = "https://www.github.com/openmvg/openmvg.git";
16−
17− # Tag v1.1
18− rev = "refs/tags/v${version}";
19− sha256 = "1cf1gbcl8zvxp4rr6f6vaxwcg0yzc4xban2b5p9zy1m4k1f81zyb";
14+ src = fetchFromGitHub {
15+ owner = "openmvg";
16+ repo = "openmvg";
17+ rev = "v${version}";
18+ sha256 = "0mrsi0dzgi7cjzn13r9xv7rnc8c9a4h8ip78xy88m9xsyr21wd1h";
2019 fetchSubmodules = true;
2120 };
2221
@@ -46,6 +45,5 @@ stdenv.mkDerivation rec {
4645 license = stdenv.lib.licenses.mpl20;
4746 platforms = stdenv.lib.platforms.linux;
4847 maintainers = with stdenv.lib.maintainers; [ mdaiter ];
49− broken = true; # 2018-04-11
5048 };
5149}