From 1a282a2ec730579c9d171fda7f8bb1cc26220b6d Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Thu, 22 Mar 2018 10:55:44 -0700 Subject: libretro.mame: 2017-06-04 -> 2017-03-02 --- pkgs/misc/emulators/retroarch/cores.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index d6b3b6a98706..8a3f7796aef4 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -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; -- cgit 1.4.1 From 810fc24c35f0ab4a23c9fcbeec279f661e6cb269 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Thu, 29 Mar 2018 08:09:37 -0300 Subject: materia-theme: 20180110 -> 20180321 --- pkgs/misc/themes/materia-theme/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index 58001183bd9e..69a874d07c3f 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -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; -- cgit 1.4.1 From 3f3cefbc502690a62f01fc5abc79d9f77cfabda8 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 14:40:40 -0700 Subject: greybird: 3.22.6 -> 3.22.7 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/greybird/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/49f269acfed0477087452f5f821f1b20 --- pkgs/misc/themes/greybird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 26c371716427..1221c6606872 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -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 ]; -- cgit 1.4.1 From 514e3e8a0798d468c0e907adf080c21a09083ba2 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 30 Mar 2018 21:33:31 +0200 Subject: cups: fix patch download without a rebuild One needs to specify git commit to make the fetch always work. Close #38113. --- pkgs/misc/cups/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index a82afc1e472c..feeb73a27e90 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -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 -- cgit 1.4.1 From f54a02df4f1ecca724a4737b936e100e92ed4743 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 7 Mar 2018 23:00:48 -0800 Subject: light-locker: 1.7.0 -> 1.8.0 --- pkgs/misc/screensavers/light-locker/default.nix | 7 ++----- pkgs/misc/screensavers/light-locker/systemd.patch | 13 ------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/misc/screensavers/light-locker/systemd.patch (limited to 'pkgs/misc') diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index d081581d2552..f38851d6fa0c 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -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 ]; diff --git a/pkgs/misc/screensavers/light-locker/systemd.patch b/pkgs/misc/screensavers/light-locker/systemd.patch deleted file mode 100644 index 9cba8b9c0d2f..000000000000 --- a/pkgs/misc/screensavers/light-locker/systemd.patch +++ /dev/null @@ -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 -- cgit 1.4.1 From 545495b132882053e399b1b96628132240ddc7a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Mar 2018 17:03:17 +0200 Subject: frescobaldi: 2.0.16 -> 3.0.0; fix build 3.0.0 works with Python 3 and QT5 (proivded by pyqt5). These fixes are another step towards #32883 by getting rid of the unused poppler-qt4. See https://hydra.nixos.org/build/71816154/log See ticket #36453 --- pkgs/misc/frescobaldi/default.nix | 25 +++++++++++++------------ pkgs/misc/frescobaldi/python-path.patch | 11 ----------- pkgs/misc/frescobaldi/setup.cfg.patch | 13 ------------- 3 files changed, 13 insertions(+), 36 deletions(-) delete mode 100644 pkgs/misc/frescobaldi/python-path.patch delete mode 100644 pkgs/misc/frescobaldi/setup.cfg.patch (limited to 'pkgs/misc') diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 84272992f2bb..af4c54d9d0d8 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -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; }; } diff --git a/pkgs/misc/frescobaldi/python-path.patch b/pkgs/misc/frescobaldi/python-path.patch deleted file mode 100644 index 6c54d9f208ec..000000000000 --- a/pkgs/misc/frescobaldi/python-path.patch +++ /dev/null @@ -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 diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch deleted file mode 100644 index 502cdd61966d..000000000000 --- a/pkgs/misc/frescobaldi/setup.cfg.patch +++ /dev/null @@ -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 -- cgit 1.4.1