JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into x-updates

Browse Source
This commit is contained in:
Vladimír Čunát 2014-01-26 09:01:25 +01:00
commit 7e4709247d
113 changed files with 954 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md Normal file
View File

@ -0,0 +1,10 @@
Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package
manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code.
* [NixOS installation instructions](http://nixos.org/nixos/manual/#idm139984689550080)
* [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/)
* [Manual (NixOS)](http://nixos.org/nixos/manual/)
* [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Tests](http://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)

2
nixos/modules/installer/tools/nixos-rebuild.sh
View File

@ -40,7 +40,7 @@ while [ "$#" -gt 0 ]; do
repair=1
extraBuildFlags+=("$i")
;;
--show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair)
--show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q)
extraBuildFlags+=("$i")
;;
--max-jobs|-j|--cores|-I)

1
nixos/modules/module-list.nix
View File

@ -116,6 +116,7 @@
./services/mail/spamassassin.nix
./services/misc/autofs.nix
./services/misc/cgminer.nix
./services/misc/dictd.nix
./services/misc/disnix.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix

61
nixos/modules/services/misc/dictd.nix Normal file
View File

@ -0,0 +1,61 @@
{ config, pkgs, ... }:
with pkgs.lib;
{
###### interface
options = {
services.dictd = {
enable = mkOption {
default = false;
description = ''
Whether to enable the DICT.org dictionary server.
'';
};
DBs = mkOption {
default = [];
# example = [ pkgs.dictDBs.nld2eng ];
description = ''List of databases to make available.'';
};
};
};
###### implementation
config = let dictdb = pkgs.dictDBCollector { dictlist = map (x: {
name = x.name;
filename = x; } ) config.services.dictd.DBs; };
in mkIf config.services.dictd.enable {
# get the command line client on system path to make some use of the service
environment.systemPackages = [ pkgs.dict ];
users.extraUsers = singleton
{ name = "dictd";
group = "dictd";
description = "DICT.org dictd server";
home = "${dictdb}/share/dictd";
};
users.extraGroups = singleton
{ name = "dictd";
};
jobs.dictd =
{ description = "DICT.org Dictionary Server";
startOn = "startup";
environment = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; };
daemonType = "fork";
exec = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
};
};
}

2
nixos/modules/services/networking/networkmanager.nix
View File

@ -130,6 +130,8 @@ in {
message = "You can not use networking.networkmanager with services.networking.wireless";
}];
boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
environment.etc = [
{ source = ipUpScript;
target = "NetworkManager/dispatcher.d/01nixos-ip-up";

8
pkgs/applications/audio/mpc/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, mpd_clientlib }:
stdenv.mkDerivation rec {
version = "0.23";
version = "0.25";
name = "mpc-${version}";
src = fetchurl {
url = "http://www.musicpd.org/download/mpc/0/${name}.tar.bz2";
sha256 = "1ir96wfgq5qfdd2s06zfycv38g3bhn3bpndwx9hwf1w507rvifi9";
url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz";
sha256 = "095gmik5vrnab5a1g92qiznn48w7499fr0gldp3s6xd26kvs9kvh";
};
buildInputs = [ mpd_clientlib ];
@ -24,4 +24,4 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.algorith ];
platforms = stdenv.lib.platforms.linux;
};
}
}

15
pkgs/applications/audio/pianobooster/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, cmake, qt4 }:
{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }:
stdenv.mkDerivation rec {
name = "pianobooster-${version}";
@ -9,14 +9,25 @@ stdenv.mkDerivation rec {
sha256 = "1xwyap0288xcl0ihjv52vv4ijsjl0yq67scc509aia4plmlm6l35";
};
patches = [
./pianobooster-0.6.4b-cmake.patch
./pianobooster-0.6.4b-cmake-gcc4.7.patch
];
preConfigure = "cd src";
buildInputs = [ alsaLib cmake qt4 ];
buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ];
postInstall = ''
wrapProgram $out/bin/pianobooster \
--prefix LD_LIBRARY_PATH : ${mesa}/lib
'';
meta = with stdenv.lib; {
description = "A MIDI file player that teaches you how to play the piano";
homepage = http://pianobooster.sourceforge.net;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

11
pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch Normal file
View File

@ -0,0 +1,11 @@
--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig 2013-04-06 10:48:02.469532914 -0700
+++ pianobooster-src-0.6.4b/src/CMakeLists.txt 2013-04-06 10:48:12.989532445 -0700
@@ -203,8 +203,6 @@
${PIANOBOOSTER_UI_HDRS} )
ENDIF(WIN32)
-SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")
-
IF (USE_PCH)
ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h )
ENDIF (USE_PCH)

44
pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch Normal file
View File

@ -0,0 +1,44 @@
--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig
+++ pianobooster-src-0.6.4b/src/CMakeLists.txt
@@ -2,12 +2,6 @@
# for the debug build type cmake -DCMAKE_BUILD_TYPE=Debug
SET(CMAKE_BUILD_TYPE Release)
SET(CMAKE_VERBOSE_MAKEFILE OFF)
-SET(USE_FLUIDSYNTH OFF)
-
-# The inplace directory is mainly for windows builds
-# SET(FLUIDSYNTH_INPLACE_DIR C:/download/misc/ljb/fluidsynth-1.0.9)
-SET(FLUIDSYNTH_INPLACE_DIR /home/louis/build/fluidsynth-1.0.9)
-
# Testing precompiled headers it does not work -- leave as OFF.
SET(USE_PCH OFF)
@@ -78,18 +72,7 @@
ADD_DEFINITIONS(-DPB_USE_FLUIDSYNTH)
MESSAGE("Building using fluidsynth")
SET( PB_BASE_SRCS MidiDeviceFluidSynth.cpp )
-
- IF(FLUIDSYNTH_INPLACE_DIR)
- INCLUDE_DIRECTORIES(${FLUIDSYNTH_INPLACE_DIR}/include/)
- IF(WIN32)
- LINK_LIBRARIES( ${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.dll.a)
- ENDIF(WIN32)
- IF(UNIX)
- LINK_LIBRARIES(${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.so)
- ENDIF(UNIX)
- ELSEIF(FLUIDSYNTH_INPLACE_DIR)
- LINK_LIBRARIES( fluidsynth)
- ENDIF(FLUIDSYNTH_INPLACE_DIR)
+ LINK_LIBRARIES(fluidsynth)
ENDIF(USE_FLUIDSYNTH)
@@ -214,8 +197,6 @@
INSTALL(TARGETS pianobooster RUNTIME DESTINATION bin)
#INSTALL( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmidimon )
-INSTALL( FILES ../README.txt DESTINATION share/doc/pianobooster )
-
INSTALL ( FILES images/pianobooster.png DESTINATION share/pixmaps )

8
pkgs/applications/editors/emacs-24/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo
, withX ? !stdenv.isDarwin
, withX ? !stdenv.isDarwin, withGTK ? true
}:
assert (libXft != null) -> libpng != null; # probably a bug
@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin cairo;
configureFlags =
( if withX then
( if withX && withGTK then
[ "--with-x-toolkit=gtk" "--with-xft"]
else (if withX then
[ "--with-x-toolkit=lucid" "--with-xft" ]
else
[ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ] )
"--with-gif=no" "--with-tiff=no" ] ) )
# On NixOS, help Emacs find `crt*.o'.
++ stdenv.lib.optional (stdenv ? glibc)
[ "--with-crt-dir=${stdenv.glibc}/lib" ];

