Merge master into #2129

Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
This commit is contained in:
Vladimír Čunát
2014-08-12 19:24:08 +02:00
4409 changed files with 71673 additions and 25537 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }:
{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "a2jmidid-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
};
buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];
buildInputs = [ alsaLib dbus jack2 pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";

View File

@@ -61,7 +61,7 @@ in
meta = {
homepage = "http://lly.org/~rcw/abcde/page/";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
description = "Command-line audio CD ripper";
longDescription = ''

View File

@@ -1,12 +1,12 @@
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
, perl, pkgconfig, python, serd, sord, sratom, suil }:
let
tag = "3.5.357";
tag = "3.5.380";
in
stdenv.mkDerivation rec {
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = git://git.ardour.org/ardour/ardour.git;
rev = "refs/tags/${tag}";
sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b";
};
buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
patchPhase = ''
# The funny revision number is from `git describe rev`
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-g2f6065b\"; }\n' > libs/ardour/revision.cc
# Note the different version number
sed -i '33i rev = \"3.5-357-gce4d125\"' wscript
sed -i '33i rev = \"3.5-380-g2f6065b\"' wscript
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
@@ -47,6 +47,21 @@ stdenv.mkDerivation rec {
mkdir -pv $out/gtk2/engines
cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
# Install desktop file
mkdir -p "$out/share/applications"
cat > "$out/share/applications/ardour.desktop" << EOF
[Desktop Entry]
Name=Ardour 3
GenericName=Digital Audio Workstation
Comment=Multitrack harddisk recorder
Exec=$out/bin/ardour3
Icon=$out/share/ardour3/icons/ardour_icon_256px.png
Terminal=false
Type=Application
X-MultipleArgs=false
Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
EOF
'';
meta = with stdenv.lib; {

View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Sound editor with graphical UI";
homepage = http://audacity.sourceforge.net;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};

View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
the command line or a script.
'';
homepage = http://www.jpj.net/~trevor/aumix.html;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.linux;

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }:
{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }:
stdenv.mkDerivation rec {
name = "bristol-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
xlibs.xproto
];

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }:
, gtk, jack2, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "calf-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH
cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH
libglade lv2 pkgconfig
];

View File

@@ -0,0 +1,104 @@
{ stdenv, fetchurl, cmake
, withQt4 ? true, qt4
, withQt5 ? false, qt5
# I'm unable to make KDE work here, crashes at runtime so I simply
# make Qt4 the default until someone who wants KDE can figure it out.
, withKDE4 ? false, kde4
# Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out.
, withCdda ? false, cdparanoia
, withCddb ? false, libcddb
, withLame ? false, lame
, withMusicbrainz ? false, libmusicbrainz5
, withTaglib ? true, taglib, taglib_extras
, withReplaygain ? true, ffmpeg, speex, mpg123
, withMtp ? true, libmtp
, withOnlineServices ? true
, withDevices ? true, udisks2
, withDynamic ? true
, withHttpServer ? true
, withStreams ? true
}:
# One and only one front-end.
assert withQt5 -> withQt4 == false && withKDE4 == false;
assert withQt4 -> withQt5 == false && withKDE4 == false;
assert withKDE4 -> withQt4 == false && withQt5 == false;
assert withQt4 || withQt5 || withKDE4;
# Inter-dependencies.
assert withCddb -> withCdda && withTaglib;
assert withCdda -> withCddb && withMusicbrainz;
assert withLame -> withCdda && withTaglib;
assert withMtp -> withTaglib;
assert withMusicbrainz -> withCdda && withTaglib;
assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
version = "1.3.4";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
inherit name;
url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU";
sha256 = "0ris41v44nwd68f3zis9n9lyyc089dyhlxp37rrzflanrc6glpwq";
};
buildInputs =
[ cmake ]
++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optional withQt5 qt5
++ stdenv.lib.optional withKDE4 kde4.kdelibs
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ stdenv.lib.optional withCdda cdparanoia
++ stdenv.lib.optional withCddb libcddb
++ stdenv.lib.optional withLame lame
++ stdenv.lib.optional withMtp libmtp
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
unpackPhase = "tar -xvf $src";
sourceRoot = "cantata-1.3.4";
# Qt4 is implicit when KDE is switched off.
cmakeFlags = stdenv.lib.flatten [
(fstats withKDE4 [ "KDE" "KWALLET" ])
(fstat withQt5 "QT5")
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
(fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
(fstat withCdda "CDPARANOIA")
(fstat withCddb "CDDB")
(fstat withLame "LAME")
(fstat withMtp "MTP")
(fstat withMusicbrainz "MUSICBRAINZ")
(fstat withOnlineServices "ONLINE_SERVICES")
(fstat withDynamic "DYNAMIC")
(fstat withDevices "DEVICES_SUPPORT")
(fstat withHttpServer "HTTP_SERVER")
(fstat withStreams "STREAMS")
"-DENABLE_HTTPS_SUPPORT=ON"
"-DENABLE_UDISKS2=ON"
];
meta = with stdenv.lib; {
homepage = "http://code.google.com/p/cantata/";
description = "A graphical client for MPD.";
license = licenses.gpl3;
# Technically Cantata can run on Windows so if someone wants to
# bother figuring that one out, be my guest.
platforms = platforms.linux;
maintainers = [ maintainers.fuuzetsu ];
};
}

View File

@@ -19,7 +19,7 @@ in
meta = {
homepage = http://lly.org/~rcw/cd-discid/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID";
longDescription = ''

View File

@@ -1,8 +1,10 @@
{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
, usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
, sparsehash }:
, sparsehash, config }:
let withSpotify = config.clementine.spotify or false;
in
stdenv.mkDerivation {
name = "clementine-1.2.1";
@@ -27,7 +29,6 @@ stdenv.mkDerivation {
liblastfm
libmtp
libplist
libspotify
pkgconfig
protobuf
qca2
@@ -37,7 +38,7 @@ stdenv.mkDerivation {
sqlite
taglib
usbmuxd
];
] ++ stdenv.lib.optional withSpotify libspotify;
meta = with stdenv.lib; {
homepage = "http://www.clementine-player.org";
@@ -45,5 +46,7 @@ stdenv.mkDerivation {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.ttuegel ];
# libspotify is unfree
hydraPlatforms = optional (!withSpotify) platforms.linux;
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2
, libxslt, lv2, pkgconfig, premake3, xlibs }:
let
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3
alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
xlibs.libXinerama xlibs.libXrender
];

View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "0wxbn5qm3dn9spwbm618flgrwvls7bipg0nhgn0lv4za2g823g56";
sha256 = "16bjkp22hfpmzj5di98dddzslavgvhw5z7pgjzmjqz9dxvbqwq1k";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";

View File

