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/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen
2018-04-03 02:22:54 +03:00
parent 4c46f13f15 00fc66dc7d
commit 747ebe3f66
263 changed files with 9700 additions and 7232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/cups/default.nix
View File

@@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups";
name = "cups"; # weird name to avoid change (for now)
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch"
+ "?h=packages/cups&id=41fefa22ac518";
sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";
})
./cups-clean-dirty.patch

5
pkgs/misc/emulators/retroarch/cores.nix
View File

@@ -232,10 +232,11 @@ in with stdenv.lib.licenses;
mame = (mkLibRetroCore {
core = "mame";
version = "2018-03-02";
src = fetchRetro {
repo = "mame";
rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e";
sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
rev = "893f1ac2231b348b63209fd5b2545f770458ae8f";
sha256 = "1j9p82q9jhf5lf4w392zd09bq0j4iw1afhznymg0v60jv592h3gz";
};
description = "Port of MAME to libretro";
license = gpl2Plus;

25
pkgs/misc/frescobaldi/default.nix
View File

@@ -1,21 +1,22 @@
{ stdenv, fetchurl, pythonPackages, lilypond}:
{ lib, fetchFromGitHub, python3Packages, lilypond }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
name = "frescobaldi-${version}";
version = "2.0.16";
version = "3.0.0";
src = fetchurl {
url = "https://github.com/wbsoft/frescobaldi/releases/download/"
+ "v2.0.16/${name}.tar.gz";
sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q";
src = fetchFromGitHub {
owner = "wbsoft";
repo = "frescobaldi";
rev = "v${version}";
sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
};
propagatedBuildInputs = with pythonPackages; [ lilypond
pyqt4 poppler-qt4 pygame ];
propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ];
patches = [ ./setup.cfg.patch ./python-path.patch ];
# no tests in shipped with upstream
doCheck = false;
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://frescobaldi.org/;
description = ''Frescobaldi is a LilyPond sheet music text editor'';
longDescription = ''
@@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
fonts and keyboard shortcuts
'';
license = licenses.gpl2Plus;
maintainers = [ maintainers.sepi ];
maintainers = with maintainers; [ sepi ma27 ];
platforms = platforms.all;
};
}

11
pkgs/misc/frescobaldi/python-path.patch
View File

@@ -1,11 +0,0 @@
diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi
--- frescobaldi-2.0.16/frescobaldi 2014-10-24 11:29:28.705687224 +0200
+++ frescobaldi-2.0.16.new/frescobaldi 2014-10-24 11:31:08.086444793 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
import sys
import frescobaldi_app.main
import app
Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app
Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx

13
pkgs/misc/frescobaldi/setup.cfg.patch
View File

@@ -1,13 +0,0 @@
Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build
Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app
Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx
diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg
--- frescobaldi-2.0.16.old/setup.cfg 2012-02-05 07:08:24.000000000 +0100
+++ frescobaldi-2.0.16/setup.cfg 2014-10-24 15:08:48.141335620 +0200
@@ -1,6 +1,2 @@
-[bdist_wininst]
-bitmap=frescobaldi-wininst.bmp
-install-script=frescobaldi-wininst.py
-
[sdist]
force-manifest=1

7
pkgs/misc/screensavers/light-locker/default.nix
View File

@@ -16,18 +16,15 @@
stdenv.mkDerivation rec {
name = "${basename}-${version}";
basename = "light-locker";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "the-cavalry";
repo = basename;
rev = "v${version}";
sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj";
sha256 = "1zsafc10bmliknf12h3mgy7f73lvgph0q0wkaqp42iagmw11yaj8";
};
# Patch so that systemd is "found" when configuring.
patches = [ ./systemd.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ which xfce.xfce4-dev-tools glib systemd
libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ];

13
pkgs/misc/screensavers/light-locker/systemd.patch
View File

@@ -1,13 +0,0 @@
diff --git a/configure.ac.in b/configure.ac.in
index f7d5f5d..341bc83 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -424,7 +424,7 @@ AC_ARG_WITH(systemd,
[with_systemd=$withval], [with_systemd=auto])
PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login],
+ [libsystemd],
[have_systemd=yes], [have_systemd=no])
if test "x$with_systemd" = "xauto" ; then

4
pkgs/misc/themes/greybird/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "greybird";
version = "3.22.6";
version = "3.22.7";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = "${pname}";
rev = "v${version}";
sha256 = "16rifkyy8l4v03rx85j7m6rfdal99l1xdmghysh95r6lx4y6r01i";
sha256 = "118k0bb780h54i2vn5my5r6vbkk134899xwp4aigw5a289xzryvb";
};
nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];

17
pkgs/misc/themes/materia-theme/default.nix
View File

@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }:
{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
stdenv.mkDerivation rec {
name = "materia-theme-${version}";
version = "20180110";
version = "20180321";
src = fetchFromGitHub {
owner = "nana-4";
repo = "materia-theme";
rev = "v${version}";
sha256 = "1knfcc4bqibshbk5s4461brzw780gj7c1i42b168c6jw9p6br6bf";
sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6";
};
nativeBuildInputs = [ gnome3.glib libxml2 ];
nativeBuildInputs = [ gnome3.glib libxml2 bc ];
buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ];
@@ -22,14 +22,15 @@ stdenv.mkDerivation rec {
installPhase = ''
patchShebangs install.sh
sed -i install.sh \
-e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \
-e "s|/usr||"
destdir="$out" ./install.sh
-e "s|if .*which gnome-shell.*;|if true;|" \
-e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
mkdir -p $out/share/themes
./install.sh --dest $out/share/themes
rm $out/share/themes/*/COPYING
'';
meta = with stdenv.lib; {
description = "A Material Design theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)";
description = "A Material Design theme for GNOME/GTK+ based desktop environments";
homepage = https://github.com/nana-4/materia-theme;
license = licenses.gpl2;
platforms = platforms.all;