11
pkgs/applications/graphics/photivo/default.nix
View File

@ -2,15 +2,20 @@
lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
stdenv.mkDerivation rec {
name = "photivo-2013-05-20";
name = "photivo-2014-01-25";
src = fetchhg {
url = "http://code.google.com/p/photivo/";
tag = "6256ff175312";
sha256 = "0pyvkijr7wwik21hdp1zwbbyqnhc07kf0m48ih1rws78fq3h86cc";
tag = "d687864489da";
sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
patchPhase = '' # kinda icky
sed -e '/("@INSTALL@")/d' \
-e s,@INSTALL@,$out/share/photivo, \
-i Sources/ptSettings.cpp
'';
}

4
pkgs/applications/misc/lyx/default.nix
View File

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "2.0.6";
version = "2.0.7";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
sha256 = "1llah9d9ymvdk8asmqslcwnicycxrwb27k8si184n5bfxvnjpjx5";
sha256 = "0qp8xqmlafib4hispjgl1friln0w3s05mi20sjfzaxnl6jkvv5q5";
};
configureFlags = [

2
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -105,7 +105,7 @@ stdenv.mkDerivation {
'';
homepage = http://www.gnu.org/software/gnuzilla/;
licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu;

2
pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A browser plugin to manage Swedish BankID:s";
homepage = http://fribid.se;
licenses = [ "GPLv2" "MPLv1" ];
license = [ "GPLv2" "MPLv1" ];
maintainers = [ stdenv.lib.maintainers.edwtjo ];
platforms = with stdenv.lib.platforms; linux;
};

2
pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
meta = {
description = "A browser plugin that uses mplayer to play digital media from websites";
homepage = http://mplayerplug-in.sourceforge.net/;
licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
};
}

4
pkgs/applications/networking/mailreaders/mailpile/default.nix
View File

