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

Merge master into x-updates (the binutils change)

Browse Source
This commit is contained in:
Vladimír Čunát 2014-01-28 18:00:29 +01:00
commit 908ce109f9
44 changed files with 291 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
View File

@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
homepage = http://emacs-w3m.namazu.org/;
maintainers = [ ];
maintainers = [ stdenv.lib.maintainers.mornfall ];
};
}

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

@ -18,4 +18,9 @@ stdenv.mkDerivation rec {
-e s,@INSTALL@,$out/share/photivo, \
-i Sources/ptSettings.cpp
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = maintainers.mornfall;
};
}

3
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -39,8 +39,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
meta = {
meta = with stdenv.lib; {
homepage = http://w3m.sourceforge.net/;
description = "A text-mode web browser";
maintainers = maintainers.mornfall;
};
}

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

@ -5,17 +5,18 @@
, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
, network, networkConduit, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
, tastyQuickcheck, text, time, transformers, unixCompat, utf8String
, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic
, networkProtocolXmpp, openssh, optparseApplicative, perl
, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
, tasty, tastyHunit, tastyQuickcheck, text, time, transformers
, unixCompat, utf8String, uuid, wai, waiLogger, warp, which
, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140116";
sha256 = "18l9nflmnfaqmrq9nvypv2jwn3v2461lb4m0jjpai6aipzl91jw2";
version = "5.20140127";
sha256 = "0aqqnv0faiva9vf0nb0d8xsd659y8cyrnyy6mfjdqjqdw8wha3yr";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -25,10 +26,10 @@ cabal.mkDerivation (self: {
hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
MissingH MonadCatchIOTransformers monadControl mtl network
networkConduit networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
tastyQuickcheck text time transformers unixCompat utf8String uuid
wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
yesodForm yesodStatic
optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA
stm tasty tastyHunit tastyQuickcheck text time transformers
unixCompat utf8String uuid wai waiLogger warp xmlConduit xmlTypes
yesod yesodCore yesodDefault yesodForm yesodStatic
];
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3

21
pkgs/development/compilers/openjdk-darwin/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, ...}:
{ stdenv, fetchurl, setJavaClassPath }:
let
jdk = stdenv.mkDerivation {
jdk = stdenv.mkDerivation {
name = "openjdk6-b16-24_apr_2009-r1";
src = fetchurl {
@ -11,6 +11,23 @@ jdk = stdenv.mkDerivation {
installPhase = ''
mkdir -p $out
cp -vR * $out/
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/darwin/*_md.h $out/include/
'';
preFixup = ''
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $out/nix-support
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';
passthru.jre = jdk;

19
pkgs/development/libraries/fltk/fltk13.nix
View File

@ -1,5 +1,8 @@
{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
, automake, autoconf, libtool
}:
let inherit (composableDerivation) edf; in
@ -14,7 +17,12 @@ composableDerivation.composableDerivation {} {
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
nativeBuildInputs = [ pkgconfig ];
enableParallelBilding = true;
nativeBuildInputs = [
pkgconfig
automake autoconf libtool # only required because of patch
];
flags =
# this could be tidied up (?).. eg why does it require freeglut without glSupport?
@ -46,4 +54,11 @@ composableDerivation.composableDerivation {} {
description = "A C++ cross-platform light-weight GUI library binding";
homepage = http://www.fltk.org;
};
patches = [
# https://bugs.archlinux.org/task/36186
(fetchurl {
url = "https://bugs.archlinux.org/task/36186?getfile=10750";
sha256 = "1hpb1i87nc3zw6mgpgf3bfv557ci930bsn6rwlhaif51nlqd2wbj";
}) ];
}

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "GlomeVec";
version = "0.1.2";
sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639";
version = "0.2";
sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
meta = {
homepage = "http://www.haskell.org/haskellwiki/Glome";
description = "Simple 3D vector library";

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

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

16
pkgs/development/libraries/haskell/asn1-encoding/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ cabal, asn1Types, mtl, text, time }:
cabal.mkDerivation (self: {
pname = "asn1-encoding";
version = "0.8.1.2";
sha256 = "01i7zga9nfvccgjixnxza9mi7jj4k6308g8asnljr44s1k8rikwm";
isLibrary = true;
isExecutable = true;
buildDepends = [ asn1Types mtl text time ];
meta = {
homepage = "http://github.com/vincenthz/hs-asn1";
description = "ASN1 data reader and writer in RAW, BER and DER forms";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/libraries/haskell/asn1-parse/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, asn1Encoding, asn1Types, mtl, text, time }:
cabal.mkDerivation (self: {
pname = "asn1-parse";
version = "0.8.1";
sha256 = "021mbm5aayfx9vhxq4x1jj3gpnzq0bqaqcl1zsaa2a6l0qzpnmh9";
buildDepends = [ asn1Encoding asn1Types mtl text time ];
meta = {
homepage = "http://github.com/vincenthz/hs-asn1";
description = "Simple monadic parser for ASN1 stream types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

8
pkgs/development/libraries/haskell/diagrams/cairo.nix
View File

@ -1,14 +1,14 @@
{ cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
, filepath, lens, mtl, split, statestack, time
, filepath, hashable, lens, mtl, split, statestack, time
}:
cabal.mkDerivation (self: {
pname = "diagrams-cairo";
version = "1.0";
sha256 = "1m549ryfyfjc6sg3xi0wlcpi4c0xj6yfrpjmxgiyl76rwaqns989";
version = "1.0.1";
sha256 = "16h1xz5amn0yd3h9rss0skaq08k1cy91cncxb9ky020s0wcix9fm";
buildDepends = [
cairo colour dataDefaultClass diagramsCore diagramsLib filepath
lens mtl split statestack time
hashable lens mtl split statestack time
];
meta = {
homepage = "http://projects.haskell.org/diagrams";

12
pkgs/development/libraries/haskell/diagrams/lib.nix
View File

@ -1,16 +1,16 @@
{ cabal, active, colour, dataDefaultClass, diagramsCore, filepath
, fingertree, intervals, lens, MemoTrie, monoidExtras, NumInstances
, optparseApplicative, safe, semigroups, tagged, vectorSpace
, vectorSpacePoints
, fingertree, hashable, intervals, lens, MemoTrie, monoidExtras
, NumInstances, optparseApplicative, safe, semigroups, tagged
, vectorSpace, vectorSpacePoints
}:
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "1.0.0.1";
sha256 = "1ilkc8dh1ma0wwmzgy6x3a6q6bwlw7dfv3mb24a5ny4i3wgvsnv8";
version = "1.0.1";
sha256 = "0cjhb6dm0n4a7s8z0lyihql7dz34pdbm3ahm2p0yya4xf9pf0fw4";
buildDepends = [
active colour dataDefaultClass diagramsCore filepath fingertree
intervals lens MemoTrie monoidExtras NumInstances
hashable intervals lens MemoTrie monoidExtras NumInstances
optparseApplicative safe semigroups tagged vectorSpace
vectorSpacePoints
];

14
pkgs/development/libraries/haskell/diagrams/svg.nix
View File

@ -1,15 +1,17 @@
{ cabal, blazeSvg, colour, diagramsCore, diagramsLib, filepath
, lens, monoidExtras, mtl, split, time, vectorSpace
{ cabal, blazeMarkup, blazeSvg, colour, diagramsCore, diagramsLib
, filepath, hashable, lens, monoidExtras, mtl, split, time
, vectorSpace
}:
cabal.mkDerivation (self: {
pname = "diagrams-svg";
version = "1.0";
sha256 = "13v1q9d2004k4324b0yxlmwrsanb0mk9pz0gqfxvx9v27sry12sl";
version = "1.0.1";
sha256 = "15adic3dl4qqrd63jx1rc1w4wx270vm7zc3hr69mnh0wn0cr0ga5";
buildDepends = [
blazeSvg colour diagramsCore diagramsLib filepath lens monoidExtras
mtl split time vectorSpace
blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
hashable lens monoidExtras mtl split time vectorSpace
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams/";
description = "SVG backend for diagrams drawing EDSL";

4
pkgs/development/libraries/haskell/direct-sqlite/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "direct-sqlite";
version = "2.3.9";
sha256 = "0haq14acdijd41jvah6f6l6qlqc4wjp3mwkx57pz4q5m6qvxrz44";
version = "2.3.11";
sha256 = "0pd5qv8aq47d5n2sd99yblxiq70zvmy2rc71ys73a3d846k0ncs0";
buildDepends = [ text ];
testDepends = [ base16Bytestring HUnit text ];
meta = {

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "esqueleto";
version = "1.3.4.3";
sha256 = "1p35nzaqmpcc7slr10ihlc54kz5zv5ak0ql848m3xpbjfzq6f6vc";
version = "1.3.4.5";
sha256 = "0fw57dn67gx5v7drd4g7xbj1z614sr3lxw7gcciypnjc7qkqjgv7";
buildDepends = [
conduit monadLogger persistent resourcet tagged text transformers
unorderedContainers

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.6";
sha256 = "1nd1ima3x7bb3lhkpzfw1qbl8g8mwp1ixk2w7nf2p1200c5zs49d";
version = "0.5.6.1";
sha256 = "0hwzybihx5znd2z00kqcffqmng7vwynmav0x0zf2b9g415c2lx23";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hit";
version = "0.5.2";
sha256 = "05f5xm23049ngvsch9cp2snyknk3qknx1jlb42zi0nbv8f1hymnn";
version = "0.5.3";
sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/http-client/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-client";
version = "0.2.1";
sha256 = "1hwr8pjlal88b6clmrs0cksmyy1vmbybvr78s6kb2ppwrzmd2v8q";
version = "0.2.1.1";
sha256 = "03hcwz53sjvw3nv6xbdf24a4ny229ljq3rx89plmsxpjb44qwlq2";
buildDepends = [
base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
deepseq failure httpTypes network publicsuffixlist text time

12
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -5,14 +5,14 @@
, httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
, mimeTypes, monadControl, mtl, network, networkConduit
, publicsuffixlist, random, regexCompat, resourcet, socks, text
, time, tls, tlsExtra, transformers, transformersBase, utf8String
, void, wai, warp, warpTls, zlibConduit
, time, transformers, transformersBase, utf8String, void, wai, warp
, warpTls, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "2.0.0.3";
sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i";
version = "2.0.0.4";
sha256 = "0902sklwfb9gr1yqxp15qa4qqik75jv6pl0nfh2s4vq65sh4gndq";
buildDepends = [
conduit httpClient httpClientConduit httpClientTls httpTypes
liftedBase resourcet transformers
@ -23,8 +23,8 @@ cabal.mkDerivation (self: {
dataDefault deepseq failure filepath hspec httpClient
httpClientMultipart httpTypes HUnit liftedBase mimeTypes
monadControl mtl network networkConduit publicsuffixlist random
regexCompat resourcet socks text time tls tlsExtra transformers
transformersBase utf8String void wai warp warpTls zlibConduit
regexCompat resourcet socks text time transformers transformersBase
utf8String void wai warp warpTls zlibConduit
];
doCheck = false;
meta = {

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.1";
sha256 = "1mji8zb0chnnxl7z4dgijls6szfa6c47zmhx0v1dc9k27bnc0mhx";
version = "1.0.2.1";
sha256 = "1dq7pwimjkr0wpyjphbvjy3klkcjl8jin76am5jbz3cxk1dr20jk";
buildDepends = [
conduit liftedBase monadControl network transformers
];

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "stm-conduit";
version = "2.2.1";
sha256 = "15ym83c42krx19rw719yqlib1vcg68jmx48rihy5aimc0m5m307b";
version = "2.2.1.1";
sha256 = "0rqn6xhqhaqiy0n2g46z58zzccq1i749p97aihrvjpikrz5kypka";
buildDepends = [
async cereal cerealConduit conduit liftedAsync liftedBase
monadControl monadLoops resourcet stm stmChans 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.1";
sha256 = "1ckn90j2zmh77mgpan28v315qipw5v0ji9k3lq1ni9kzjap7pl5a";
version = "2.0.3.2";
sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi";
buildDepends = [
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase

18
pkgs/development/libraries/haskell/x509-store/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl
, pem, time, x509
}:
cabal.mkDerivation (self: {
pname = "x509-store";
version = "1.4.3";
sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01";
buildDepends = [
asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509
];
meta = {
homepage = "http://github.com/vincenthz/hs-certificate";
description = "X.509 collection accessing and storing methods";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/libraries/haskell/x509-system/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, filepath, mtl, pem, time, x509, x509Store }:
cabal.mkDerivation (self: {
pname = "x509-system";
version = "1.4.2";
sha256 = "1r22ignmwkv1z26bmnwh7prqy69cln26pfyyaf5r2vw8s66rgl39";
buildDepends = [ filepath mtl pem time x509 x509Store ];
meta = {
homepage = "http://github.com/vincenthz/hs-certificate";
description = "Handle per-operating-system X.509 accessors and storage";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

21
pkgs/development/libraries/haskell/x509-validation/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ cabal, asn1Encoding, asn1Types, byteable, cryptohash
, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl
, network, pem, time, x509, x509Store
}:
cabal.mkDerivation (self: {
pname = "x509-validation";
version = "1.5.0";
sha256 = "1xarn00ipi77whly5yjlpqa0xd25lj0jf4xk8ylp4ba58hvcxqrn";
buildDepends = [
asn1Encoding asn1Types byteable cryptohash cryptoPubkey
cryptoPubkeyTypes dataDefaultClass filepath mtl network pem time
x509 x509Store
];
meta = {
homepage = "http://github.com/vincenthz/hs-certificate";
description = "X.509 Certificate and CRL validation";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

24
pkgs/development/libraries/haskell/x509/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash
, cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
}:
cabal.mkDerivation (self: {
pname = "x509";
version = "1.4.7";
sha256 = "0bm5sijahpih2c6scz3y32904wzvmllgslg9d547cksbgy7lyx1h";
buildDepends = [
asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
filepath mtl pem time
];
testDepends = [
asn1Types cryptoPubkeyTypes HUnit mtl QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2 time
];
meta = {
homepage = "http://github.com/vincenthz/hs-certificate";
description = "X509 reader and writer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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

@ -1,15 +1,15 @@
{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet, text
, transformers, unorderedContainers, vector
{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet
, scientific, text, transformers, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.8.5.3";
sha256 = "028wxp3jcvdy63707jhxm9mmkbxz9ni1c63rb7wvzjswijp3p95b";
version = "0.8.5.4";
sha256 = "0mn1i0whqr9q6vh43x5xa0p4xxckqszhsi62warx1kjvrq4yil6f";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec conduit resourcet text transformers
aeson attoparsec conduit resourcet scientific text transformers
unorderedContainers vector
];
testDepends = [

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

@ -10,8 +10,8 @@
cabal.mkDerivation (self: {
pname = "yesod-bin";
version = "1.2.5.6";
sha256 = "1acqfg9g5xjfmpby1xham2ygvbydn0srw2c7hajvfwalc6zkxrny";
version = "1.2.5.7";
sha256 = "0vxkwdqmfi2ccknmgx0xh6w1p7bw3wi24w3c3fw80g72j9sxr5hn";
isLibrary = false;
isExecutable = true;
buildDepends = [

20
pkgs/development/libraries/java/junixsocket/darwin.patch Normal file
View File

@ -0,0 +1,20 @@
diff -rc junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java
*** junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java Tue Jul 20 14:59:41 2010
--- junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java Sun May 27 22:26:15 2012
***************
*** 43,49 ****
String prefix = "lib";
String suffix = ".so";
String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
! if ("macosx".equals(os)) {
suffix = ".dylib";
} else if ("linux".equals(os) || "freebsd".equals(os)
|| "sunos".equals(os)) {
--- 43,49 ----
String prefix = "lib";
String suffix = ".so";
String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
! if ("macosx".equals(os) || "darwin".equals(os)) {
suffix = ".dylib";
} else if ("linux".equals(os) || "freebsd".equals(os)
|| "sunos".equals(os)) {

14
pkgs/development/libraries/java/junixsocket/default.nix
View File

@ -8,11 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
};
patches = [ ./darwin.patch ];
buildInputs = [ ant jdk junit ];
preConfigure =
''
sed -i 's|/usr/bin/||' build.xml
substituteInPlace build.xml \
--replace /usr/bin/ "" \
--replace macosx darwin
substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \
--replace /opt/newsclub/lib-native $out/lib
'';
@ -20,8 +24,10 @@ stdenv.mkDerivation rec {
buildPhase = "ant";
ANT_ARGS =
"-Dskip32=true -Dant.build.javac.source=1.6"
+ stdenv.lib.optionalString stdenv.isDarwin " -DisMac=true";
# Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
(if stdenv.is64bit && !stdenv.isDarwin then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ]
++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true";
installPhase =
''
@ -34,6 +40,6 @@ stdenv.mkDerivation rec {
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;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}

2
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.urkud ];
maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
};
}

4
pkgs/development/tools/haskell/HaRe/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "HaRe";
version = "0.7.0.9";
sha256 = "1a3kf6hdzchcyb743l6ikyw3nclcy8g7a5kaj4jgxqvmss9z73f1";
version = "0.7.1.1";
sha256 = "1gh0md8gfchniclck5ddbkdwf9dl01mkcdmdx3n3f59rx9qi8g0h";
isLibrary = true;
isExecutable = true;
buildDepends = [

1
pkgs/development/tools/misc/lsof/default.nix
View File

@ -28,5 +28,6 @@ stdenv.mkDerivation {
socket (IPv6/IPv4/UNIX local), or partition (by opening a file
from it).
'';
maintainers = stdenv.lib.maintainers.mornfall;
};
}

5
pkgs/games/stepmania/default.nix
View File

@ -23,4 +23,9 @@ stdenv.mkDerivation rec {
echo "exec $out/stepmania" >> $out/bin/stepmania
chmod +x $out/bin/stepmania
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = maintainers.mornfall;
};
}

20
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -78,25 +78,25 @@ rec {
};
grsecurity_3_0_3_2_53 =
{ name = "grsecurity-3.0-3.2.53";
grsecurity_3_0_3_2_54 =
{ name = "grsecurity-3.0-3.2.54";
patch = fetchurl {
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch;
sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4";
url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201401191012.patch;
sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx";
};
features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
features.apparmor = true;
};
grsecurity_3_0_3_12_2 =
{ name = "grsecurity-3.0-3.12.2";
grsecurity_3_0_3_12_8 =
{ name = "grsecurity-3.0-3.12.8";
patch = fetchurl {
url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch;
sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783";
url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch;
sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f";
};
features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.8
features.apparmor = true;
};

1
pkgs/os-specific/linux/pam_krb5/default.nix
View File

@ -19,5 +19,6 @@ stdenv.mkDerivation {
pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV
credentials and/or use them to set up AFS tokens for a user's session.
'';
maintainers = stdenv.lib.maintainers.mornfall;
};
}

1
pkgs/servers/dict/default.nix
View File

@ -14,5 +14,6 @@ stdenv.mkDerivation {
meta = {
description = "Dict protocol server and client";
maintainers = with stdenv.lib.maintainers; mornfall;
};
}

5
pkgs/stdenv/linux/default.nix
View File

@ -296,12 +296,13 @@ rec {
extraAttrs = {
inherit (stdenvLinuxBoot3Pkgs) glibc;
inherit platform bootstrapTools;
shellPackage = stdenvLinuxBoot4Pkgs.bash;
shellPackage = stdenvLinuxBoot4Pkgs.bash;
};
overrides = pkgs: {
inherit gcc;
inherit (stdenvLinuxBoot3Pkgs) binutils glibc;
inherit (stdenvLinuxBoot3Pkgs) glibc;
inherit (stdenvLinuxBoot4Pkgs) binutils;
inherit (stdenvLinuxBoot4Pkgs)
gzip bzip2 xz bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep gnupatch patchelf

3
pkgs/tools/archivers/cpio/default.nix
View File

@ -8,10 +8,11 @@ stdenv.mkDerivation {
sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd";
};
patches = [ ./no-gets.patch ];
patches = [ ./no-gets.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch;
meta = {
homepage = http://www.gnu.org/software/cpio/;
description = "A program to create or extract from cpio archives";
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/tools/misc/less/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.greenwoodsoftware.com/less/;
description = "A more advanced file pager than ‘more’";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

11
pkgs/top-level/all-packages.nix
View File

@ -6592,11 +6592,6 @@ let
};
grsecurityOverrider = args: {
# Install gcc plugins. These are needed for compiling dependant packages.
postInstall = ''
${args.postInstall or ""}
cp "tools/gcc/"*.so $out/lib/modules/$version/build/tools/gcc/
'';
# Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins)
# include libgmp headers, so we need these extra tweaks
buildInputs = args.buildInputs ++ [ gmp ];
@ -6612,11 +6607,13 @@ let
# config options you need (e.g. by overriding extraConfig). See list of options here:
# https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
modDirVersion = "${linux_3_2.version}-grsec";
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
})) (args: grsecurityOverrider args));
linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
modDirVersion = "${linux_3_12.version}-grsec";
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ];
})) (args: grsecurityOverrider args));
linux_3_2_apparmor = lowPrio (linux_3_2.override {

12
pkgs/top-level/haskell-packages.nix
View File

@ -567,6 +567,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
asn1Data = callPackage ../development/libraries/haskell/asn1-data {};
asn1Encoding = callPackage ../development/libraries/haskell/asn1-encoding {};
asn1Parse = callPackage ../development/libraries/haskell/asn1-parse {};
asn1Types = callPackage ../development/libraries/haskell/asn1-types {};
AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
@ -2502,6 +2506,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
x509 = callPackage ../development/libraries/haskell/x509 {};
x509Store = callPackage ../development/libraries/haskell/x509-store {};
x509System = callPackage ../development/libraries/haskell/x509-system {};
x509Validation = callPackage ../development/libraries/haskell/x509-validation {};
X11 = callPackage ../development/libraries/haskell/X11 {};
X11Xft = callPackage ../development/libraries/haskell/X11-xft {};

3
pkgs/top-level/python-packages.nix
View File

@ -65,6 +65,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
ipython = import ../shells/ipython {
inherit (pkgs) stdenv fetchurl sip pyqt4;
inherit buildPythonPackage pythonPackages;
qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin
pylabQtSupport = !pkgs.stdenv.isDarwin;
pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin
};
ipythonLight = lowPrio (import ../shells/ipython {

2
pkgs/top-level/release.nix
View File

@ -12,7 +12,7 @@
{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false
, # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
}:
with import ./release-lib.nix { inherit supportedSystems; };