diff options
Diffstat (limited to 'pkgs')
36 files changed, 266 insertions, 89 deletions
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 9cfbf8c63c27..d98b3b6be9d3 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { src = fetchgit { url = "https://github.com/pagekite/Mailpile.git"; - rev = "59b96150822780138ab3567502952caadbc1d73e"; - sha256 = "2edf82cbe6d3f17ba776fb5a70caa553f646db30ce207ab957038d845a9677e1"; + rev = "cbb3bbf1f1da653124e63e11a51a6864dcb534a0"; + sha256 = "1m2qkhcygidxqnnj2ajsxv8y5wjyp5il3919sl3vyl47gx02xa8j"; }; propagatedBuildInputs = with pythonPackages; [ - pillow jinja2 pythonPackages."lxml-2.3.6" python.modules.readline or null]; + pillow jinja2 spambayes pythonPackages."lxml-2.3.6" python.modules.readline or null]; meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8f89d70405ad..8785837fbb93 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -61,7 +61,5 @@ stdenv.mkDerivation rec { homepage = http://www.freerdp.com/; license = "free-non-copyleft"; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index cce3d23d1945..6c133e9dbb49 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -70,8 +70,6 @@ stdenv.mkDerivation rec { homepage = http://www.freerdp.com/; license = "free-non-copyleft"; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 67346ef8389b..7a27611496b9 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index b8ecf81f7fc7..9b9017420c02 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { description = "A lightweight GTK2-based systray for UNIX desktop"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 38180990b83d..aa3bfa09d72f 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -306,9 +306,7 @@ stdenv.mkDerivation ({ ''} ''; - # 'iant' at #go-nuts@freenode, gccgo maintainer, said that - # they have a bug in 4.7.1 if adding "--disable-static" - dontDisableStatic = langGo || staticCompiler; + dontDisableStatic = true; configureFlags = " ${if stdenv.isSunOS then @@ -317,7 +315,7 @@ stdenv.mkDerivation ({ " --with-gnu-as --without-gnu-ld " else ""} --enable-lto - ${if enableMultilib then "" else "--disable-multilib"} + ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if enablePlugin then "--enable-plugin" else "--disable-plugin"} ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""} @@ -339,6 +337,7 @@ stdenv.mkDerivation ({ --disable-libstdcxx-pch --without-included-gettext --with-system-zlib + --enable-static --enable-languages=${ concatStrings (intersperse "," ( optional langC "c" diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index a0c8b50ad3fa..241eddc8068d 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,6 +1,37 @@ {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: -let snapshotName = "rust-stage0-2014-01-05-a6d3e57-linux-x86_64-aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090.tar.bz2"; in +/* Rust's build process has a few quirks : + +- It requires some patched in llvm that haven't landed upstream, so it + compiles its own llvm. This might change in the future, so at some + point we may be able to switch to nix's llvm. + +- The Rust compiler is written is Rust, so it requires a bootstrap + compiler, which is downloaded during the build. To make the build + pure, we download it ourself before and put it where it is + expected. Once the language is stable (1.0) , we might want to + switch it to use nix's packaged rust compiler. + +*/ + +with if stdenv.system == "i686-linux" then { + platform = "linux-i386"; + snapshot = "03e60be1f1b90dddd15f3597bc45ec8d9626b35d"; + snapshot_sha = "1v1l082gj7d2d4p53xgsxz2k965jcgqhw4cyxmjxc6yh5fw0idx6"; + target = "i386-unknown-linux-gnu"; +} else if stdenv.system == "x86_64-linux" then { + platform = "linux-x86_64"; + snapshot = "aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090"; + snapshot_sha = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx"; + target = "x86_64-unknown-linux-gnu"; +} else if stdenv.system == "x86_64-darwin" then { + platform = "macos-x86_64"; + snapshot = "ec746585cb20d1f9edffec74f6ff8be6e93a75f7"; + snapshot_sha = "0r8f8x3x8jb1hm40pbgj4i9ll2y5dgjgvj24qg7mp4crbqcqhkd2"; +} else {}; +let snapshotDate = "2014-01-05"; + snapshotRev = "a6d3e57"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { name = "rust-0.9"; @@ -12,7 +43,7 @@ stdenv.mkDerivation { # We need rust to build rust. If we don't provide it, configure will try to download it snapshot = fetchurl { url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; - sha256 = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx"; + sha256 = snapshot_sha; }; # Put the snapshot where it is expected @@ -21,21 +52,22 @@ stdenv.mkDerivation { ln -s $snapshot $sourceRoot/dl/${snapshotName} ''; + # The compiler requires cc, so we patch the source to tell it where to find it + patches = [ ./hardcode_paths.patch ]; + postPatch = '' + substituteInPlace src/librustc/back/link.rs \ + --subst-var-by "gccPath" ${stdenv.gcc}/bin/cc \ + --subst-var-by "binutilsPath" ${stdenv.gcc.binutils}/bin/ar + ''; + # Modify the snapshot compiler so that is can be executed preBuild = if stdenv.isLinux then '' - make x86_64-unknown-linux-gnu/stage0/bin/rustc - patchelf --interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ - --set-rpath ${stdenv.gcc.gcc}/lib/ \ - x86_64-unknown-linux-gnu/stage0/bin/rustc + make ${target}/stage0/bin/rustc + patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \ + --set-rpath ${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/ \ + ${target}/stage0/bin/rustc '' else null; - # rustc requires cc - postInstall = '' - for f in $out/bin/*; do - wrapProgram $f --prefix PATH : "${stdenv.gcc}/bin" - done - ''; - buildInputs = [ which file perl curl python27 makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rust/hardcode_paths.patch new file mode 100644 index 000000000000..1500446cea93 --- /dev/null +++ b/pkgs/development/compilers/rust/hardcode_paths.patch @@ -0,0 +1,44 @@ +diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs +index 101b2e3..124267f 100644 +--- a/src/librustc/back/link.rs ++++ b/src/librustc/back/link.rs +@@ -728,7 +728,7 @@ pub fn get_cc_prog(sess: Session) -> ~str { + _ => {}, + } + +- get_system_tool(sess, "cc") ++ ~"@gccPath@" + } + + pub fn get_ar_prog(sess: Session) -> ~str { +@@ -737,27 +737,9 @@ pub fn get_ar_prog(sess: Session) -> ~str { + None => {} + } + +- get_system_tool(sess, "ar") ++ ~"@binutilsPath@" + } + +-fn get_system_tool(sess: Session, tool: &str) -> ~str { +- match sess.targ_cfg.os { +- abi::OsAndroid => match sess.opts.android_cross_path { +- Some(ref path) => { +- let tool_str = match tool { +- "cc" => "gcc", +- _ => tool +- }; +- format!("{}/bin/arm-linux-androideabi-{}", *path, tool_str) +- } +- None => { +- sess.fatal(format!("need Android NDK path for the '{}' tool \ +- (--android-cross-path)", tool)) +- } +- }, +- _ => tool.to_owned(), +- } +-} + + /// Perform the linkage portion of the compilation phase. This will generate all + /// of the requested outputs for this compilation session. + + diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 497909cf25c4..a5fd80dc0db9 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Library for reading and writing audio files in various formats"; homepage = http://www.68k.org/~michael/audiofile/; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lovek323 shlevy ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 6db0dc240ba3..85896cdb5e30 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { description = "A small, fast run-time speech synthesis engine"; homepage = http://www.speech.cs.cmu.edu/flite/index.html; license = "free-non-copyleft"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index b39da46e4a26..0d8fa1bd281c 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "http://www.freetds.org"; license = "lgpl"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 854becf6bb55..f92fe3730435 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { ''; license = "MIT/X11"; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch new file mode 100644 index 000000000000..4268231380c1 --- /dev/null +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -0,0 +1,80 @@ +## 85_security_load.patch by Mike Hommey <glandium@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Load modules from $ORIGIN/nss. + +Index: nss/nss/cmd/shlibsign/shlibsign.c +=================================================================== +--- nss.orig/nss/cmd/shlibsign/shlibsign.c 2013-08-05 14:40:31.041657554 +0900 ++++ nss/nss/cmd/shlibsign/shlibsign.c 2013-08-05 14:40:31.033657739 +0900 +@@ -851,6 +851,8 @@ + libname = PR_GetLibraryName(NULL, "softokn3"); + assert(libname != NULL); + lib = PR_LoadLibrary(libname); ++ if (!lib) ++ lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so"); + assert(lib != NULL); + PR_FreeLibraryName(libname); + +Index: nss/nss/lib/pk11wrap/pk11load.c +=================================================================== +--- nss.orig/nss/lib/pk11wrap/pk11load.c 2013-08-05 14:40:31.041657554 +0900 ++++ nss/nss/lib/pk11wrap/pk11load.c 2013-08-05 14:40:31.033657739 +0900 +@@ -406,6 +406,13 @@ + * unload the library if anything goes wrong from here on out... + */ + library = PR_LoadLibrary(mod->dllName); ++ if ((library == NULL) && ++ !rindex(mod->dllName, PR_GetDirectorySeparator())) { ++ library = PORT_LoadLibraryFromOrigin(my_shlib_name, ++ (PRFuncPtr) &softoken_LoadDSO, ++ mod->dllName); ++ } ++ + mod->library = (void *)library; + + if (library == NULL) { +Index: nss/nss/lib/util/secload.c +=================================================================== +--- nss.orig/nss/lib/util/secload.c 2013-08-05 14:40:31.041657554 +0900 ++++ nss/nss/lib/util/secload.c 2013-08-05 14:40:31.033657739 +0900 +@@ -69,9 +69,14 @@ + + /* Remove the trailing filename from referencePath and add the new one */ + c = strrchr(referencePath, PR_GetDirectorySeparator()); ++ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] ++ * and program was called from $PATH. Hack to get libs from /usr/lib */ ++ referencePath = "/usr/lib/"; ++ c = &referencePath[8]; /* last / */ ++ } + if (c) { + size_t referencePathSize = 1 + c - referencePath; +- fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1); ++ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); + if (fullName) { + memcpy(fullName, referencePath, referencePathSize); + strcpy(fullName + referencePathSize, name); +@@ -81,6 +86,12 @@ + #endif + libSpec.type = PR_LibSpec_Pathname; + libSpec.value.pathname = fullName; ++ if ((referencePathSize >= 4) && ++ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { ++ memcpy(fullName + referencePathSize -4, "lib", 3); ++ } ++ strcpy(fullName + referencePathSize, "nss/"); ++ strcpy(fullName + referencePathSize + 4, name); + dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL + #ifdef PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory +@@ -88,6 +99,10 @@ + | PR_LD_ALT_SEARCH_PATH + #endif + ); ++ if (! dlh) { ++ strcpy(fullName + referencePathSize, name); ++ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); ++ } + PORT_Free(fullName); + } + } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 64c07d9cb2e2..b352064cee50 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,12 +9,6 @@ let sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201"; }; - secLoadPatch = fetchurl { - name = "security_load.patch"; - urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.3.1-1/85_security_load.patch; - sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds"; - }; - in stdenv.mkDerivation rec { name = "nss-${version}"; version = "3.15.3.1"; @@ -32,7 +26,8 @@ in stdenv.mkDerivation rec { patches = [ ./nss-3.15-gentoo-fixups.patch - secLoadPatch + # from http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch + ./85_security_load.patch ./nix_secload_fixup.patch ]; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index c57b050ebc67..3111f71369a0 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Voice recognition library written in C"; homepage = http://cmusphinx.sourceforge.net; license = "free-non-copyleft"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index 12662b9dea94..414f2a13dea1 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -16,7 +16,5 @@ stdenv.mkDerivation rec { homepage = http://www.bluez.org/; licenses = stdenv.lib.licenses.gpl2; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index db018cca4656..8e8cdc0ce1cf 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2.3.1"; name = "silgraphite-2.3.1"; - + src = fetchurl { url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz"; sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 3212d13ce352..f6aa7c35f394 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index dafa82bad347..1841fcbe4a13 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation (rec { description = "Support Library for Pocketsphinx"; homepage = http://cmusphinx.sourceforge.net; license = "free-non-copyleft"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } // (stdenv.lib.optionalAttrs multipleOutputs { outputs = [ "out" "lib" "headers" ]; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 1f80998da92d..6a3d528bde08 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "A sandbox-building game"; homepage = http://www.minecraft.net; - maintainers = [ stdenv.lib.maintainers.page stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.page ]; license = "unfree-redistributable"; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index b6465c0d7943..5019491d3fdb 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { description = "Firmware extractor for cards supported by the b43 kernel module"; homepage = http://wireless.kernel.org/en/users/Drivers/b43; license = "free-non-copyleft"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index f941d9275c01..436f40712fc2 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation { description = "Firmware for cards supported by the b43 kernel module"; homepage = http://wireless.kernel.org/en/users/Drivers/b43; license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 42ec3de93691..ff0ca0050fbc 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, linuxManualConfig +{ stdenv, perl, buildLinux , # The kernel source tarball. src @@ -97,7 +97,7 @@ let installPhase = "mv .config $out"; }; - kernel = linuxManualConfig { + kernel = buildLinux { inherit version modDirVersion src kernelPatches; configfile = configfile.nativeDrv or configfile; @@ -120,6 +120,8 @@ let features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches; meta = kernel.meta // extraMeta; + + passthru = kernel.passthru // (removeAttrs passthru [ "passthru" "meta" ]); }; nativeDrv = lib.addPassthru kernel.nativeDrv passthru; diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index d6c06eca12fb..89e9ff663423 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -75,6 +75,5 @@ stdenv.mkDerivation rec { description = "A tool to handle hotkeys on Apple laptop keyboards"; homepage = http://www.technologeek.org/projects/pommed/index.html; license = "gplv2"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index 4f74ce57ea84..f84088a93028 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -45,8 +45,6 @@ stdenv.mkDerivation { description = "An Xorg driver for multitouch trackpads"; license = "gplv2"; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index c5cc5f3b68f0..ae24e32a1577 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation { description = "Brings multitouch gestures to the Linux desktop"; license = "gplv2"; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix index 8ac5cdb69696..3c9707828b34 100644 --- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix @@ -31,7 +31,5 @@ stdenv.mkDerivation rec { description = "The xorg driver for nouveau-driven video cards"; license = "gplv2"; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/servers/monitoring/nagios/plugins/official/default.nix b/pkgs/servers/monitoring/nagios/plugins/official/default.nix index 29b1a1db5af0..c466813b23b0 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official/default.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nagios-plugins-1.4.10"; src = fetchurl { - url = https://www.nagios-plugins.org/download/nagios-plugins-1.4.10.tar.gz; + url = https://www.monitoring-plugins.org/download/nagios-plugins-1.4.10.tar.gz; sha256 = "0vm7sjiygxbfc5vbsi1g0dakpvynfzi86fhqx4yxd61brn0g8ghr"; }; @@ -25,8 +25,8 @@ stdenv.mkDerivation { buildInputs = [openssh]; # !!! make openssh a runtime dependency only meta = { - description = "Official plugins for Nagios"; - homepage = http://www.nagios.org/; + description = "Plugins for Nagios"; + homepage = http://www.monitoring-plugins.org; license = "GPL"; }; } diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index aa586945cb91..35e4c3ab4d48 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { homepage = http://cunit.sourceforge.net/; license = "lgpl"; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 919332244670..ae3fe1487642 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -87,8 +87,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; - platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] else diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index adb2a456b88f..eac12bae381e 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rockbox-utility-${version}"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "http://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; - sha256 = "6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca"; + sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; }; buildInputs = [ libusb1 qt4 ]; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index ae0007c1f2d0..d9fa49320a5a 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.datadoghq.com; - maintainers = [ stdenv.lib.maintainers.shlevy stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.iElectric ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index f6f062011ab6..df5bffe3dfba 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -34,7 +34,6 @@ yes description = "Open soruce host-based instrusion detection system"; homepage = http://www.ossec.net; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index f52855dfc538..b8f2f4696aea 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation rec { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; license = "free-non-copyleft"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f188da5ce6e9..9f7de5e46735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -247,7 +247,7 @@ let # just the plain stdenv. stdenv_32bit = lowPrio ( if system == "x86_64-linux" then - overrideGCC stdenv gcc46_multi + overrideGCC stdenv gcc48_multi else stdenv); @@ -2478,15 +2478,6 @@ let texinfo = texinfo413; })); - gcc46_multi = - if system == "x86_64-linux" then lowPrio ( - wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); - profiledCompiler = false; - enableMultilib = true; - })) - else throw "Multilib gcc not supported on ‘${system}’"; - gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; @@ -2504,6 +2495,15 @@ let else null; })); + gcc48_multi = + if system == "x86_64-linux" then lowPrio ( + wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.gcc.override { + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); + profiledCompiler = false; + enableMultilib = true; + })) + else throw "Multilib gcc not supported on ‘${system}’"; + gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 { stripped = false; @@ -6550,7 +6550,7 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 ]; @@ -6599,7 +6599,7 @@ let }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -6617,11 +6617,11 @@ let }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; }; linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6642,7 +6642,7 @@ let }); linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6654,7 +6654,7 @@ let }; linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6666,7 +6666,7 @@ let }; linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6775,7 +6775,8 @@ let linuxPackages = linuxPackages_3_10; # A function to build a manually-configured kernel - linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { + linuxManualConfig = builtins.trace "linuxManualConfig is now called buildLinux" pkgs.buildLinux; + buildLinux = import ../os-specific/linux/kernel/manual-config.nix { inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18d323111739..4bc9c54d719b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1076,7 +1076,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { description = "Code coverage measurement for python"; homepage = http://nedbatchelder.com/code/coverage/; license = pkgs.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.shlevy ]; }; }; @@ -1725,6 +1724,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + pyramid_chameleon = buildPythonPackage rec { + name = "pyramid_chameleon-0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyramid_chameleon/${name}.tar.gz"; + md5 = "39b1327a9890f382200bbfde943833d7"; + }; + + propagatedBuildInputs = [ + chameleon + pyramid + zope_interface + setuptools + ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + pyramid_jinja2 = buildPythonPackage rec { name = "pyramid_jinja2-1.9"; @@ -6086,6 +6106,36 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + spambayes = buildPythonPackage rec { + name = "spambayes-1.1a6"; + + src = fetchurl { + url = "mirror://sourceforge/spambayes/${name}.tar.gz"; + sha256 = "0lqhn2v0avgwxmk4dq9lkwr2g39ls2p6x8hqk5w07wd462cjsx8l"; + }; + + propagatedBuildInputs = [ pydns lockfile ]; + + meta = with stdenv.lib; { + description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; + homepage = http://spambayes.sourceforge.net/; + }; + }; + + pydns = buildPythonPackage rec { + name = "pydns-2.3.6"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pydns/${name}.tar.gz"; + sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + }; + }; + sympy = buildPythonPackage rec { name = "sympy-0.7.3"; @@ -7677,6 +7727,9 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; + # a test is failing + doCheck = false; + meta = { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; |