@ -5,8 +5,8 @@ buildPythonPackage rec {
src = fetchgit {
url = "https://github.com/pagekite/Mailpile.git";
rev = "cbb3bbf1f1da653124e63e11a51a6864dcb534a0";
sha256 = "1m2qkhcygidxqnnj2ajsxv8y5wjyp5il3919sl3vyl47gx02xa8j";
rev = "695a25061a5220d4f0fd6ec3de4ccd9ae4c05a92";
sha256 = "0il9idfpnzb1a5cg3p9zrd6fnw2dhrqr6c3gzq1m06snw8jx9fpc";
};
propagatedBuildInputs = with pythonPackages; [

12
pkgs/applications/office/libreoffice/default.nix
View File

@ -54,7 +54,7 @@ let
buildInputs = [ libtool pkgconfig libxml2 ];
};
# doesn't work with srcs versioning
libmspub = stdenv.mkDerivation rec {
version = "0.0.6";
@ -66,8 +66,8 @@ let
};
configureFlags = "--disable-werror";
buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];
buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];
};
# doesn't exist in srcs
@ -82,7 +82,7 @@ let
configureFlags = "--with-boost=${boost}";
buildInputs = [ boost mdds pkgconfig ];
buildInputs = [ boost mdds pkgconfig ];
};
fetchThirdParty = {name, md5}: fetchurl {
@ -224,8 +224,8 @@ stdenv.mkDerivation rec {
"--disable-kde"
"--disable-postgresql-sdbc"
"--with-package-format=native"
"--with-jdk-home=${jdk}"
"--with-ant-home=${ant}"
"--with-jdk-home=${jdk}/lib/openjdk"
"--with-ant-home=${ant}/lib/ant"
"--without-afms"
"--without-fonts"
"--without-myspell-dicts"

23
pkgs/applications/science/logic/stp/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, cmake, boost, bison, flex, fetchgit, perl, zlib}:
stdenv.mkDerivation rec {
version = "2014.01.07";
name = "stp-${version}";
src = fetchgit {
url = "git://github.com/stp/stp";
rev = "3aa11620a823d617fc033d26aedae91853d18635";
sha256 = "832520787f57f63cf47364d080f30ad10d6d6e00f166790c19b125be3d6dd45c";
};
buildInputs = [ cmake boost bison flex perl zlib ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
patchPhase = ''
sed -e 's,^export(PACKAGE.*,,' -i CMakeLists.txt
patch -p1 < ${./fixbuild.diff}
patch -p1 < ${./fixrefs.diff}
'';
meta = {
description = ''Simple Theorem Prover'';
maintainers = with stdenv.lib.maintainers; [mornfall];
platforms = with stdenv.lib.platforms; linux;
license = with stdenv.lib.licenses; mit;
};
}

45
pkgs/applications/science/logic/stp/fixbuild.diff Normal file
View File

@ -0,0 +1,45 @@
diff --git a/src/libstp/CMakeLists.txt b/src/libstp/CMakeLists.txt
index 83bd03a..9c0304b 100644
--- a/src/libstp/CMakeLists.txt
+++ b/src/libstp/CMakeLists.txt
@@ -23,6 +23,15 @@ set(stp_lib_targets
printer
)
+include_directories(${CMAKE_SOURCE_DIR}/src/AST/)
+include_directories(${CMAKE_BINARY_DIR}/src/AST/)
+
+add_library(globalstp OBJECT
+ ../main/Globals.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/../main/GitSHA1.cpp
+)
+add_dependencies(globalstp ASTKind_header)
+
# Create list of objects and gather list of
# associated public headers.
set(stp_lib_objects "")
@@ -31,6 +40,7 @@ foreach(target ${stp_lib_targets})
list(APPEND stp_lib_objects $<TARGET_OBJECTS:${target}>)
get_target_property(TARGETS_PUBLIC_HEADERS ${target} PUBLIC_HEADER)
+ set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
if (EXISTS "${TARGETS_PUBLIC_HEADERS}")
list(APPEND stp_public_headers "${TARGETS_PUBLIC_HEADERS}")
message("Adding public header(s) ${TARGETS_PUBLIC_HEADERS} to target libstp")
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 0735137..73039f5 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -3,12 +3,6 @@ include_directories(${CMAKE_BINARY_DIR}/src/AST/)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp" @ONLY)
-add_library(globalstp OBJECT
- Globals.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp
-)
-add_dependencies(globalstp ASTKind_header)
-
# -----------------------------------------------------------------------------
# Create binary
# -----------------------------------------------------------------------------

192
pkgs/applications/science/logic/stp/fixrefs.diff Normal file
View File

@ -0,0 +1,192 @@
commit 53b6043e25b2eba264faab845077fbf6736cf22f
Author: Petr Rockai <me@mornfall.net>
Date: Tue Jan 7 13:30:07 2014 +0100
aig: Comment out unused functions with undefined references in them.
diff --git a/src/extlib-abc/aig/aig/aigPart.c b/src/extlib-abc/aig/aig/aigPart.c
index a4cc116..5bd5f08 100644
--- a/src/extlib-abc/aig/aig/aigPart.c
+++ b/src/extlib-abc/aig/aig/aigPart.c
@@ -869,6 +869,7 @@ Vec_Ptr_t * Aig_ManMiterPartitioned( Aig_Man_t * p1, Aig_Man_t * p2, int nPartSi
SeeAlso []
***********************************************************************/
+#if 0
Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
{
extern int Cmd_CommandExecute( void * pAbc, char * sCommand );
@@ -981,6 +982,7 @@ Aig_Man_t * Aig_ManChoicePartitioned( Vec_Ptr_t * vAigs, int nPartSize )
Aig_ManMarkValidChoices( pAig );
return pAig;
}
+#endif
////////////////////////////////////////////////////////////////////////
diff --git a/src/extlib-abc/aig/aig/aigShow.c b/src/extlib-abc/aig/aig/aigShow.c
index ae8fa8b..f04eedc 100644
--- a/src/extlib-abc/aig/aig/aigShow.c
+++ b/src/extlib-abc/aig/aig/aigShow.c
@@ -326,6 +326,7 @@ void Aig_WriteDotAig( Aig_Man_t * pMan, char * pFileName, int fHaig, Vec_Ptr_t *
SeeAlso []
***********************************************************************/
+#if 0
void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold )
{
extern void Abc_ShowFile( char * FileNameDot );
@@ -347,7 +348,7 @@ void Aig_ManShow( Aig_Man_t * pMan, int fHaig, Vec_Ptr_t * vBold )
// visualize the file
Abc_ShowFile( FileNameDot );
}
-
+#endif
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
diff --git a/src/extlib-abc/aig/dar/darRefact.c b/src/extlib-abc/aig/dar/darRefact.c
index d744b4f..23fc3d5 100644
--- a/src/extlib-abc/aig/dar/darRefact.c
+++ b/src/extlib-abc/aig/dar/darRefact.c
@@ -340,6 +340,7 @@ printf( "\n" );
SeeAlso []
***********************************************************************/
+#if 0
int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, int Required )
{
Vec_Ptr_t * vCut;
@@ -428,6 +429,7 @@ int Dar_ManRefactorTryCuts( Ref_Man_t * p, Aig_Obj_t * pObj, int nNodesSaved, in
}
return p->GainBest;
}
+#endif
/**Function*************************************************************
@@ -461,6 +463,7 @@ int Dar_ObjCutLevelAchieved( Vec_Ptr_t * vCut, int nLevelMin )
SeeAlso []
***********************************************************************/
+#if 0
int Dar_ManRefactor( Aig_Man_t * pAig, Dar_RefPar_t * pPars )
{
// Bar_Progress_t * pProgress;
@@ -583,6 +586,7 @@ p->timeOther = p->timeTotal - p->timeCuts - p->timeEval;
return 1;
}
+#endif
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
diff --git a/src/extlib-abc/aig/dar/darScript.c b/src/extlib-abc/aig/dar/darScript.c
index e60df00..1b9c24f 100644
--- a/src/extlib-abc/aig/dar/darScript.c
+++ b/src/extlib-abc/aig/dar/darScript.c
@@ -64,6 +64,7 @@ Aig_Man_t * Dar_ManRewriteDefault( Aig_Man_t * pAig )
SeeAlso []
***********************************************************************/
+#if 0
Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose )
//alias rwsat "st; rw -l; b -l; rw -l; rf -l"
{
@@ -108,7 +109,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose )
return pAig;
}
-
+#endif
/**Function*************************************************************
@@ -121,6 +122,7 @@ Aig_Man_t * Dar_ManRwsat( Aig_Man_t * pAig, int fBalance, int fVerbose )
SeeAlso []
***********************************************************************/
+#if 0
Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose )
//alias compress2 "b -l; rw -l; rwz -l; b -l; rwz -l; b -l"
{
@@ -180,6 +182,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i
return pAig;
}
+#endif
/**Function*************************************************************
@@ -192,6 +195,7 @@ Aig_Man_t * Dar_ManCompress( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, i
SeeAlso []
***********************************************************************/
+#if 0
Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose )
//alias compress2 "b -l; rw -l; rf -l; b -l; rw -l; rwz -l; b -l; rfz -l; rwz -l; b -l"
{
@@ -285,6 +289,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel,
}
return pAig;
}
+#endif
/**Function*************************************************************
@@ -297,6 +302,7 @@ Aig_Man_t * Dar_ManCompress2( Aig_Man_t * pAig, int fBalance, int fUpdateLevel,
SeeAlso []
***********************************************************************/
+#if 0
Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateLevel, int fVerbose )
//alias resyn "b; rw; rwz; b; rwz; b"
//alias resyn2 "b; rw; rf; b; rw; rwz; b; rfz; rwz; b"
@@ -311,6 +317,7 @@ Vec_Ptr_t * Dar_ManChoiceSynthesis( Aig_Man_t * pAig, int fBalance, int fUpdateL
Vec_PtrPush( vAigs, pAig );
return vAigs;
}
+#endif
/**Function*************************************************************
diff --git a/src/extlib-abc/aig/kit/kitAig.c b/src/extlib-abc/aig/kit/kitAig.c
index de301f2..7e5df0f 100644
--- a/src/extlib-abc/aig/kit/kitAig.c
+++ b/src/extlib-abc/aig/kit/kitAig.c
@@ -95,6 +95,7 @@ Aig_Obj_t * Kit_GraphToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, Kit_Graph_t
SeeAlso []
***********************************************************************/
+#if 0
Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * pTruth, int nVars, Vec_Int_t * vMemory )
{
Aig_Obj_t * pObj;
@@ -113,6 +114,7 @@ Aig_Obj_t * Kit_TruthToAig( Aig_Man_t * pMan, Aig_Obj_t ** pFanins, unsigned * p
Kit_GraphFree( pGraph );
return pObj;
}
+#endif
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
diff --git a/src/extlib-abc/aig/kit/kitGraph.c b/src/extlib-abc/aig/kit/kitGraph.c
index 39ef587..0485c66 100644
--- a/src/extlib-abc/aig/kit/kitGraph.c
+++ b/src/extlib-abc/aig/kit/kitGraph.c
@@ -349,6 +349,7 @@ unsigned Kit_GraphToTruth( Kit_Graph_t * pGraph )
SeeAlso []
***********************************************************************/
+#if 0
Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemory )
{
Kit_Graph_t * pGraph;
@@ -365,6 +366,7 @@ Kit_Graph_t * Kit_TruthToGraph( unsigned * pTruth, int nVars, Vec_Int_t * vMemor
pGraph = Kit_SopFactor( vMemory, RetValue, nVars, vMemory );
return pGraph;
}
+#endif
/**Function*************************************************************

4
pkgs/applications/science/math/pssp/default.nix
View File

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "pspp-0.8.1";
name = "pspp-0.8.2";
src = fetchurl {
url = "mirror://gnu/pspp/${name}.tar.gz";
sha256 = "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x";
sha256 = "1w7h3dglgx0jlq1wb605b8pgfsk2vr1q2q2rj7bsajh9ihbcsixr";
};
buildInputs = [ libxml2 readline zlib perl cairo gtk gsl pkgconfig

4
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -14,8 +14,8 @@
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140108";
sha256 = "17j1avmg66lda52p93689n4mas46rfbjdvss1rvmdh10cj7hg8jy";
version = "5.20140116";
sha256 = "18l9nflmnfaqmrq9nvypv2jwn3v2461lb4m0jjpai6aipzl91jw2";
isLibrary = false;
isExecutable = true;
buildDepends = [

8
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,18 +1,18 @@
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil,
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl,
libXcursor, coreutils, perl, pango }:
xcb-util-cursor, coreutils, perl, pango }:
stdenv.mkDerivation rec {
name = "i3-${version}";
version = "4.6";
version = "4.7.2";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "1qand44hjqz84f2xzd0mmyk9vpsm7iwz6446s4ivdj6f86213lpm";
sha256 = "14zkn5jgm0b7ablvxcxh9gdzq6mjdd6i1kl9dbmifl2a6rg5dr3g";
};
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
libstartup_notification libX11 pcre libev yajl libXcursor perl pango ];
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango ];
patchPhase = ''
patchShebangs .

8
pkgs/applications/window-managers/weston/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon
, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
, libjpeg, pam, autoconf, automake, libtool }:
, libjpeg, pam, autoconf, automake, libtool, dbus }:
let version = "1.3.1"; in
let version = "1.4.0"; in
stdenv.mkDerivation rec {
name = "weston-${version}";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p";
sha256 = "0r7dz72ys9p3f697ajgmihkar2da36bnjna6yanb3kg9k2fk38kl";
};
buildInputs = [
pkgconfig wayland mesa libxkbcommon
cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam
cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs
];
NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm";

2
pkgs/build-support/release/maven-build.nix
View File

@ -78,7 +78,7 @@ stdenv.mkDerivation ( rec {
zip=$(ls target/*.zip| head -1)
releaseName=$(basename $zip .zip)
releaseName="$releaseName-r${toString src.rev}"
releaseName="$releaseName-r${toString src.rev or "0"}"
cp $zip $out/release/$releaseName.zip
echo "$releaseName" > $out/nix-support/hydra-release-name

1
pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
View File

@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter;
description = "Xfce screenshooter";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

17
pkgs/development/compilers/elm/elm.nix
View File

@ -1,12 +1,14 @@
{ cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
, cmdargs, filepath, HTF, indents, languageEcmascript, mtl, pandoc
, parsec, text, transformers, unionFind, unorderedContainers
, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript
, mtl, pandoc, parsec, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers
, unionFind, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "Elm";
version = "0.10.1";
sha256 = "1y533vanhrxc14x304ig6q8ch6zih8yqgpfgw4h5vk5fpdmn09a2";
version = "0.11";
sha256 = "1rg1dbd2ag63in6069p6v88h1yx0snap2gdhz81lk9l66qns3f4s";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -14,7 +16,12 @@ cabal.mkDerivation (self: {
indents languageEcmascript mtl pandoc parsec text transformers
unionFind unorderedContainers
];
testDepends = [ HTF ];
testDepends = [
aeson binary blazeHtml blazeMarkup cmdargs filemanip filepath HUnit
indents languageEcmascript mtl pandoc parsec QuickCheck
testFramework testFrameworkHunit testFrameworkQuickcheck2 text
transformers unionFind unorderedContainers
];
doCheck = false;
meta = {
homepage = "http://elm-lang.org";

2
pkgs/development/compilers/ocaml/3.11.2.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "Objective Caml, the most popular variant of the Caml language";
longDescription =

2
pkgs/development/compilers/ocaml/3.12.1.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "OCaml, the most popular variant of the Caml language";
longDescription =

2
pkgs/development/compilers/ocaml/4.00.1.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "OCaml, the most popular variant of the Caml language";
longDescription =

2
pkgs/development/compilers/ocaml/4.01.0.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "OCaml, the most popular variant of the Caml language";
longDescription =

2
pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
View File

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
};
}

19
pkgs/development/compilers/openjdk/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups
, which, jdk, nettools, libX11, libXt, libXext, libXrender, libXtst, libXi, libXinerama
, libXcursor, fontconfig, cpio, cacert, perl, setJavaClassPath }:
, which, jdk, nettools, xorg
, fontconfig, cpio, cacert, perl, setJavaClassPath }:
let
@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ unzip procps ant which zip cpio nettools alsaLib
libX11 libXt libXext libXrender libXtst libXi libXinerama libXcursor
xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
fontconfig perl
];
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
'';
patches = [ ./cppflags-include-fix.patch ];
patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ];
NIX_NO_SELF_RPATH = true;
@ -80,6 +81,9 @@ stdenv.mkDerivation rec {
mv $out/lib/openjdk/include $out/include
mv $out/lib/openjdk/man $out/share/man
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove some broken manpages.
rm -rf $out/share/man/ja*
@ -88,10 +92,15 @@ stdenv.mkDerivation rec {
# Move the JRE to a separate output.
mv $out/lib/openjdk/jre $jre/lib/openjdk/
ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre
mkdir $out/lib/openjdk/jre
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
rm -rf $out/lib/openjdk/jre/bin
ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
# Remove duplicate binaries.
for i in $(cd $out/lib/openjdk/bin && echo *); do
if [ "$i" = java ]; then continue; fi
if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
fi

17
pkgs/development/compilers/openjdk/fix-java-home.patch Normal file
View File

@ -0,0 +1,17 @@
diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
--- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100
@@ -2358,12 +2358,10 @@
CAST_FROM_FN_PTR(address, os::jvm_path),
dli_fname, sizeof(dli_fname), NULL);
assert(ret, "cannot locate libjvm");
char *rp = NULL;
if (ret && dli_fname[0] != '\0') {
- rp = realpath(dli_fname, buf);
+ snprintf(buf, buflen, "%s", dli_fname);
}
- if (rp == NULL)
- return;
if (Arguments::created_by_gamma_launcher()) {
// Support for the gamma launcher. Typical value for buf is

2
pkgs/development/interpreters/rascal/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
''
mkdir -p $out/bin
makeWrapper ${jdk}/bin/java $out/bin/rascal \
--add-flags "-Djava.home=$JAVA_HOME -jar ${src}" \
--add-flags "-jar ${src}" \
'';
meta = {

21
pkgs/development/libraries/CGAL/default.nix
View File

@ -1,25 +1,24 @@
{stdenv, fetchurl, cmake, boost, gmp, mpfr
}:
{ stdenv, fetchurl, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
version = "4.3";
name = "cgal-${version}";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz";
sha256 = "193vjhzlf7f2kw6dbg5yw8v0izdvmnrylqzqhw92vml7jjnr8494";
url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz";
sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc";
};
buildInputs = [cmake boost gmp mpfr ];
buildInputs = [ cmake boost gmp mpfr ];
doCheck = false;
meta = {
meta = with stdenv.lib; {
description = "Computational Geometry Algorithms Library";
homepage = "http://cgal.org/";
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;
[raskin];
license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+
platforms = platforms.linux;
maintainers = [ maintainers.raskin ];
};
}

2
pkgs/development/libraries/cairo/default.nix
View File

@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
homepage = http://cairographics.org/;
licenses = [ "LGPLv2+" "MPLv1" ];
license = [ "LGPLv2+" "MPLv1" ];
platforms = stdenv.lib.platforms.all;
};

2
pkgs/development/libraries/cairomm/default.nix
View File

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = http://cairographics.org/;
licenses = [ "LGPLv2+" "MPLv1" ];
license = [ "LGPLv2+" "MPLv1" ];
};
}

12
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -10,27 +10,27 @@ assert cupsSupport -> cups != null;
let
ver_maj = "3.10";
ver_min = "5"; # .6 needs currently unreleased wayland for introspection (wl_proxy_marshal_constructor)
ver_min = "6";
in
stdenv.mkDerivation rec {
name = "gtk+-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
sha256 = "1iyc566r61d3jfdiq5knwbssq5bsqsn8hqzdm30vmw6dx3cgd49i";
sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
buildInputs = [ wayland libxkbcommon ];
buildInputs = [ libxkbcommon ];
propagatedBuildInputs = with xlibs; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ]
++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
++ optional stdenv.isDarwin x11
++ stdenv.lib.optional xineramaSupport libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
postInstall = "rm -rf $out/share/gtk-doc";

4
pkgs/development/libraries/haskell/Chart-cairo/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Chart-cairo";
version = "1.1";
sha256 = "0pm8iwd83pn5ba0g3231zs7f39cdjr7n7k76cm642n4b0hf93fmb";
version = "1.2";
sha256 = "08aaf7yb2vry75g15md2012rnmyfrn7awwvba7c38d4h6vm95llg";
buildDepends = [
cairo Chart colour dataDefaultClass lens mtl operational time
];

4
pkgs/development/libraries/haskell/Chart-gtk/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Chart-gtk";
version = "1.1";
sha256 = "1394h7jd8pk55396nz1xjisz4v7brqcf9fwdnw9g4q3x1b7dcgs8";
version = "1.2";
sha256 = "0qq72cf1m2gvcksa1jj5g9qi6b47pmpzh3grhs7kh3m7qyq0a56g";
buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
meta = {
homepage = "https://github.com/timbod7/haskell-chart/wiki";

4
pkgs/development/libraries/haskell/Chart/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Chart";
version = "1.1";
sha256 = "136s44mbhf3wmg85rr9qr0kv59lq1lfd3l58a5aijpv9vz1isf7p";
version = "1.2";
sha256 = "0cvp2j2hgsdk93f4rbd8y7s11hlr3zg15qkpxhd7p7sl2k6j2r5x";
buildDepends = [
colour dataDefaultClass lens mtl operational time
];

4
pkgs/development/libraries/haskell/HTF/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "HTF";
version = "0.11.0.1";
sha256 = "0c4z76rsmdck60p7p2ypxx0d0r7k2vcb9viqp2yalyxzaaj7a9f5";
version = "0.11.1.0";
sha256 = "0prijzy852fkr8z58rhba6jvrb27b6lyz2jdgqb7r1jrnkhqmhpq";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/JuicyPixels/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "JuicyPixels";
version = "3.1.3";
sha256 = "1zyrdd8mhgj0lchsznyhqhxb48ql8fhfqi5qs54qaxan514w6x70";
version = "3.1.3.1";
sha256 = "03kbvm3y5di274gzz8sr24z9j27rdayx4kkbf5hfvl325ghidhx9";
buildDepends = [
binary deepseq mtl primitive transformers vector zlib
];

8
pkgs/development/libraries/haskell/atomic-primops/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, bitsAtomic, Cabal, primitive }:
{ cabal, Cabal, primitive }:
cabal.mkDerivation (self: {
pname = "atomic-primops";
version = "0.4";
sha256 = "01sg0yn25fs0z7dmrvhyp3amay9l028xs570xhy6vvplrji1mxf0";
buildDepends = [ bitsAtomic Cabal primitive ];
version = "0.5";
sha256 = "0pni44gi9sh4l3hxwh7bqadhh6nc7v8w869sv9n45vkxwhhwbk4i";
buildDepends = [ Cabal primitive ];
meta = {
homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
description = "A safe approach to CAS and other atomic ops in Haskell";

22
pkgs/development/libraries/haskell/atto-lisp/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, HUnit
, testFramework, testFrameworkHunit, text
}:
cabal.mkDerivation (self: {
pname = "atto-lisp";
version = "0.2.1.2";
sha256 = "0xl5b0gblab3v2sfaxvx3z96660r9xp1m2n3ri6aph3kldbpkfcg";
buildDepends = [
attoparsec blazeBuilder blazeTextual deepseq text
];
testDepends = [
attoparsec HUnit testFramework testFrameworkHunit text
];
jailbreak = true;
meta = {
homepage = "http://github.com/nominolo/atto-lisp";
description = "Efficient parsing and serialisation of S-Expressions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

7
pkgs/development/libraries/haskell/blaze-html/default.nix
View File

@ -4,13 +4,16 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.6.1.3";
sha256 = "0hjyi3iv2770wicgfjipa901vk7mwr8kknfqvj3v9kzcvb4lq5aq";
version = "0.7.0.0";
sha256 = "1k8mxq3hmf2s7qab67jz3yaan7wdc4mn5sa00rw5zk4mjh722w86";
buildDepends = [ blazeBuilder blazeMarkup text ];
testDepends = [
blazeBuilder blazeMarkup HUnit QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2 text
];
patchPhase = ''
sed -i -e 's|blaze-markup.*>=.*,|blaze-markup,|' blaze-html.cabal
'';
meta = {
homepage = "http://jaspervdj.be/blaze";
description = "A blazingly fast HTML combinator library for Haskell";

4
pkgs/development/libraries/haskell/blaze-markup/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
version = "0.5.2.1";
sha256 = "1drq98q70jfbxsdf3b6n5ksr1pcy8h5cgjngg6h3kd6vww3vysdy";
version = "0.6.0.0";
sha256 = "1f54i570cqbyqkrsq4qd2bky88pdwg9lv84c6aaf2c21552dbvii";
buildDepends = [ blazeBuilder text ];
testDepends = [
blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit

1
pkgs/development/libraries/haskell/blaze-svg/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.3.3.0";
sha256 = "1wi4nc73ic3qmbx6v9fniacwcz2nlvmp5snn144fdiwb22klfn5f";
buildDepends = [ blazeMarkup mtl ];
jailbreak = true;
meta = {
homepage = "https://github.com/deepakjois/blaze-svg";
description = "SVG combinator library";

1
pkgs/development/libraries/haskell/bytestring-progress/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "1.0.3";
sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs";
buildDepends = [ terminalProgressBar time ];
noHaddock = true;
meta = {
homepage = "http://github.com/acw/bytestring-progress";
description = "A library for tracking the consumption of a lazy ByteString";

4
pkgs/development/libraries/haskell/cassava/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "cassava";
version = "0.3.0.0";
sha256 = "0s297664if9zp2y441jihcrmdfgdicjgncyx0rpddlr789vkbs9s";
version = "0.3.0.1";
sha256 = "1lsbdhdz6hy6lfnhhp36mbjd9m0w8iv50sd9mj0dj9b4izgdav16";
buildDepends = [
attoparsec blazeBuilder deepseq text unorderedContainers vector
];

4
pkgs/development/libraries/haskell/cipher-aes128/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cipher-aes128";
version = "0.6.2";
sha256 = "0rj56p8rcnvk95jc4fx4pxv25yk85vfad7v0znsgzp2hpw4h4ihb";
version = "0.6.4";
sha256 = "093zpw86wimniwmd73g3nnbfy530q52kynccssqf7jxafbsw75aa";
isLibrary = true;
isExecutable = true;
buildDepends = [ cereal cryptoApi tagged ];

4
pkgs/development/libraries/haskell/conduit/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.11.1";
sha256 = "115iqdhwmnn04bmby2bmbm6pykb2akaca0c3i79nvw1annml65lg";
version = "1.0.12";
sha256 = "025h1nbplq7v1qp74bg647q36n3d56kin700ws7vm922xmvcrjjm";
buildDepends = [
liftedBase mmorph monadControl mtl resourcet text transformers
transformersBase void

8
pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
View File

@ -1,13 +1,13 @@
{ cabal, aeson, aesonLens, digestiveFunctors, HUnit, lens, mtl
{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
, safe, tasty, tastyHunit, text, vector
}:
cabal.mkDerivation (self: {
pname = "digestive-functors-aeson";
version = "1.1.3";
sha256 = "0194yd2b9irm1gmk3d8awrsrmsr4lml63wr4vm8a92s7w3hdy0db";
version = "1.1.4";
sha256 = "1rca25zycmz4al5izq8j7h3cggvb4844g3gj3a1686yy38k5rfvn";
buildDepends = [
aeson aesonLens digestiveFunctors lens safe text vector
aeson digestiveFunctors lens lensAeson safe text vector
];
testDepends = [
aeson digestiveFunctors HUnit mtl tasty tastyHunit text

4
pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
version = "0.8.4.0";
sha256 = "15n8piiqys010in8xp5iszjqsa2ndgk52adqgk2h6q3m5q0jkdb3";
version = "0.8.4.1";
sha256 = "03bbz5q3asn1iid13xjiv5hdpj5bgr0h9wwp29bnysiw4vrgjax0";
buildDepends = [
blazeBuilder digestiveFunctors heist mtl text xmlhtml
];

4
pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-snap";
version = "0.6.0.1";
sha256 = "0y26fqhjb78mv6rzp3x6cbxrq4dqh2dzd81wd5sgsm079j5frjj7";
version = "0.6.1.0";
sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr";
buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

4
pkgs/development/libraries/haskell/digestive-functors/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors";
version = "0.6.2.0";
sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7";
version = "0.7.0.0";
sha256 = "1zn8vn6xcmp4w39b0k33bp7zsxvnn8g8p26mch4r8ng9ldcb2y8h";
buildDepends = [ mtl text time ];
testDepends = [
HUnit mtl QuickCheck testFramework testFrameworkHunit

1
pkgs/development/libraries/haskell/either/default.nix
View File

@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
monadControl MonadRandom mtl semigroupoids semigroups transformers
transformersBase
];
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
meta = {
homepage = "http://github.com/ekmett/either/";
description = "An either monad transformer";

4
pkgs/development/libraries/haskell/github/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "github";
version = "0.7.3";
sha256 = "0cb7smydndigkcib4y8pbsycsqyzg45g5vrglyq1h245rd4j6s37";
version = "0.7.4";
sha256 = "1yalhixisjv1n9ihik3h6ya25f0066dd422nbpfysj9093hv3a5w";
buildDepends = [
aeson attoparsec caseInsensitive conduit dataDefault failure
hashable HTTP httpConduit httpTypes network text time

11
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.4.3.1";
sha256 = "0k301mzy8sagrxdzkhz006j1i1zmsx9iy5ais9gif3gxj2sd3b2a";
version = "4.4.3.2";
sha256 = "1n597q4pbdka7g06524j0zvjcjpv7fgf6mga1a0kfr012sf9cqz9";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -25,10 +25,11 @@ cabal.mkDerivation (self: {
snapCore snapServer systemFilepath tagsoup testFramework
testFrameworkHunit testFrameworkQuickcheck2 text time
];
patchPhase = ''
sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal
'';
doCheck = false;
patchPhase = ''
sed -i -e 's|blaze-markup.*,|blaze-markup,|' -e 's|blaze-html.*,|blaze-html,|' \
-e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal
'';
meta = {
homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library";

1
pkgs/development/libraries/haskell/happstack/happstack-server.nix
View File

@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
];
testDepends = [ HUnit parsec zlib ];
doCheck = false;
jailbreak = true;
meta = {
homepage = "http://happstack.com";
description = "Web related tools and services";

1
pkgs/development/libraries/haskell/haskell-names/default.nix
View File

@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
hseCpp mtl prettyShow tagged tasty tastyGolden traverseWithClass
uniplate utf8String
];
doCheck = false;
meta = {
homepage = "http://documentup.com/haskell-suite/haskell-names";
description = "Name resolution library for Haskell";

4
pkgs/development/libraries/haskell/heist/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "heist";
version = "0.13.0.5";
sha256 = "17lpqiidy1s6yzhh865y7dhkcv34p7pxzljpn64yyfa2pc8885dj";
version = "0.13.0.6";
sha256 = "1h34bmcb9bqkagcx3iqnp4l8z8qhngf00mki4hpk905znja6hib9";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time

1
pkgs/development/libraries/haskell/highlighting-kate/default.nix
View File

@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
jailbreak = true;
meta = {
homepage = "http://github.com/jgm/highlighting-kate";
description = "Syntax highlighting";

10
pkgs/development/libraries/haskell/hit/default.nix
View File

@ -1,17 +1,17 @@
{ cabal, attoparsec, blazeBuilder, bytedump, cryptohash, HUnit, mtl
, parsec, QuickCheck, random, systemFileio, systemFilepath
{ cabal, attoparsec, bytedump, cryptohash, HUnit, mtl, parsec
, patience, QuickCheck, random, systemFileio, systemFilepath
, testFramework, testFrameworkQuickcheck2, time, vector, zlib
, zlibBindings
}:
cabal.mkDerivation (self: {
pname = "hit";
version = "0.5.0";
sha256 = "05v49l3k8gwn922d5b5xrzdrakh6bw02bp8hd8yc8163jyazk2vx";
version = "0.5.2";
sha256 = "05f5xm23049ngvsch9cp2snyknk3qknx1jlb42zi0nbv8f1hymnn";
isLibrary = true;
isExecutable = true;
buildDepends = [
attoparsec blazeBuilder cryptohash mtl parsec random systemFileio
attoparsec cryptohash mtl parsec patience random systemFileio
systemFilepath time vector zlib zlibBindings
];
testDepends = [

15
pkgs/development/libraries/haskell/hjsmin/default.nix
View File

@ -1,12 +1,17 @@
{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript, QuickCheck
, testFramework, testFrameworkHunit, text
{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript
, optparseApplicative, QuickCheck, testFramework
, testFrameworkHunit, text
}:
cabal.mkDerivation (self: {
pname = "hjsmin";
version = "0.1.4.4";
sha256 = "0hzh2xbv9x013s1lhmgapjd0qx8v7n09rjlfxd9b1h5min00k048";
buildDepends = [ blazeBuilder languageJavascript text ];
version = "0.1.4.5";
sha256 = "0lzqs20kyngbjc7wqq347b1caj0hbf29dvdpxghfpjbrgyvyqh74";
isLibrary = true;
isExecutable = true;
buildDepends = [
blazeBuilder languageJavascript optparseApplicative text
];
testDepends = [
blazeBuilder Cabal HUnit languageJavascript QuickCheck
testFramework testFrameworkHunit text

3
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
];
testDepends = [ hspec yesod yesodTest ];
doCheck = false;
patchPhase = ''
sed -i -e 's|blaze-html.*0.7|blaze-html|' -e 's|blaze-markup.*0.7|blaze-markup|' hledger-web.cabal
'';
meta = {
homepage = "http://hledger.org";
description = "A web interface for the hledger accounting tool";

4
pkgs/development/libraries/haskell/hoodle-builder/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "hoodle-builder";
version = "0.2.2";
sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq";
version = "0.2.2.0";
sha256 = "0p123jpm39ggbjn1757nfygcgi324knin62cyggbq1hhhglkfxa2";
buildDepends = [
blazeBuilder doubleConversion hoodleTypes lens strict
];

4
pkgs/development/libraries/haskell/mmorph/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "mmorph";
version = "1.0.1";
sha256 = "15a4isvxb4my72hzndgfy66792r9fpkn9vnmr2fnv9d9vl058y14";
version = "1.0.2";
sha256 = "0d0nn5x7f3yyck10znqa13iihkshq04xgg1d9bn1nvl7kjzicjwh";
buildDepends = [ transformers ];
meta = {
description = "Monad morphisms";

4
pkgs/development/libraries/haskell/monadcryptorandom/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monadcryptorandom";
version = "0.5.3";
sha256 = "1nmkya9mf9y6lhmbhamq2g09pfvfpmicrwab09mcy3ggljdnnfyg";
version = "0.6";
sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x";
buildDepends = [ cryptoApi mtl tagged transformers ];
meta = {
homepage = "https://github.com/TomMD/monadcryptorandom";

4
pkgs/development/libraries/haskell/network-conduit/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "network-conduit";
version = "1.0.1";
sha256 = "1argxj87a5rzza061lvvfmix2vrlz62dskj4pwlsq0d22dg8y332";
version = "1.0.1.1";
sha256 = "1mji8zb0chnnxl7z4dgijls6szfa6c47zmhx0v1dc9k27bnc0mhx";
buildDepends = [
conduit liftedBase monadControl network transformers
];

12
pkgs/development/libraries/haskell/patience/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "patience";
version = "0.1.1";
sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
meta = {
description = "Patience diff and longest increasing subsequence";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

18
pkgs/development/libraries/haskell/stm-conduit/default.nix
View File

@ -1,19 +1,19 @@
{ cabal, async, conduit, HUnit, liftedAsync, liftedBase
, monadControl, monadLoops, QuickCheck, resourcet, stm, stmChans
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
, transformers
{ cabal, async, cereal, cerealConduit, conduit, HUnit, liftedAsync
, liftedBase, monadControl, monadLoops, QuickCheck, resourcet, stm
, stmChans, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, transformers
}:
cabal.mkDerivation (self: {
pname = "stm-conduit";
version = "2.2";
sha256 = "14fz8izr8fxi3s78fhz4p5yfdkfcipcfpcj6dn5w0fkcd2hc2a66";
version = "2.2.1";
sha256 = "15ym83c42krx19rw719yqlib1vcg68jmx48rihy5aimc0m5m307b";
buildDepends = [
async conduit liftedAsync liftedBase monadControl monadLoops
resourcet stm stmChans transformers
async cereal cerealConduit conduit liftedAsync liftedBase
monadControl monadLoops resourcet stm stmChans transformers
];
testDepends = [
conduit HUnit QuickCheck stm stmChans testFramework
conduit HUnit QuickCheck resourcet stm stmChans testFramework
testFrameworkHunit testFrameworkQuickcheck2 transformers
];
meta = {

4
pkgs/development/libraries/haskell/tagsoup/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "tagsoup";
version = "0.13";
sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1";
version = "0.13.1";
sha256 = "0p1mwyjk2bvpavjm1kgdjnahj0q4nhynix3653s0i0kvhw70450k";
isLibrary = true;
isExecutable = true;
buildDepends = [ text ];

4
pkgs/development/libraries/haskell/tasty-rerun/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tasty-rerun";
version = "1.0.0";
sha256 = "0vpgsb5fgvb9mx07zq53slqxxk2vvr2c9c9p1fhrm9qadfirsqc8";
version = "1.1.0";
sha256 = "0nizjmz9z41r1vzxzld760x6ga4lqycwfazhddk570w3x2dzm6p2";
buildDepends = [
mtl optparseApplicative reducers split stm tagged tasty
transformers

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "2.0.3";
sha256 = "18x5jcq4yl33ixl7rb79ncx107bw6y8dmw2gwcmxb93h5yiam7s5";
version = "2.0.3.1";
sha256 = "1ckn90j2zmh77mgpan28v315qipw5v0ji9k3lq1ni9kzjap7pl5a";
buildDepends = [
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase

4
pkgs/development/libraries/haskell/websockets/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "websockets";
version = "0.8.1.1";
sha256 = "0mgazf0s9sl53r5smidrfqcx7rq2v4kfm37f4f6mjrl656qxpbwd";
version = "0.8.1.2";
sha256 = "1xr44j3fcah3p5ic5s4rirb1ribq88m7ckmdfhwz5wy42sfiwv99";
buildDepends = [
attoparsec base64Bytestring binary blazeBuilder caseInsensitive
entropy ioStreams mtl network random SHA text

4
pkgs/development/libraries/haskell/xmlgen/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "xmlgen";
version = "0.6.2.0";
sha256 = "0b6fyg6mlm068f2jjmil52az4hk144pryf1c0wr1gx6ddx9yzjy4";
version = "0.6.2.1";
sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
buildDepends = [ blazeBuilder mtl text ];
testDepends = [ filepath HUnit hxt QuickCheck text ];
meta = {

4
pkgs/development/libraries/haskell/xmlhtml/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmlhtml";
version = "0.2.3.1";
sha256 = "138nryn68f58cvg971qw7vw0kprsw5g39j3fmf0bz83sg4g98nmd";
version = "0.2.3.2";
sha256 = "1djw9d0hff9ii0n1bgbjjsca9n0w7mxj3ivf9dslyr3kv3yb4013";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
];

4
pkgs/development/libraries/haskell/yesod-form/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "1.3.4.3";
sha256 = "1yf9kvnlkgfdpv44afj2zwdk8jh382lxj56jvafgw1bxa1hsn408";
version = "1.3.4.4";
sha256 = "0g5kxcb29qa7xq1s57bvl38fbrsm6jvmvw65nw14as0hbqlv67fh";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
dataDefault emailValidate hamlet network persistent resourcet

4
pkgs/development/libraries/haskell/yesod-platform/default.nix
View File

@ -32,8 +32,8 @@
cabal.mkDerivation (self: {
pname = "yesod-platform";
version = "1.2.6";
sha256 = "15ixhxim14672hl9cl92sbi94yzv6g6zgg07jvkciixg0hd8xr6p";
version = "1.2.6.1";
sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f";
buildDepends = [
aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
authenticate base64Bytestring baseUnicodeSymbols blazeBuilder

37
pkgs/development/libraries/ibus/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, makeWrapper, python, glib, intltool, pkgconfig
, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
stdenv.mkDerivation rec {
name = "ibus-${version}";
version = "1.5.5";
src = fetchurl {
url = "http://ibus.googlecode.com/files/${name}.tar.gz";
sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
};
configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
buildInputs = [
makeWrapper python glib wayland
intltool pkgconfig gnome3.gtk2
gnome3.gtk3 dbus gnome3.dconf gnome3.gconf
libnotify isocodes gobjectIntrospection
];
preBuild = "patchShebangs ./scripts";
postInstall = ''
#${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
for f in "$out"/bin/*; do
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share"
done
'';
meta = {
homepage = https://code.google.com/p/ibus/;
description = "Intelligent Input Bus for Linux / Unix OS";
platforms = stdenv.lib.platforms.linux;
};
}

6
pkgs/development/libraries/java/junit/builder.sh
View File

@ -1,6 +0,0 @@
set -e
source $stdenv/setup
$unzip/bin/unzip $src
mkdir -p $out
mv junit*/* $out

33
pkgs/development/libraries/java/junit/default.nix
View File

@ -1,17 +1,34 @@
{stdenv, fetchurl, unzip} :
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "junit-4.8.2";
builder = ./builder.sh;
let
src = fetchurl {
url = https://github.com/downloads/junit-team/junit/junit4.8.2.zip;
sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6";
junit = fetchurl {
url = http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.jar;
sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h";
};
inherit unzip;
hamcrest = fetchurl {
url = http://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar;
sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6";
};
in
stdenv.mkDerivation {
name = "junit-4.11";
unpackPhase = "true";
installPhase =
''
mkdir -p $out/share/java
ln -s ${junit} $out/share/java/junit.jar
ln -s ${hamcrest} $out/share/java/hamcrest-core.jar
'';
meta = {
homepage = http://www.junit.org/;
description = "A framework for repeatable tests in Java";
license = stdenv.lib.licenses.epl10;
};
}

37
pkgs/development/libraries/java/junixsocket/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, ant, jdk, junit }:
stdenv.mkDerivation rec {
name = "junixsocket-1.3";
src = fetchurl {
url = "http://junixsocket.googlecode.com/files/${name}-src.tar.bz2";
sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
};
buildInputs = [ ant jdk junit ];
preConfigure =
''
sed -i 's|/usr/bin/||' build.xml
'';
buildPhase = "ant";
ANT_ARGS =
"-Dskip32=true -Dant.build.javac.source=1.6"
+ stdenv.lib.optionalString stdenv.isDarwin " -DisMac=true";
installPhase =
''
mkdir -p $out/share/java $out/lib
cp -v dist/*.jar $out/share/java
cp -v lib-native/*.so lib-native/*.dylib $out/lib/
'';
meta = {
description = "A Java/JNI library for using Unix Domain Sockets from Java";
homepage = https://code.google.com/p/junixsocket/;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/development/libraries/java/rhino/default.nix
View File

@ -52,6 +52,6 @@ stdenv.mkDerivation {
homepage = http://www.mozilla.org/rhino/;
licenses = [ "MPLv1.1" /* or */ "GPLv2+" ];
license = [ "MPLv1.1" /* or */ "GPLv2+" ];
};
}