@@ -1,10 +1,11 @@
{stdenv, fetchurl, unzip, portaudio }:
{ stdenv, fetchurl, unzip, portaudio }:
stdenv.mkDerivation rec {
name = "espeak-1.48.04";
stdenv.mkDerivation {
name = "espeak-1.46.02";
src = fetchurl {
url = mirror://sourceforge/espeak/espeak-1.46.02-source.zip;
sha256 = "1fjlv5fm0gzvr5wzy1dp4nspw04k0bqv3jymha2p2qfjbfifp2zg";
url = "mirror://sourceforge/espeak/${name}-source.zip";
sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz";
};
buildInputs = [ unzip portaudio ];
@@ -21,9 +22,10 @@ stdenv.mkDerivation {
makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data"
'';
meta = {
meta = with stdenv.lib; {
description = "Compact open source software speech synthesizer";
homepage = http://espeak.sourceforge.net/;
license = "GPLv3+";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

View File

@@ -1,31 +1,57 @@
{stdenv, fetchurl, unzip, portaudio, wxGTK}:
{ stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }:
stdenv.mkDerivation rec {
name = "espeakedit-1.48.03";
stdenv.mkDerivation {
name = "espeakedit-1.46.02";
src = fetchurl {
url = mirror://sourceforge/espeak/espeakedit-1.46.02.zip;
sha256 = "1cc5r89sn8zz7b8wj4grx9xb7aqyi0ybj0li9hpy7hd67r56kqkl";
url = "mirror://sourceforge/espeak/${name}.zip";
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
};
buildInputs = [ unzip portaudio wxGTK ];
buildInputs = [ pkgconfig unzip portaudio wxGTK ];
patchPhase = if portaudio.api_version == 19 then ''
# TODO:
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
# it should use $espeak/share/espeak-data. Have to contact upstream to get
# this fixed.
#
# Workaround:
# cp -r $(nix-build -A espeak)/share/espeak-data ~
# chmod +w ~/espeak-data
patches = [
./espeakedit-fix-makefile.patch
./espeakedit-configurable-sox-path.patch
./espeakedit-configurable-path-espeak-data.patch
];
postPatch = ''
# Disable -Wall flag because it's noisy
sed -i "s/-Wall//g" src/Makefile
# Fixup paths (file names from above espeak-configurable* patches)
for file in src/compiledata.cpp src/readclause.cpp src/speech.h; do
sed -e "s|@sox@|${sox}/bin/sox|" \
-e "s|@prefix@|$out|" \
-i "$file"
done
'' + stdenv.lib.optionalString (portaudio.api_version == 19) ''
cp src/portaudio19.h src/portaudio.h
'' else "";
'';
buildPhase = ''
cd src
gcc -o espeakedit *.cpp `wx-config --cxxflags --libs`
make -C src
'';
installPhase = ''
ensureDir $out/bin
cp espeakedit $out/bin
mkdir -p "$out/bin"
cp src/espeakedit "$out/bin"
'';
meta = {
meta = with stdenv.lib; {
description = "Phoneme editor for espeak";
homepage = http://espeak.sourceforge.net/;
license = "GPLv3+";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,15 @@
Don't hardcode /usr, use @prefix@.
Author: Bjørn Forsman
diff -uNr espeakedit-1.48.03.orig/src/speech.h espeakedit-1.48.03/src/speech.h
--- espeakedit-1.48.03.orig/src/speech.h 2014-03-04 17:48:12.000000000 +0100
+++ espeakedit-1.48.03/src/speech.h 2014-07-22 18:21:40.860790719 +0200
@@ -58,7 +58,7 @@
// will look for espeak_data directory here, and also in user's home directory
#ifndef PATH_ESPEAK_DATA
- #define PATH_ESPEAK_DATA "/usr/share/espeak-data"
+ #define PATH_ESPEAK_DATA "@prefix@/share/espeak-data"
#endif
typedef unsigned short USHORT;

View File

@@ -0,0 +1,27 @@
Make the path to 'sox' configurable by marking it '@sox@' (easy to match with sed).
Author: Bjørn Forsman
diff -uNr espeakedit-1.48.03.orig/src/compiledata.cpp espeakedit-1.48.03/src/compiledata.cpp
--- espeakedit-1.48.03.orig/src/compiledata.cpp 2014-03-04 17:48:11.000000000 +0100
+++ espeakedit-1.48.03/src/compiledata.cpp 2014-07-22 16:38:50.261388452 +0200
@@ -1884,7 +1884,7 @@
fname2 = msg;
}
- sprintf(command,"sox \"%s%s.wav\" -r %d -c1 -t wav %s\n",path_source,fname2,samplerate_native, fname_temp);
+ sprintf(command,"@sox@ \"%s%s.wav\" -r %d -c1 -t wav %s\n",path_source,fname2,samplerate_native, fname_temp);
if(system(command) != 0)
{
failed = 1;
diff -uNr espeakedit-1.48.03.orig/src/readclause.cpp espeakedit-1.48.03/src/readclause.cpp
--- espeakedit-1.48.03.orig/src/readclause.cpp 2014-03-04 17:48:11.000000000 +0100
+++ espeakedit-1.48.03/src/readclause.cpp 2014-07-22 16:38:37.190440504 +0200
@@ -892,7 +892,7 @@
if((fd_temp = mkstemp(fname_temp)) >= 0)
{
close(fd_temp);
- sprintf(command,"sox \"%s\" -r %d -c1 -t wav %s\n", fname, samplerate, fname_temp);
+ sprintf(command,"@sox@ \"%s\" -r %d -c1 -t wav %s\n", fname, samplerate, fname_temp);
if(system(command) == 0)
{
fname = fname_temp;

View File

@@ -0,0 +1,26 @@
Fix broken Makefile:
* fix syntax error (missing '\' to continue line):
Makefile:19: *** recipe commences before first target. Stop.
* Get portaudio library flags from pkg-config (to get -Lpath/to/portaudio/lib etc.)
Author: Bjørn Forsman
diff -uNr espeakedit-1.48.03.orig/src/Makefile espeakedit-1.48.03/src/Makefile
--- espeakedit-1.48.03.orig/src/Makefile 2013-03-13 15:52:02.000000000 +0100
+++ espeakedit-1.48.03/src/Makefile 2014-07-22 15:34:17.524114822 +0200
@@ -12,12 +12,11 @@
WX_LIBS = -pthread `wx-config --libs`
-LIBS=-lstdc++ -lportaudio
+LIBS=-lstdc++ `pkg-config --libs portaudio-2.0`
#LIBS=-lstdc++ /usr/lib/x86_64-linux-gnu/libportaudio.so.2
-CPPFLAGS = -Wall -g -fexceptions `wx-config --cflags`
- -I/usr/include/wx-2.8 \
- -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
+CPPFLAGS = -Wall -g -fexceptions `wx-config --cflags` \
+ -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES \
-D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
CXXFLAGS = -O2 -Wall -fexceptions `wx-config --cflags` \

View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libogg ];
doCheck = true; # takes lots of time but will be run rarely (small build-time closure)
#doCheck = true; # takes lots of time
meta = with stdenv.lib; {
homepage = http://xiph.org/flac/;

View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile,
libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
version = "3.21.82";
pname = "fldigi";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz";
sha256 = "1q2fc1zm9kfsjir4g6fh95vmjdq984iyxfcs6q4gjqy1znhqcyqs";
};
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
libsndfile libsamplerate pulseaudio pkgconfig alsaLib ];
meta = {
description = "Digital modem program";
homepage = http://www.w1hkj.com/Fldigi.html;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ relrod ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig
{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig
, pulseaudio }:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"-framework CoreAudio";
buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ];
meta = with stdenv.lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";

View File

@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://wejp.k.vu/projects/gmu;
description = "Open source music player for portable gaming consoles and handhelds";
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
};
}

View File

@@ -0,0 +1,45 @@
{ pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool,
ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "" }:
with pkgs.lib;
let
inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
in buildPythonPackage rec {
name = "gpodder-3.7.0";
src = fetchurl {
url = "http://gpodder.org/src/${name}.tar.gz";
sha256 = "fa90ef4bdd3fd9eef95404f7f43f70912ae3ab4f8d24078484a2f3e11b14dc47";
};
buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool ];
propagatedBuildInputs = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ]
++ stdenv.lib.optional ipodSupport libgpod;
postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile";
checkPhase = "make unittest";
preFixup = ''
wrapProgram $out/bin/gpodder \
${optionalString (gpodderHome != "") "--set GPODDER_HOME ${gpodderHome}"} \
${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"}
'';
installPhase = "DESTDIR=/ PREFIX=$out make install";
meta = {
description = "A podcatcher written in python";
longDescription = ''
gPodder downloads and manages free audio and video content (podcasts)
for you. Listen directly on your computer or on your mobile devices.
'';
homepage = "http://gpodder.org/";
license = "GPLv3";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.skeidel ];
};
}

View File

@@ -1,25 +1,43 @@
{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser
, libglade, flex, libid3tag, libvorbis, intltool }:
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag,
libvorbis, hicolor_icon_theme, gdk_pixbuf }:
stdenv.mkDerivation {
name = "gtkpod-1.0.0";
let
gnome = gnome3_12;
in stdenv.mkDerivation rec {
version = "2.1.4";
name = "gtkpod-${version}";
src = fetchurl {
url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz;
sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q";
url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa";
};
buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex
libid3tag libvorbis intltool ];
propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];
buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme
hicolor_icon_theme ];
patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh
'';
meta = {
preFixup = ''
wrapProgram "$out/bin/gtkpod" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "GTK Manager for an Apple ipod";
homepage = http://gtkpod.sourceforge.net;
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.skeidel ];
};
}

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk
, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2
, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2
, pkgconfig, python }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio
avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2
ladspaH librdf libsndfile lv2 pkgconfig python
];

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, boost, glib, jackaudio, ladspaPlugins
{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins
, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf
alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf
libsndfile pkgconfig qt4 scons subversion
];

