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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
This commit is contained in:
Tuomas Tynkkynen
2018-02-28 20:52:49 +02:00
parent ad17db3562 f1dd205c4e
commit 34f95d92a2
261 changed files with 3045 additions and 2049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/data/misc/media-player-info/default.nix
View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, python3, udev, systemd }:
let
name = "media-player-info-22";
name = "media-player-info-23";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://www.freedesktop.org/software/media-player-info/${name}.tar.gz";
sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy";
url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz";
sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9";
};
buildInputs = [ udev systemd ];
@@ -25,7 +25,7 @@ in
meta = with stdenv.lib; {
description = "A repository of data files describing media player capabilities";
homepage = http://www.freedesktop.org/wiki/Software/media-player-info/;
homepage = https://www.freedesktop.org/wiki/Software/media-player-info/;
license = licenses.bsd3;
maintainers = with maintainers; [ ttuegel ];
platforms = with platforms; linux;