2
pkgs/development/libraries/sbc/default.nix
View File

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://www.bluez.org/;
licenses = stdenv.lib.licenses.gpl2;
license = stdenv.lib.licenses.gpl2;
};
}

4
pkgs/development/libraries/wayland/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
let version = "1.3.0"; in
let version = "1.4.0"; in
stdenv.mkDerivation rec {
name = "wayland-${version}";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "0vhd8z74r4zmm7hrbb8l450sb6slqkdrvmk4k78sq9lays2pd09f";
sha256 = "0n2sbh4xg8xkcjhyi3f4vwcv89krdriyfs0rzdibdj5l2ngkpwqq";
};
buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];

2
pkgs/development/libraries/zziplib/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
zip/unzip tools.
'';
licenses = [ "LGPLv2+" "MPLv1.1" ];
license = [ "LGPLv2+" "MPLv1.1" ];
homepage = http://zziplib.sourceforge.net/;

2
pkgs/development/ocaml-modules/menhir/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation {
to OCaml code. Menhir was designed and implemented by François Pottier
and Yann Régis-Gianas.
'';
licenses = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
license = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z

2
pkgs/development/python-modules/setuptools/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Utilities to facilitate the installation of Python packages";
homepage = http://pypi.python.org/pypi/setuptools;
licenses = [ "PSF" "ZPL" ];
license = [ "PSF" "ZPL" ];
platforms = platforms.all;
};
}