View File

@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
meta = {
description = "A command line editor for id3v2 tags";
homepage = http://id3v2.sourceforge.net/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv
, lv2, pkgconfig, python, raul, serd, sord, sratom, suil
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python
boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
raul serd sord sratom suil
];

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }:
{ stdenv, fetchurl, jack2, libsndfile, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_capture-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
};
buildInputs = [ jackaudio libsndfile pkgconfig ];
buildInputs = [ jack2 libsndfile pkgconfig ];
buildPhase = "PREFIX=$out make jack_capture";

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }:
{ stdenv, fetchurl, SDL, jack2, mesa, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
buildInputs = [ SDL jackaudio mesa pkgconfig ];
buildInputs = [ SDL jack2 mesa pkgconfig ];
installPhase = ''
mkdir -p $out/bin

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }:
{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
stdenv.mkDerivation rec {
name = "jack-rack-1.4.7";
src = fetchurl {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ];
buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, pkgconfig }:
{ stdenv, fetchurl, jack2, pkgconfig }:
stdenv.mkDerivation rec {
name = "jackmeter-0.4";
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
buildInputs = [ jackaudio pkgconfig ];
buildInputs = [ jack2 pkgconfig ];
meta = {
description = "Console jack loudness meter";
homepage = http://www.aelius.com/njh/jackmeter/;
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python
{ stdenv, fetchurl, gtk, jack2, lilv, lv2, pkgconfig, python
, serd, sord , sratom, suil }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil
gtk jack2 lilv lv2 pkgconfig python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";

View File

@@ -1,28 +1,17 @@
{ stdenv, fetchurl, builderDefs }:
{ runCommand, fetchurl }:
let
let
src = fetchurl {
url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
};
in
let localDefs = builderDefs.passthru.function {
buildInputs = [];
inherit src;
};
in with localDefs;
let
copyFile = fullDepEntry ("
mkdir -p \$out/include
cp ${src} \$out/include/ladspa.h
") [minInit defEnsureDir];
in
stdenv.mkDerivation {
name = "ladspa.h";
builder = writeScript "ladspa.h-builder"
(textClosure localDefs [copyFile]);
meta = {
description = "LADSPA format audio plugins";
inherit src;
};
}
runCommand "ladspa.h"
{ meta.description = "LADSPA format audio plugins"; }
''
mkdir -p $out/include
cp ${src} $out/include/ladspa.h
''

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2
{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2
, makeWrapper, pkgconfig, readline }:
assert libuuid != null;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper
buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper
pkgconfig readline ];
postInstall = ''

View File

@@ -23,5 +23,6 @@ pythonPackages.buildPythonPackage rec {
homepage = "https://github.com/aszlig/LastWatch";
description = "An inotify-based last.fm audio scrobbler";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
meta = {
description = "Not a Guitar-Only tuner";
homepage = http://www.nongnu.org/lingot/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }:
, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "linuxsampler-svn-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib asio autoconf automake bison jackaudio libgig libsndfile
alsaLib asio autoconf automake bison jack2 libgig libsndfile
libtool lv2 pkgconfig
];

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg
, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg
, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype
}:
stdenv.mkDerivation rec {
@@ -12,10 +12,15 @@ stdenv.mkDerivation rec {
};
buildInputs = [
SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate
SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate
libsndfile pkgconfig pulseaudio qt4
];
# work around broken build system of 0.4.*
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Linux MultiMedia Studio";
homepage = "http://lmms.sourceforge.net";

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH
{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile
[ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
pkgconfig pulseaudio
];

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Tracker music player for the terminal";
homepage = http://mikmod.shlomifish.org/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ viric ];
platforms = with stdenv.lib.platforms; linux;
};

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl
{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jack2, perl
, zlib, zziplib
}:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
export CPATH=${zlib}/lib
'';
buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ];
buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ];
meta = {
description = "Music tracker application, similar to Fasttracker II.";

View File

@@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }:
stdenv.mkDerivation rec {
version = "0.19";
pname = "minimodem";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.whence.com/${pname}/${name}.tar.gz";
sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
};
buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ];
meta = {
description = "General-purpose software audio FSK modem";
longDescription = ''
Minimodem is a command-line program which decodes (or generates) audio
modem tones at any specified baud rate, using various framing protocols. It
acts a general-purpose software FSK modem, and includes support for various
standard FSK protocols such as Bell103, Bell202, RTTY, NOAA SAME, and
Caller-ID.
'';
homepage = http://www.whence.com/minimodem/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ relrod ];
};
}

