diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
commit | 2858c41823db1654f123c455cca2b145b8d8737b (patch) | |
tree | 48518e1eb8916d1528d75823c2d1232822d059e9 /pkgs/misc | |
parent | 34b6bbe021baa11a4dddf9532b331dac8d4162f2 (diff) | |
parent | e1f755e44faa5745ad3a8b18e18017e77dfbe67c (diff) | |
download | nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.gz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.bz2 nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.lz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.xz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.zst nixlib-2858c41823db1654f123c455cca2b145b8d8737b.zip |
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/drivers/gutenprint/default.nix | 1 | ||||
-rw-r--r-- | pkgs/misc/emulators/mednafen/default.nix | 17 | ||||
-rw-r--r-- | pkgs/misc/emulators/mednafen/server.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/lilypond/unstable.nix | 14 | ||||
-rw-r--r-- | pkgs/misc/screensavers/xlockmore/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/xssproxy/default.nix | 29 |
7 files changed, 59 insertions, 22 deletions
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 0bd40721c4ed..7917d1e36160 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/gimp-print/; license = licenses.gpl2; platforms = platforms.linux; + isGutenprint = true; }; } diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 148c8380d8ca..a03695eed772 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -4,18 +4,20 @@ , SDL, SDL_net, zlib }: +with stdenv.lib; stdenv.mkDerivation rec { - name = "mednafen-${meta.version}"; + name = "mednafen-${version}"; + version = "0.9.47"; src = fetchurl { - url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2"; - sha256 = "1n6y7b86sv11vd6rv8if3wr4qyihkjai9km1s4smqcisi3pvxcqv"; + url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; + sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si"; }; - buildInputs = with stdenv.lib; - [ pkgconfig libX11 mesa freeglut libjack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ]; - + buildInputs = + [ pkgconfig libX11 mesa freeglut libjack2 libcdio + libsndfile libsamplerate SDL SDL_net zlib ]; # Install docs postInstall = '' @@ -25,9 +27,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - version = "0.9.38.7"; description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = http://mednafen.sourceforge.net/; + homepage = http://mednafen.github.io/; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 3854caf22423..91a74171da9a 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { - name = "mednafen-server-${meta.version}"; + name = "mednafen-server-${version}"; + version = "0.5.2"; src = fetchurl { - url = "http://mednafen.fobby.net/releases/files/${name}.tar.gz"; - sha256="06fal6hwrb8gw94yp7plhcz55109128cgp35m7zs5vvjf1zfhcs9"; + url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz"; + sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; }; postInstall = '' - mkdir -p $out/share/$name + mkdir -p $out/share/$name install -m 644 -t $out/share/$name standard.conf ''; meta = with stdenv.lib; { - version = "0.5.2"; description = "Netplay server for Mednafen"; - homepage = http://mednafen.sourceforge.net/; + homepage = http://mednafen.github.io/; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 0d0f9f21bf2a..d37cc93dfcda 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -24,9 +24,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.7.0"; + version = "4.7.1"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "18d5djnsb70740xs475jg1xsjsrq6zzjv0dmjq3vi7nbv56lg63n"; + sha256 = "1ai9qsrgiwd371pyqr3mjaddaczly5d1z68r4lxl3hrkz2vmv39c"; }; }; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index d16102df9278..046416cd9df2 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchurl, guile, rsync, lilypond }: +{ stdenv, fetchurl, fetchgit, guile, rsync, lilypond, gyre-fonts }: with stdenv.lib; +let urw-fonts = fetchgit { + url = "http://git.ghostscript.com/urw-core35-fonts.git"; + rev = "1f28a6fcd2176256a995db907d9ffe6e1b9b83e9"; + sha256 = "1nlx95l1pw5lxqp2v0rn9a7lqrsbbhzr0dy3cybk55r4a8awbr2a"; +}; in + overrideDerivation lilypond (p: rec { majorVersion = "2.19"; - minorVersion = "24"; + minorVersion = "65"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; src = fetchurl { url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "0wd57swrfc2nvkj10ipdbhq6gpnckiafg2b2kpd8aydsyp248iln"; + sha256 = "0k2jy7z58j62c5cv1308ac62d6jri17wip76xrbq8s6jq6jl7phd"; }; - configureFlags = [ "--disable-documentation" "--with-fonts-dir=${p.urwfonts}"]; + configureFlags = [ "--disable-documentation" "--with-urwotf-dir=${urw-fonts}" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"]; buildInputs = p.buildInputs ++ [ rsync ]; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index f87e24efe184..998e40554649 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libX11, libXext, libXinerama, libXdmcp, libXt }: stdenv.mkDerivation rec { + name = "xlockmore-5.55"; - name = "xlockmore-5.54"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0mdgl20619iii1i04pj2dq29nwvasbngy48cvd819h0wfawsqkwz"; + sha256 = "1y3f76rq2nd10fgi2rx81aj6pijglmm661vjsxi05hpg35dzmwfl"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix new file mode 100644 index 000000000000..e5b6bf0d167c --- /dev/null +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }: + +let rev = "1.0.0"; in + +stdenv.mkDerivation { + name = "xssproxy-${rev}"; + + src = fetchFromGitHub { + owner = "timakro"; + repo = "xssproxy"; + rev = "v${rev}"; + sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; + }; + + buildInputs = [ glib pkgconfig xorg.libX11 xorg.libXScrnSaver dbus ]; + + makeFlags = [ + "bindir=$(out)/bin" + "man1dir=$(out)/share/man/man1" + ]; + + meta = { + description = "Forward freedesktop.org Idle Inhibition Service calls to Xss"; + homepage = https://github.com/timakro/xssproxy; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ benley ]; + platforms = stdenv.lib.platforms.unix; + }; +} |