20
pkgs/development/python-modules/tarsnapper-path.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/src/tarsnapper/script.py b/src/tarsnapper/script.py
index 737ac8d..52cc775 100644
--- a/src/tarsnapper/script.py
+++ b/src/tarsnapper/script.py
@@ -48,7 +48,7 @@ class TarsnapBackend(object):
"""
``arguments`` is a single list of strings.
"""
- call_with = ['tarsnap']
+ call_with = ['@NIXTARSNAPPATH@']
for option in self.options:
key = option[0]
pre = "-" if len(key) == 1 else "--"
@@ -499,4 +499,4 @@ def run():
if __name__ == '__main__':
- run()
\ No newline at end of file
+ run()

4
pkgs/development/tools/build-managers/apache-ant/default.nix
View File

@ -65,10 +65,6 @@ stdenv.mkDerivation {
LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
if [ -e \$JAVA_HOME/lib/tools.jar ]; then
LOCALCLASSPATH="\$JAVA_HOME/lib/tools.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
fi
exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
-Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \

2
pkgs/development/tools/misc/autogen/default.nix
View File

@ -46,7 +46,7 @@ let version = "5.18"; in
documentation of program options.
'';
licenses = ["GPLv3+" "LGPLv3+" ];
license = ["GPLv3+" "LGPLv3+" ];
homepage = http://www.gnu.org/software/autogen/;

24
pkgs/misc/beep/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl }:
# this package is working only as root
# in order to work as a non privileged user you would need to suid the bin
stdenv.mkDerivation {
name = "beep-1.3";
src = fetchurl {
url = http://www.johnath.com/beep/beep-1.3.tar.gz;
md5 = "49c340ceb95dbda3f97b2daafac7892a";
};
makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/";
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/man/man1
'';
meta = {
description = "The advanced PC speaker beeper";
homepage = http://www.johnath.com/beep/;
license = "GPLv2";
};
}