View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
ensureDir "$out"
mkdir -p "$out"
scons \
-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
$sconsFlags "prefix=$out"

View File

@@ -1,17 +1,23 @@
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
, libtool
}:
stdenv.mkDerivation rec {
name = "moc-${version}";
version = "2.5.0-beta1";
version = "2.5.0-beta2";
src = fetchurl {
url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6";
sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c";
};
configurePhase = "./configure prefix=$out";
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];
buildInputs = [
ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
];
meta = {
description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";

View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl, pythonPackages, mopidy }:
pythonPackages.buildPythonPackage rec {
name = "mopidy-moped-${version}";
version = "0.3.1";
src = fetchurl {
url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz";
sha256 = "0sjp8vr4yfyjx233gamhg0p67zjnlpc9yq3szbw897igsh23j2yr";
};
propagatedBuildInputs = [ mopidy ];
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/martijnboland/moped;
description = "A web client for Mopidy";
license = licenses.mit;
maintainers = [ maintainers.rickynils ];
hydraPlatforms = [];
};
}

View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl, pythonPackages, mopidy }:
pythonPackages.buildPythonPackage rec {
name = "mopidy-spotify-${version}";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
sha256 = "1fgxakylsx0nggis11v6bxfy8h3dl1n1v86liyfcj0xazb1mx69m";
};
propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
doCheck = false;
meta = with stdenv.lib; {
homepage = http://www.mopidy.com/;
description = "Mopidy extension for playing music from Spotify.";
license = licenses.asl20;
maintainers = [ maintainers.rickynils ];
hydraPlatforms = [];
};
}

View File

@@ -5,39 +5,33 @@
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "0.15.0";
version = "0.19.0";
src = fetchurl {
url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
sha256 = "1fpnddcx6343wgxzh10s035w21g8jmfh2kzgx32w0xsshpra3gn1";
sha256 = "10cnc1bipr0brk7478201cgm71lp5bci3qiaadyxv9hhcn0nmn9b";
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_plugins_base gst_plugins_good
gst_python pygobject pykka tornado gst_plugins_base gst_plugins_good
];
# python zip complains about old timestamps
preConfigure = ''
find -print0 | xargs -0 touch
'';
# There are no tests
doCheck = false;
postInstall = ''
for p in $out/bin/mopidy $out/bin/mopidy-scan; do
wrapProgram $p \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
done
wrapProgram $out/bin/mopidy \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
'';
meta = {
meta = with stdenv.lib; {
homepage = http://www.mopidy.com/;
description = ''
A music server which can play music from Spotify and from your
local hard drive.
An extensible music server that plays music from local disk, Spotify,
SoundCloud, Google Play Music, and more.
'';
maintainers = [ stdenv.lib.maintainers.rickynils ];
license = licenses.asl20;
maintainers = [ maintainers.rickynils ];
hydraPlatforms = [];
};
}

View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
homepage = http://www.ibiblio.org/mp3info/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.unix;

View File

@@ -0,0 +1,20 @@
{ fetchurl, stdenv, libmp3splt, pkgconfig }:
stdenv.mkDerivation rec {
name = "mp3splt-2.6.1";
src = fetchurl {
url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz";
sha256 = "783a903fafbcf47f06673136a78b78d32a8e616a6ae06b79b459a32090dd14f7";
};
buildInputs = [ libmp3splt pkgconfig ];
meta = {
description = "utility to split mp3, ogg vorbis and FLAC files without decoding";
homepage = http://sourceforge.net/projects/mp3splt/;
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.bosu ];
platforms = stdenv.lib.platforms.unix;
};
}

View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A minimalist command line interface to MPD";
homepage = http://www.musicpd.org/clients/mpc/;
license = "GPL2";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.algorith ];
platforms = stdenv.lib.platforms.linux;
};

View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "mpc123, a Musepack (.mpc) audio player";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice

View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "mpg321, a command-line MP3 player";
homepage = http://mpg321.sourceforge.net/;
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu;
};

View File

@@ -1,15 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib }:
{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
stdenv.mkDerivation rec {
version = "0.21";
version = "0.23";
name = "ncmpc-${version}";
src = fetchurl {
url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.bz2";
sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07";
url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz";
sha256 = "d7b30cefaf5c74a5d8ab18ab8275e0102ae12e8ee6d6f8144f8e4cc9a97b5de4";
};
buildInputs = [ pkgconfig glib ncurses mpd_clientlib ];
buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]
++ libintlOrEmpty;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";

View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas
{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib cmake gtk jackaudio libgnomecanvas libpthreadstubs
[ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 pkgconfig
];

View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp praat $out/bin
'';
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
description = "Doing phonetics by computer";
homepage = http://www.fon.hum.uva.nl/praat/;
license = "GPLv2+"; # Has some 3rd-party code in it though
license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -2,7 +2,7 @@
, glew, ftgl, ttf_bitstream_vera
, withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL
, withJack ? false, jackaudio
, withJack ? false, jack2
, withPulseAudio ? true, pulseaudio
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
[ glew ftgl ]
++ optional withQt qt4
++ optionals withLibvisual [ libvisual SDL ]
++ optional withJack jackaudio
++ optional withJack jack2
++ optional withPulseAudio pulseaudio
;
}

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
, alsaLib, jackaudio, tk
, alsaLib, jack2, tk
}:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
buildInputs = [ alsaLib jackaudio ];
buildInputs = [ alsaLib jack2 ];
configureFlags = ''
--enable-alsa

View File

