From fe50c0c096c5cc4063d1048e46666708779f48b8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 10:16:30 +0000 Subject: [PATCH 1/6] cmake_2_8: fix fetchpatch src Old link no longer works. There're other broken patches in that file, but I was too lazy to investigate where one can download them now. --- pkgs/development/tools/build-managers/cmake/2.8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 8ab6b2c13ea..ac438080b9a 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959 name = "FindFreetype-2.5.patch"; - url = "https://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + url = "https://public.kitware.com/Bug/file/4660/0001-Support-finding-freetype2-using-pkg-config.patch"; sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in our libc. From 1e7516a31c2c5fc8eae2a2a84c5575005fe05096 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 10:16:32 +0000 Subject: [PATCH 2/6] datefudge: fix src Debian's anonscm is dead, they use a Gitlab instance now. --- pkgs/tools/system/datefudge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 2c2d778697a..ca389a8e1b4 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -6,9 +6,9 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchgit { - sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c"; - url = "git://anonscm.debian.org/users/robert/datefudge.git"; + url = "https://salsa.debian.org/debian/datefudge.git"; rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6"; + sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c"; }; patchPhase = '' From 5f54bb991965cfed8edd75bab01bbf4f65ad7605 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 10:16:33 +0000 Subject: [PATCH 3/6] mdf2iso: fix src Debian's anonscm is dead, they use a Gitlab instance now. The hash changed because the branch was rebased upstream, the diff is a noop. --- pkgs/tools/cd-dvd/mdf2iso/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix index c87d5783ff6..f33ba31beee 100644 --- a/pkgs/tools/cd-dvd/mdf2iso/default.nix +++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix @@ -5,9 +5,9 @@ stdenv.mkDerivation rec { version = "0.3.1"; src = fetchgit { - url = https://anonscm.debian.org/cgit/collab-maint/mdf2iso.git; - rev = "5a8acaf3645bff863f9f16ea1d3632c312f01523"; - sha256 = "0f2jx8dg1sxc8y0sisqhqsqg7pj1j84fp08nahp0lfcq522pqbhl"; + url = "https://salsa.debian.org/debian/mdf2iso"; + rev = "c6a5b588318d43bc8af986bbe48d0a06e92f4280"; + sha256 = "0xg43jlvrk8adfjgbjir15nxwcj0nhz4gxpqx7jdfvhg0kwliq0n"; }; meta = with stdenv.lib; { From 980043347d7427fcdb7caf875446c8b0c6df8544 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 10:16:35 +0000 Subject: [PATCH 4/6] mr: fix src The tag was moved, the diff is fine. --- pkgs/applications/version-management/mr/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 94979056b93..8150203814d 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - version = "1.20180726"; name = "mr-${version}"; + version = "1.20180726"; src = fetchgit { url = "git://myrepos.branchable.com/"; - rev = "refs/tags/" + version; - sha256 = "15i9bs2i25l7ibv530ghy8280kklcgm5kr6j86s7iwcqqckd0czp"; + # the repository moved its tags at least once + # when updating please continue using the revision hash here + rev = "0ad7a17bb455de1fec3b2375c7aac72ab2a22ac4"; + sha256 = "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5"; }; postPatch = '' From e426758d0ecf601982b2d787723805c009aec87d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 10:16:36 +0000 Subject: [PATCH 5/6] vlc: fix build without qt5 --- pkgs/applications/video/vlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6cba5236a5f..2f0ce0afb15 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { postFixup = '' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' $out/lib/vlc/vlc-cache-gen $out/vlc/plugins - + '' + optionalString withQt5 '' remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so ''; From ac09051cf5ad4384d671ad5eab9516f2ada113cc Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 10:16:39 +0000 Subject: [PATCH 6/6] pythonPackages.gpgme: inherit python else building via e.g. `python3Packages.gpgme` produces the wrong result. --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05ac04a22bc..edfa77593f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2418,7 +2418,10 @@ in { google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; }); + gpgme = toPythonModule (pkgs.gpgme.override { + pythonSupport = true; + inherit (self) python; + }); gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig;