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

4
pkgs/data/documentation/man-pages/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "man-pages-${version}";
version = "4.14";
version = "4.15";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih";
sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];

4
pkgs/data/fonts/fira-code/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
version = "1.204";
version = "1.205";
in fetchzip {
name = "fira-code-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad";
sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms";
meta = with stdenv.lib; {
homepage = https://github.com/tonsky/FiraCode;

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;