@@ -1,17 +1,17 @@
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }:
stdenv.mkDerivation rec {
version = "0.3.10";
version = "0.3.11";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw";
sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl";
};
buildInputs = [ qt4 alsaLib jackaudio dbus ];
buildInputs = [ qt4 alsaLib jack2 dbus ];
configureFlags = "--enable-jack-version";

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, fluidsynth, jackaudio, qt4 }:
{ stdenv, fetchurl, alsaLib, fluidsynth, jack2, qt4 }:
stdenv.mkDerivation rec {
name = "qsynth-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw";
};
buildInputs = [ alsaLib fluidsynth jackaudio qt4 ];
buildInputs = [ alsaLib fluidsynth jack2 qt4 ];
meta = with stdenv.lib; {
description = "Fluidsynth GUI";

View File

@@ -1,18 +1,18 @@
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2
, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
stdenv.mkDerivation rec {
version = "0.6.0";
version = "0.6.2";
name = "qtractor-${version}";
src = fetchurl {
url = "mirror://sourceforge/qtractor/${name}.tar.gz";
sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r";
sha256 = "08cr4lgm8bkkmsvfljszcqij3i52n989s7ncrbrn17n61rmgf8yw";
};
buildInputs =
[ alsaLib autoconf automake dssi gtk jackaudio ladspaH
[ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo libmad libsamplerate libsndfile libtool
libvorbis pkgconfig qt4 rubberband
];

View File

@@ -75,7 +75,7 @@ buildPythonPackage {
& internet radio, and all major audio formats.
'';
maintainer = [ stdenv.lib.maintainers.coroa ];
maintainers = [ stdenv.lib.maintainers.coroa ];
homepage = http://code.google.com/p/quodlibet/;
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jackaudio, libXft,
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft,
libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./fltk-path.patch ];
buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg
buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ];
meta = with stdenv.lib; {

View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "samplv1-${version}";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "1cx3qs9vrdwmym2qsghqq53bshnjqgpqypsilr1m2i1cpfnfrr6x";
sha256 = "02mm5y1yzklvs5bpxl86y3dqcg7migfybmin8llk91pws6rl9b41";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtkmm, jackaudio, pkgconfig }:
{ stdenv, fetchurl, alsaLib, gtkmm, jack2, pkgconfig }:
stdenv.mkDerivation rec {
name = "seq24-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258";
};
buildInputs = [ alsaLib gtkmm jackaudio pkgconfig ];
buildInputs = [ alsaLib gtkmm jack2 pkgconfig ];
meta = with stdenv.lib; {
description = "minimal loop based midi sequencer";

View File

@@ -0,0 +1,32 @@
{ stdenv, fetchurl, alsaLib, freetype, ftgl, jack2, libX11, lv2
, mesa, pkgconfig, ttf_bitstream_vera
}:
stdenv.mkDerivation rec {
name = "setbfree-${version}";
version = "0.7.5";
src = fetchurl {
url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
sha256 = "1chlmgwricc6l4kyg35vc9v8f1n8psr28iihn4a9q2prj1ihqcbc";
};
patchPhase = ''
sed 's#/usr/local#$(out)#g' -i common.mak
sed 's#/usr/share/fonts/truetype/ttf-bitstream-vera#${ttf_bitstream_vera}/share/fonts/truetype#g' \
-i b_synth/Makefile
'';
buildInputs = [
alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig
ttf_bitstream_vera
];
meta = with stdenv.lib; {
description = "A DSP tonewheel organ emulator";
homepage = http://setbfree.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

View File

@@ -1,6 +1,6 @@
# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, pulseaudio, qt5, redland
, rubberband, serd, sord, vampSDK
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sord
pkgconfig
# optional
jackaudio
jack2
# portaudio
pulseaudio
libmad

View File

@@ -1,24 +1,64 @@
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer, udev }:
, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer, udev, fontconfig
, dbus, expat }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
version = "0.9.4.183";
version = if stdenv.system == "i686-linux"
then "0.9.4.183.g644e24e.428"
else "0.9.11.27.g2b1a638.81";
qt4webkit =
if stdenv.system == "i686-linux" then
fetchurl {
name = "libqtwebkit4_2.2_i386.deb";
url = http://mirrors.us.kernel.org/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_i386.deb;
sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924";
name = "libqtwebkit4_2.3.2_i386.deb";
url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_i386.deb;
sha256 = "0q4abhczx91ma57fjss0gn8j6nkfbfsbsh6kxhykzj88dih2s8rn";
}
else
fetchurl {
name = "libqtwebkit4_2.2_amd64.deb";
url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_amd64.deb;
sha256 = "0bvy6qz9y19ck391z8c049v07y4vdyvgykpxi7x1nvn078p1imiw";
name = "libqtwebkit4_2.3.2_amd64.deb";
url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_amd64.deb;
sha256 = "0sac88avfivwkfhmd6fik7ili8fdznqas6741dbspf9mfnawbwch";
};
deps = [
alsaLib
atk
cairo
cups
dbus
expat
fontconfig
freetype
GConf
gdk_pixbuf
glib
gst_plugins_base
gstreamer
gtk
libgcrypt
libpng
nss
pango
qt4
sqlite
stdenv.gcc.gcc
xlibs.libX11
xlibs.libXcomposite
xlibs.libXdamage
xlibs.libXext
xlibs.libXfixes
xlibs.libXi
xlibs.libXrandr
xlibs.libXrender
xlibs.libXrender
xlibs.libXScrnSaver
#xlibs.libXss
];
in
stdenv.mkDerivation {
@@ -27,13 +67,13 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g644e24e.428-1_i386.deb";
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_i386.deb";
sha256 = "1wl6v5x8vm74h5lxp8fhvmih8l122aadsf1qxvpk0k3y6mbx0ifa";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g644e24e.428-1_amd64.deb";
sha256 = "1yniln6iswrrrny01qr2w5zcvam0vnrvy9mwbnk9i14i2ch0f3fx";
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg";
}
else throw "Spotify not supported on this platform.";
@@ -51,34 +91,51 @@ stdenv.mkDerivation {
# Work around Spotify referring to a specific minor version of
# OpenSSL.
mkdir $out/lib
ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
${if stdenv.system == "x86_64-linux" then ''
ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.1.0.0
ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0
ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so
'' else ''
ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
''}
# Work around Spotify trying to open libudev.so.0 (which we don't have)
ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
mkdir -p $out/bin
rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.gcc.gcc}/lib64"
ln -s $out/spotify-client/spotify $out/bin/spotify
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \
$out/spotify-client/spotify
--set-rpath $rpath $out/spotify-client/spotify
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $rpath $out/spotify-client/Data/SpotifyHelper
dpkg-deb -x ${qt4webkit} ./
mkdir -p $out/lib/
cp -v usr/lib/*/* $out/lib/
preload=$out/libexec/spotify/libpreload.so
librarypath="${stdenv.lib.makeLibraryPath deps}:$out/lib"
mkdir -p $out/libexec/spotify
gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib"
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
wrapProgram $out/spotify-client/Data/SpotifyHelper --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
# Desktop file
mkdir -p "$out/share/applications/"
@@ -92,7 +149,7 @@ stdenv.mkDerivation {
meta = {
homepage = https://www.spotify.com/;
description = "Spotify for Linux allows you to play music from the Spotify music service";
license = "unfree";
license = stdenv.lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, qt4, jackaudio, lv2 }:
{ stdenv, fetchurl, qt4, jack2, lv2 }:
stdenv.mkDerivation rec {
name = "synthv1-${version}";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
sha256 = "1j1x8n3rlwrh373wqmm6mj3cgyk3apvnpqygx1700fl4cf249agl";
sha256 = "011kjccrdwb62rpck5gb8h4kvvm8rk6n77lj78ykxz4pxip5hf14";
};
buildInputs = [ qt4 jackaudio lv2 ];
buildInputs = [ qt4 jack2 lv2 ];
meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";

View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2
, lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }:
stdenv.mkDerivation rec {
name = "transcode-1.1.7";
src = fetchurl {
url = "https://bitbucket.org/france/transcode-tcforge/downloads/${name}.tar.bz2";
sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
};
buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo
libdvdread pkgconfig x264 libmpeg2 xvidcore ];
configureFlags = "--disable-ffmpeg --disable-libavcodec --disable-libavformat
--enable-lzo --enable-ogg --enable-vorbis --enable-theora --enable-libxml2
--enable-x264 --enable-libmpeg2 --enable-xvid";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Suite of command line utilities for transcoding video and audio codecs, and for converting beween different container formats";
homepage = http://www.transcoding.org/;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,34 @@
{ stdenv, fetchurl, autoconf, automake, mpd_clientlib, ncurses, pcre, pkgconfig, taglib }:
stdenv.mkDerivation rec {
version = "0.09.0";
name = "vimpc-${version}";
src = fetchurl {
url = "https://github.com/boysetsfrog/vimpc/archive/v${version}.tar.gz";
sha256 = "13eb229a5e9eee491765ee89f7fe6a38140a41a01434b117da3869d725c15706";
};
buildInputs = [ autoconf
automake
mpd_clientlib
ncurses
pcre
pkgconfig
taglib
];
preConfigure = "./autogen.sh";
postInstall = ''
mkdir -p $out/etc
cp doc/vimpcrc.example $out/etc
'';
meta = {
description = "A vi/vim inspired client for the Music Player Daemon (mpd).";
homepage = https://github.com/boysetsfrog/vimpc;
license = "GPL3";
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig
, qt4, jackaudio
, qt4, jack2
}:
let
@@ -22,5 +22,5 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt4 jackaudio ];
buildInputs = [ qt4 jack2 ];
}

View File

@@ -16,6 +16,6 @@ stdenv.mkDerivation {
files, notably the `ogg123' player and the `oggenc' encoder.
'';
homepage = http://xiph.org/vorbis/;
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
};
}

View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libxmp }:
stdenv.mkDerivation rec {
name = "xmp-4.0.7";
meta = with stdenv.lib; {
description = "Extended module player";
homepage = "http://xmp.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ iyzsong ];
};
src = fetchurl {
url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
sha256 = "0qgzzaxhshz5l7s21x89xb43pbbi0zap6a4lk4s7gjp1qca2agcw";
};
buildInputs = [ pkgconfig alsaLib libxmp ];
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jackaudio,
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jack2,
ladspaH, ladspaPlugins, liblo, pkgconfig }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
};
buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo pkgconfig ];
installPhase = ''

View File

@@ -1,20 +1,20 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib
, jack2, libsndfile, mesa, minixml, pkgconfig, zlib
}:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
version = "1.2.0";
version = "1.2.2";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
sha256 = "0p4v39kxxzzfvaazzxarx54i164ghpfxq0ljkavlgr8fnix5v3mx";
sha256 = "1w23ral1qrbg9gqx833giqmchx7952f18yaa52aya9shsdlla83c";
};
buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa
alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib
];

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml
{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml
, pkgconfig, zlib
}:
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq";
};
buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ];
buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ];
nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; {
description = "high quality software synthesizer";
description = "High quality software synthesizer";
homepage = http://zynaddsubfx.sourceforge.net;
license = licenses.gpl2;
platforms = platforms.linux;

View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "slim-1.3.6";
src = fetchurl {
url = "http://download.berlios.de/slim/${name}.tar.gz";
url = "mirror://sourceforge/slim.berlios/${name}.tar.gz";
sha256 = "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1";
};
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DUSE_PAM=1" ];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype";
enableParallelBuilding = true;
buildInputs =
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = "-lXmu";
meta = {
homepage = http://slim.berlios.de;
homepage = http://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -0,0 +1,68 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs
}:
let
atomEnv = buildEnv {
name = "env-atom";
paths = [
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes
];
};
in stdenv.mkDerivation rec {
name = "atom-${version}";
version = "0.99.0";
src = fetchurl {
url = https://github.com/hotice/webupd8/raw/master/atom-linux64-0.99.0~git20140525.tar.xz;
sha256 = "55c2415c96e1182ae1517751cbea1db64e9962683b384cfe5e182aec10aebecd";
name = "${name}.tar.xz";
};
iconsrc = fetchurl {
url = https://raw.githubusercontent.com/atom/atom/master/resources/atom.png;
sha256 = "66dc0b432eed7bcd738b7c1b194e539178a83d427c78f103041981f2b840e030";
};
desktopItem = makeDesktopItem {
name = "atom";
exec = "atom";
icon = iconsrc;
comment = "A hackable text editor for the 21st Century";
desktopName = "Atom";
genericName = "Text editor";
categories = "Development;TextEditor";
};
buildInputs = [ atomEnv makeWrapper ];
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/share/atom
mkdir -p $out/bin
tar -C $out/share/atom -xvf $src
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/share/atom/atom
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node
makeWrapper $out/share/atom/atom $out/bin/atom \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
# Create a desktop item.
mkdir -p "$out/share/applications"
cp "${desktopItem}"/share/applications/* "$out/share/applications/"
'';
meta = with stdenv.lib; {
description = "A hackable text editor for the 21st Century";
homepage = https://atom.io/;
license = [ licenses.mit ];
maintainers = [ maintainers.offline ];
platforms = [ "x86_64-linux" ];
};
}

View File

@@ -13,6 +13,6 @@ stdenv.mkDerivation {
meta = {
description = "Hex editor with vim style keybindings";
homepage = http://bvi.sourceforge.net/download.html;
license = "GPL2";
license = stdenv.lib.licenses.gpl2;
};
}

View File

@@ -0,0 +1,39 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk
, contribPlugins ? false, hunspell, gamin, boost
}:
with { inherit (stdenv.lib) optionalString optional optionals; };
stdenv.mkDerivation rec {
name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
version = "13.12";
pname = "codeblocks";
src = fetchurl {
url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz";
sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
};
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true;
patches = [ ./writable-projects.patch ];
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig";
configureFlags = [ "--enable-pch=no" ]
++ optional contribPlugins "--with-contrib-plugins";
meta = with stdenv.lib; {
maintainers = [ maintainers.linquize ];
platforms = platforms.all;
description = "The open source, cross platform, free C, C++ and Fortran IDE";
longDescription =
''
Code::Blocks is a free C, C++ and Fortran IDE built to meet the most demanding needs of its users.
It is designed to be very extensible and fully configurable.
Finally, an IDE with all the features you need, having a consistent look, feel and operation across platforms.
'';
homepage = http://www.codeblocks.org;
license = licenses.gpl3;
};
}

View File

@@ -0,0 +1,18 @@
diff --git a/src/plugins/scriptedwizard/wiz.cpp b/src/plugins/scriptedwizard/wiz.cpp
index 0eb4b27..7d469fe 100644
--- a/src/plugins/scriptedwizard/wiz.cpp
+++ b/src/plugins/scriptedwizard/wiz.cpp
@@ -785,6 +785,13 @@ void Wiz::CopyFiles(cbProject* theproject, const wxString& prjdir, const wxStri
}
}
if (do_copy) wxCopyFile(srcfile, dstfile, true);
+ // Noticed! Files in Nix Store are readonly, so make the copied file writable
+ if (do_copy)
+ {
+ struct stat statbuf;
+ if (!::stat(dstfile.mb_str(), &statbuf))
+ ::chmod(dstfile.mb_str(), statbuf.st_mode | 0200);
+ }
// and add it to the project
fname.MakeRelativeTo(prjdir);

View File

@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
installPhase = ''
ensureDir $out/bin
ensureDir $out/share/man/man1
ensureDir $out/share/man/man5
mkdir -p $out/bin
mkdir -p $out/share/man/man1
mkdir -p $out/share/man/man5
cp dhex $out/bin
cp dhex.1 $out/share/man/man1

View File

@@ -176,6 +176,22 @@ in {
};
};
eclipse_cpp_43 = buildEclipse {
name = "eclipse-cpp-4.3.2";
description = "Eclipse IDE for C/C++ Developers";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk-x86_64.tar.gz;
sha256 = "16zhjm6bx78263b1clg75kfiliahkhwg0k116vp9fj039nlpc30l";
}
else
fetchurl {
url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk.tar.gz;
sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
};
};
eclipse_sdk_421 = buildEclipse {
name = "eclipse-sdk-4.2.1";
description = "Eclipse Classic";
@@ -222,4 +238,19 @@ in {
};
};
eclipse_sdk_44 = buildEclipse {
name = "eclipse-sdk-4.4";
description = "Eclipse Classic";
sources = {
"x86_64-linux" = fetchurl {
url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz;
sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2";
};
"i686-linux" = fetchurl {
url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz;
sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z";
};
};
};
}

View File

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
full-screen editors such as GNU Emacs or GNU Moe.
'';
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
homepage = http://www.gnu.org/software/ed/;

View File

@@ -1,34 +0,0 @@
source $stdenv/setup
# This hook is supposed to be run on Linux. It patches the proper locations of
# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with
# *our* versions, not the ones found in the system, as it would do by default.
# On other platforms, this appears to be unnecessary.
preConfigure() {
case "${system}" in
x86_64-linux) glibclibdir=lib64 ;;
i686-linux) glibclibdir=lib ;;
*) return;
esac
libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
echo "libc: $libc"
for i in src/s/*.h src/m/*.h; do
substituteInPlace $i \
--replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
--replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
--replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
--replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
--replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
--replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
done
for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
substituteInPlace $i --replace /bin/pwd pwd
done
}
preBuild="make bootstrap"
genericBuild

View File

@@ -1,72 +0,0 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf
}:
assert (gtk != null) -> (pkgconfig != null);
assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
stdenv.mkDerivation rec {
name = "emacs-23.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.bz2";
sha256 = "1fc8x5p38qihg7l6z2b1hjc534lnjb8gqpwgywlwg5s3csg6ymr6";
};
buildInputs =
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
libtiff librsvg libXft gconf
]
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
++ stdenv.lib.optional stdenv.isLinux dbus;
configureFlags =
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]
# On NixOS, help Emacs find `crt*.o'.
++ stdenv.lib.optional (stdenv ? glibc)
[ "--with-crt-dir=${stdenv.glibc}/lib" ];
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
(when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES"))))
load-path)))
EOF
'';
doCheck = true;
meta = {
description = "GNU Emacs 23.x, the extensible, customizable text editor";
longDescription = ''
GNU Emacs is an extensible, customizable text editorand more. At its
core is an interpreter for Emacs Lisp, a dialect of the Lisp
programming language with extensions to support text editing.
The features of GNU Emacs include: content-sensitive editing modes,
including syntax coloring, for a wide variety of file types including
plain text, source code, and HTML; complete built-in documentation,
including a tutorial for new users; full Unicode support for nearly all
human languages and their scripts; highly customizable, using Emacs
Lisp code or a graphical interface; a large number of extensions that
add other functionality, including a project planner, mail and news
reader, debugger interface, calendar, and more. Many of these
extensions are distributed with GNU Emacs; others are available
separately.
'';
homepage = http://www.gnu.org/software/emacs/;
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
platforms = stdenv.lib.platforms.all;
};
}

View File

@@ -0,0 +1,50 @@
http://bazaar.launchpad.net/~naesten/emacs/nextstep-stuff/revision/108961
diff -ru emacs-24.3-orig/src/unexmacosx.c emacs-24.3/src/unexmacosx.c
--- emacs-24.3-orig/src/unexmacosx.c 2013-01-01 21:37:17.000000000 +0100
+++ emacs-24.3/src/unexmacosx.c 2014-08-09 18:39:52.000000000 +0200
@@ -838,7 +838,7 @@
if (!(sectp->addr <= (unsigned long)my_edata
&& my_size <= sectp->size))
unexec_error ("my_edata is not in section %s", SECT_DATA);
- if (!unexec_write (sectp->offset, (void *) sectp->addr, my_size))
+ if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size))
unexec_error ("cannot write section %s", SECT_DATA);
if (!unexec_copy (sectp->offset + my_size, old_file_offset + my_size,
sectp->size - my_size))
@@ -880,6 +880,27 @@
if (!unexec_write (header_offset, sectp, sizeof (struct section)))
unexec_error ("cannot write section %.16s's header", sectp->sectname);
}
+ else if (strncmp (sectp->sectname, "__bss", 5) == 0
+ || strncmp (sectp->sectname, "__pu_bss", 8) == 0)
+ {
+ sectp->flags = S_REGULAR;
+
+ /* These sections are produced by GCC 4.6+.
+
+ FIXME: We possibly ought to clear uninitialized local
+ variables in statically linked libraries like for
+ SECT_BSS (__bss) above, but setting up the markers we
+ need in lastfile.c would be rather messy. See
+ darwin_output_aligned_bss () in gcc/config/darwin.c for
+ the root of the problem, keeping in mind that the
+ sections are numbered by their alignment in GCC 4.6, but
+ by log2(alignment) in GCC 4.7. */
+
+ if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size))
+ unexec_error ("cannot copy section %.16s", sectp->sectname);
+ if (!unexec_write (header_offset, sectp, sizeof (struct section)))
+ unexec_error ("cannot write section %.16s's header", sectp->sectname);
+ }
else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
|| strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
|| strncmp (sectp->sectname, "__got", 16) == 0
@@ -891,6 +912,7 @@
|| strncmp (sectp->sectname, "__program_vars", 16) == 0
|| strncmp (sectp->sectname, "__mod_init_func", 16) == 0
|| strncmp (sectp->sectname, "__mod_term_func", 16) == 0
+ || strncmp (sectp->sectname, "__static_data", 16) == 0
|| strncmp (sectp->sectname, "__objc_", 7) == 0)
{
if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl
, alsaLib, cairo
, withX ? !stdenv.isDarwin, withGTK ? true
}:
@@ -18,13 +18,15 @@ stdenv.mkDerivation rec {
sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
};
patches = [ ./darwin-new-sections.patch ];
buildInputs =
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
[ ncurses gconf libxml2 openssl alsaLib pkgconfig texinfo ]
++ stdenv.lib.optional stdenv.isLinux dbus
++ stdenv.lib.optionals withX
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gtk ]
++ stdenv.lib.optional stdenv.isDarwin cairo;
imagemagick gtk gconf ]
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
configureFlags =
( if withX && withGTK then

View File

@@ -0,0 +1,100 @@
{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
}:
stdenv.mkDerivation rec {
emacsName = "emacs-24.3";
name = "${emacsName}-mac-4.8";
#builder = ./builder.sh;
src = fetchurl {
url = "mirror://gnu/emacs/${emacsName}.tar.xz";
sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
};
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx";
};
patches = [ ./darwin-new-sections.patch ];
buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
postUnpack = ''
mv $emacsName $name
tar xzf $macportSrc
mv $name $emacsName
'';
preConfigure = ''
patch -p0 < patch-mac
# The search for 'tputs' will fail because it's in ncursesw within the
# ncurses package, yet Emacs' configure script only looks in ncurses.
# Further, we need to make sure that the -L option occurs before mention
# of the library, so that it finds it within the Nix store.
sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
configureFlagsArray=(
LDFLAGS=-L${ncurses}/lib
--with-xml2=yes
--with-gnutls=yes
--with-mac
--enable-mac-app=$out/Applications
)
makeFlagsArray=(
CFLAGS=-O3
LDFLAGS="-O3 -L${ncurses}/lib"
);
'';
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
(when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES"))))
load-path)))
;; make tramp work for NixOS machines
(eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
EOF
'';
doCheck = true;
meta = with stdenv.lib; {
description = "GNU Emacs 24, the extensible, customizable text editor";
homepage = http://www.gnu.org/software/emacs/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jwiegley ];
platforms = platforms.darwin;
longDescription = ''
GNU Emacs is an extensible, customizable text editorand more. At its
core is an interpreter for Emacs Lisp, a dialect of the Lisp
programming language with extensions to support text editing.
The features of GNU Emacs include: content-sensitive editing modes,
including syntax coloring, for a wide variety of file types including
plain text, source code, and HTML; complete built-in documentation,
including a tutorial for new users; full Unicode support for nearly all
human languages and their scripts; highly customizable, using Emacs
Lisp code or a graphical interface; a large number of extensions that
add other functionality, including a project planner, mail and news
reader, debugger interface, calendar, and more. Many of these
extensions are distributed with GNU Emacs; others are available
separately.
This is "Mac port" addition to GNU Emacs 24. This provides a native
GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later
already contain the official GUI support via the NS (Cocoa) port for
Mac OS X 10.4 and later. So if it is good enough for you, then you
don't need to try this.
'';
};
}