9
pkgs/misc/source-and-tags/default.nix
View File

@ -56,8 +56,13 @@ args: with args; {
tagCmd = "
srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs*\";`\"
[ -z \"$srcs\" ] || {
${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs
sort tags > \$TAG_FILE
# without this creating tag files for lifted-base fails
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""}
${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags .
mv tags \$TAG_FILE
}";
}
];

6
pkgs/os-specific/linux/kernel-headers/3.7.nix
View File

@ -62,4 +62,10 @@ stdenv.mkDerivation {
ln -s asm $out/include/asm-x86
fi
'';
meta = with stdenv.lib; {
description = "Header files and scripts for Linux kernel";
license = licenses.gpl2;
platforms = platforms.linux;
};
}

18
pkgs/os-specific/linux/kernel/perf.diff Normal file
View File

@ -0,0 +1,18 @@
--- perf/config/utilities.mak.orig 2014-01-25 14:55:32.573320370 +0000
+++ perf/config/utilities.mak 2014-01-25 15:13:34.174337760 +0000
@@ -186,9 +186,14 @@
endif
TRY_CC_MSG=echo " CHK $(3)" 1>&2;
+define newline
+
+
+endef
+
try-cc = $(shell sh -c \
'TMP="$(OUTPUT)$(TMPOUT).$$$$"; \
$(TRY_CC_MSG) \
- echo "$(1)" | \
+ echo -e "$(subst $(newline),\\n,$(1))" | tee _test.c | \
$(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \
rm -f "$$TMP"')

1
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation {
preConfigure = ''
cd tools/perf
sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
patch -p1 < ${./perf.diff}
[ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
export makeFlags="DESTDIR=$out $makeFlags"
'';

4
pkgs/os-specific/linux/lxc/default.nix
View File

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "lxc-1.0.0.beta1";
name = "lxc-1.0.0.beta2";
src = fetchurl {
url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
sha256 = "1ee177c4d2ba5f9cb33c1b36f3c2160ca0b00c9fa527fc53a9c5868345306f03";
sha256 = "0w38kxpqrhrgzd057yk8xzi4lx2vzvjkn6iysnj9zibw1bzb5rbk";
};
buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];

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