public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50491 from oxij/pkgs/tiny-fixes

Browse Source 
trivial: random fixes
This commit is contained in:
xeji 2018-11-18 16:58:55 +01:00 committed by GitHub
commit a292829e58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/version-management/mr/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchgit, perl }: { stdenv, fetchgit, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.20180726";
name = "mr-${version}"; name = "mr-${version}";
version = "1.20180726";
src = fetchgit { src = fetchgit {
url = "git://myrepos.branchable.com/"; url = "git://myrepos.branchable.com/";
rev = "refs/tags/" + version; # the repository moved its tags at least once
sha256 = "15i9bs2i25l7ibv530ghy8280kklcgm5kr6j86s7iwcqqckd0czp"; # when updating please continue using the revision hash here
rev = "0ad7a17bb455de1fec3b2375c7aac72ab2a22ac4";
sha256 = "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5";
}; };
postPatch = '' postPatch = ''

2
pkgs/applications/video/vlc/default.nix
View File

@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
$out/lib/vlc/vlc-cache-gen $out/vlc/plugins $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 remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so
''; '';

2
pkgs/development/tools/build-managers/cmake/2.8.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
patches = patches =
[(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959 [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959
name = "FindFreetype-2.5.patch"; 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"; sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
})] ++ })] ++
# Don't search in non-Nix locations such as /usr, but do search in our libc. # Don't search in non-Nix locations such as /usr, but do search in our libc.

6
pkgs/tools/cd-dvd/mdf2iso/default.nix
View File

@ -5,9 +5,9 @@ stdenv.mkDerivation rec {
version = "0.3.1"; version = "0.3.1";
src = fetchgit { src = fetchgit {
url = https://anonscm.debian.org/cgit/collab-maint/mdf2iso.git; url = "https://salsa.debian.org/debian/mdf2iso";
rev = "5a8acaf3645bff863f9f16ea1d3632c312f01523"; rev = "c6a5b588318d43bc8af986bbe48d0a06e92f4280";
sha256 = "0f2jx8dg1sxc8y0sisqhqsqg7pj1j84fp08nahp0lfcq522pqbhl"; sha256 = "0xg43jlvrk8adfjgbjir15nxwcj0nhz4gxpqx7jdfvhg0kwliq0n";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/tools/system/datefudge/default.nix
View File

@ -6,9 +6,9 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchgit { src = fetchgit {
sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c"; url = "https://salsa.debian.org/debian/datefudge.git";
url = "git://anonscm.debian.org/users/robert/datefudge.git";
rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6"; rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6";
sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c";
}; };
patchPhase = '' patchPhase = ''

5
pkgs/top-level/python-packages.nix
View File

@ -2444,7 +2444,10 @@ in {
google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; 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 { gphoto2 = callPackage ../development/python-modules/gphoto2 {
inherit (pkgs) pkgconfig; inherit (pkgs) pkgconfig;