View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Auto-complete extension for Emacs";
homepage = http://cx4a.org/software/auto-complete/;
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
};

View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl, emacs }:
stdenv.mkDerivation rec {
name = "bbdb-3.1.2";
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz";
sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05";
};
buildInputs = [ emacs ];
# Hack to disable documentation as there is no way to tell bbdb to
# NOT build pdfs. I really don't want to pull in TexLive here...
preConfigure = ''
substituteInPlace ./Makefile.in \
--replace "SUBDIRS = lisp doc tex" "SUBDIRS = lisp"
'';
meta = {
homepage = "http://savannah.nongnu.org/projects/bbdb/";
description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
license = "GPL";
};
}

View File

@@ -16,17 +16,17 @@ stdenv.mkDerivation rec {
installPhase =
''
ensureDir "$out/share/doc/${name}"
mkdir -p "$out/share/doc/${name}"
cp -v readme.md "$out/share/doc/${name}"
ensureDir "$out/share/emacs/site-lisp/"
mkdir -p "$out/share/emacs/site-lisp/"
cp *.el "$out/share/emacs/site-lisp/"
'';
meta = {
description = "A calendar framework for Emacs";
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
platforms = stdenv.lib.platforms.gnu;

View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
Development Environment), and COGRE (COnnected GRaph Editor).
'';
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://cedet.sourceforge.net/;
};

View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Emacs major mode for CoffeeScript, unfancy JavaScript";
homepage = https://github.com/defunkt/coffee-mode;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
};

View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Emacs-lisp mode for skinning your Emacs";
homepage = http://www.nongnu.org/color-theme;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
};

View File

@@ -1,13 +1,12 @@
{ stdenv, fetchgit, emacs }:
{ stdenv, fetchurl, emacs }:
stdenv.mkDerivation rec {
name = "cryptol-mode-${version}";
version = "20141010";
version = "0.1.0";
src = fetchgit {
url = "https://github.com/thoughtpolice/cryptol-mode.git";
rev = "50075d49d7c4ec4b03ce31b634424410262c1ad4";
sha256 = "6ecd4904b7f3b1cd0721591ce45f16fe11cd1dd5fd7af8110d1f84b133ed4aec";
src = fetchurl {
url = "https://github.com/thoughtpolice/cryptol-mode/archive/v${version}.tar.gz";
sha256 = "1qyrqvfgpg1nyk1clv7v94r3amm02613hrak5732xzn6iak81cc0";
};
buildInputs = [ emacs ];

View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation {
meta = {
description = "A pcl-cvs like interface for managing darcs patches.";
homepage = "http://hub.darcs.net/simon/darcsum";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.falsifian ];
};
}

View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
navigation and overview.
'';
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://ecb.sourceforge.net/;

View File

@@ -20,7 +20,6 @@ clangStdenv.mkDerivation {
meta = {
homepage = "https://github.com/Golevka/emacs-clang-complete-async";
description = "An emacs plugin to complete C and C++ code using libclang";
license = "GPLv3+";
license = clangStdenv.lib.licenses.gpl3Plus;
};
}

Some files were not shown because too many files have changed in this diff Show More