diff options
28 files changed, 204 insertions, 283 deletions
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index d1684dd9f05d..58b30269ca7a 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -48,9 +48,10 @@ in servers = mkOption { default = [ - "0.pool.ntp.org" - "1.pool.ntp.org" - "2.pool.ntp.org" + "0.nixos.pool.ntp.org" + "1.nixos.pool.ntp.org" + "2.nixos.pool.ntp.org" + "3.nixos.pool.ntp.org" ]; description = '' The set of NTP servers from which to synchronise. diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index 2f638904406b..527882aad288 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -45,9 +45,10 @@ in servers = mkOption { default = [ - "0.pool.ntp.org" - "1.pool.ntp.org" - "2.pool.ntp.org" + "0.nixos.pool.ntp.org" + "1.nixos.pool.ntp.org" + "2.nixos.pool.ntp.org" + "3.nixos.pool.ntp.org" ]; description = '' The set of NTP servers from which to synchronise. diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index e04898fba29f..5284d441b44f 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,75 +1,41 @@ -{ stdenv, fetchgit, ocaml, mupdf, lablgl, mesa -, libX11, libXext, gtk3, freetype, zlib, openjpeg -, jbig2dec, libjpeg, ncurses }: +{ stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl +, gtk3, openjpeg, jbig2dec, mujs }: -stdenv.mkDerivation { - name = "llpp-2014-05-26"; +let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; +in stdenv.mkDerivation rec { + name = "llpp-2014-11-29"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "902143de64d86b5714b3a59d2cc7085083b87249"; - sha256 = "038xl4gbvm57na2lz1fw36sf43zaxq407zi2d53985vc33677j9s"; + rev = "481c8398b2c5dc4589738f5f80104ed75b9c73ff"; + sha256 = "13zi5mzpd9j4mmm68m3zkv49xgkhswhqvmp4bbyi0psmhxak8y5l"; }; - buildInputs = [ ocaml mupdf lablgl mesa libX11 libXext gtk3 - freetype jbig2dec libjpeg openjpeg zlib ncurses ]; + buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl + gtk3 jbig2dec openjpeg mujs ]; - # The build phase was extracted from buildall.sh, because that script - # fetched the dependencies on its own. - buildPhase = '' - ccopt="-O" - ccopt="$ccopt -I ${jbig2dec}/include" - ccopt="$ccopt -I ${libjpeg}/include" - ccopt="$ccopt -I ${freetype}/include/freetype2" - ccopt="$ccopt -I ${openjpeg}/include" - ccopt="$ccopt -I ${zlib}/include" - ccopt="$ccopt -I ${mupdf}/include" - ccopt="$ccopt -include ft2build.h" - ccopt="$ccopt -D_GNU_SOURCE" - - cclib="$cclib -lmupdf" - cclib="$cclib -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lpthread" - cclib="$cclib -lX11" - cclib="$cclib -lfreetype" - - comp=ocamlc.opt - cmsuf=cmo - - sh mkhelp.sh keystoml.ml KEYS > help.ml - - $comp -c -o link.o -ccopt "$ccopt" link.c - $comp -c -o help.$cmsuf help.ml - $comp -c -o utils.$cmsuf utils.ml - $comp -c -o wsi.cmi wsi.mli - $comp -c -o wsi.$cmsuf wsi.ml - $comp -c -o parser.$cmsuf parser.ml - $comp -c -o main.$cmsuf -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl main.ml - - $comp -custom -o llpp \ - -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl \ - str.cma unix.cma lablgl.cma \ - link.o \ - -cclib "$cclib" \ - help.cmo \ - utils.cmo \ - parser.cmo \ - wsi.cmo \ - main.cmo + configurePhase = '' + sh configure.sh -O -F ${mupdf} + sed -i 's;-lopenjpeg;-lopenjp2;g' .config + sed -i 's;$builddir/link\.so;link.so;g' build.ninja ''; - # Binary fails with 'No bytecode file specified.' if stripped. - dontStrip = true; + buildPhase = "${ninja}/bin/ninja"; installPhase = '' - install -d $out/bin - install llpp llppac $out/bin + install -d $out/bin $out/lib + install build/llpp $out/bin + install link.so $out/lib + wrapProgram $out/bin/llpp \ + --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ + --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" ''; - meta = { + meta = with stdenv.lib; { homepage = http://repo.or.cz/w/llpp.git; description = "A MuPDF based PDF pager written in OCaml"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL"; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 902a22840c39..f88d7df40306 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -35,7 +35,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ goibhniu chaoflow aszlig wizeman ]; + maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index fde1547f4d4e..60befdbaad53 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { meta = { description = "Web browser"; homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with lib.maintainers; [ eelco wizeman ]; + maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index c742f414cd12..f04a5f12ea2d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; - maintainers = with stdenv.lib.maintainers; [ wizeman ]; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index d5ca3bf812e9..9f95ad59b77c 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { homepage = http://golang.org/; description = "The Go Programming language"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric wizeman ]; + maintainers = with stdenv.lib.maintainers; [ pierron viric ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix index d766f22c6adb..fdb1195bb827 100644 --- a/pkgs/development/compilers/rustc/common.nix +++ b/pkgs/development/compilers/rustc/common.nix @@ -26,7 +26,7 @@ meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan ]; + maintainers = with maintainers; [ madjar cstrahan wizeman ]; license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 06d691411fa4..9ee8cb524c2b 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1336-g394269d";}); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1635-g29e928f";}); let snapshot = if stdenv.system == "i686-linux" - then "999ba4a0dfb70adca628138a7d5f491023621140" + then "c8342e762a1720be939ed7c6a39bdaa27892f66f" else if stdenv.system == "x86_64-linux" - then "55eaaed3bd6dd5a8d08e99aa4cd618d207f87d8c" + then "7a7fe6f5ed47b9cc66261f880e166c7c8738b73e" else if stdenv.system == "i686-darwin" - then "0581dff21a238343602ec0202a551bac93d21300" + then "63e8644512bd5665c14389a83d5af564c7c0b103" else if stdenv.system == "x86_64-darwin" - then "aad290cf3f8ac4aa0661984a9799c78161ea5a72" + then "7933ae0e974d1b897806138b7052cb2b4514585f" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-18"; - snapshotRev = "9c96a79"; + snapshotDate = "2014-11-21"; + snapshotRev = "c9f6d69"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "394269d16e3752a23ffa273e68f8aaefd2a510c4"; - sha256 = "0zkz5f4gba4glhrf9f7v42qxk638q9ahgf6m0bjh8b7c3x52cv71"; + rev = "29e928f2ba3501d37660314f6186d0e2ac18b9db"; + sha256 = "1ndg920hnb8r9bblqvmqfflcrppzj68vzbhxf2zghmnx2z7svhxn"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix new file mode 100644 index 000000000000..7ef475ddab88 --- /dev/null +++ b/pkgs/development/interpreters/mujs/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, clang }: + +stdenv.mkDerivation rec { + name = "mujs-2014-11-29"; + + src = fetchgit { + url = git://git.ghostscript.com/mujs.git; + rev = "6afabf445cad0dd9afbc1f5870dba730801f09c0"; + sha256 = "1afzmncw3jvfq6smhhhsi1ywfmdpxkjpzswb86pdmdh3p04g1r0n"; + }; + + buildInputs = [ clang ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://mujs.com/; + description = "A lightweight, embeddable Javascript interpreter"; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index f64ed7e41948..dce2e363cda5 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }: stdenv.mkDerivation rec { version = "1.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; - buildInputs = [ glib pkgconfig ]; + buildInputs = [ autoreconfHook glib pkgconfig ]; meta = with stdenv.lib; { description = "A C library for reading and writing Standard MIDI Files"; diff --git a/pkgs/development/libraries/haskell/lattices/default.nix b/pkgs/development/libraries/haskell/lattices/default.nix new file mode 100644 index 000000000000..d37b6d2e8832 --- /dev/null +++ b/pkgs/development/libraries/haskell/lattices/default.nix @@ -0,0 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "lattices"; + version = "1.2.1.1"; + sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6"; + meta = { + description = "Fine-grained library for constructing and manipulating lattices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index 68db6a5dc6c1..cbfe8e8f6659 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { postUnpack = '' unpackFile ${libcxx.src} + cp -r libcxx-*/include libcxxabi*/ '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin # Hack: NIX_CFLAGS_COMPILE doesn't work here because clang++ isn't @@ -44,7 +45,7 @@ stdenv.mkDerivation { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a34dace40d8f..8bd4866cb21c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { versions of Linux (and other OSes) ''; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ wizeman ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 255468e78103..57b1b3af2d1c 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/npapi-sdk/; license = licenses.bsd3; - maintainers = with maintainers; [ wizeman ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index ba8dcc812e83..55c69b137e52 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -1,10 +1,14 @@ -{stdenv, fetchurl}: +{ stdenv +, skarnetConfCompile +, fetchurl +}: let version = "1.6.0.0"; in stdenv.mkDerivation rec { + name = "skalibs-${version}"; src = fetchurl { @@ -17,32 +21,7 @@ in stdenv.mkDerivation rec { # See http://skarnet.org/cgi-bin/archive.cgi?1:mss:75:201405:pkmodhckjklemogbplje patches = [ ./getpeereid.patch ]; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-defaultpath - printf "$out/etc" > conf-etc - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/libexec" > conf-install-libexec - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - rm -f flag-slashpackage - touch flag-allstatic - touch flag-forcedevr - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; + buildInputs = [ skarnetConfCompile ]; preInstall = '' mkdir -p "$out/etc" diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 115f66ab9834..7c273061bd11 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { substituteInPlace Makefile.config \ --subst-var-by BINDIR $out/bin \ --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ - --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl/stublibs \ + --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ --subst-var-by TKINCLUDES "" \ --subst-var-by XINCLUDES "" ''; diff --git a/pkgs/development/tools/build-managers/skarnet/default.nix b/pkgs/development/tools/build-managers/skarnet/default.nix new file mode 100644 index 000000000000..5490fcabef96 --- /dev/null +++ b/pkgs/development/tools/build-managers/skarnet/default.nix @@ -0,0 +1,21 @@ +{ stdenv }: + +let + + version = "2014-11-28"; + +in stdenv.mkDerivation { + + name = "skarnet-conf-compile-${version}"; + + phases = [ "fixupPhase" ]; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://www.skarnet.org/software/conf-compile.html; + description = "Support for configuring skarnet.org packages for nix builds"; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/development/tools/build-managers/skarnet/setup-hook.sh b/pkgs/development/tools/build-managers/skarnet/setup-hook.sh new file mode 100644 index 000000000000..e9cd02a4e7e6 --- /dev/null +++ b/pkgs/development/tools/build-managers/skarnet/setup-hook.sh @@ -0,0 +1,47 @@ +# Packages from skarnet.org use a unique build system. These functions +# assist with some common configuration and shebang patching. + +skarnetConfigure() { + runHook preConfigure + + pushd conf-compile >/dev/null + + # paths + > conf-defaultpath printf "$out/bin" + > conf-etc printf "$out/etc" + > conf-install-command printf "$out/bin" + > conf-install-include printf "$out/include" + > conf-install-libexec printf "$out/libexec" + > conf-install-library printf "$out/lib" + > conf-install-library.so printf "$out/lib" + > conf-install-sysdeps printf "$out/sysdeps" + + # use generic 'cc' to support both gcc and clang (darwin) stdenvs + for file in conf-cc conf-dynld conf-ld; do + substituteInPlace $file --replace gcc cc + done + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins conf-striplibs + + rm -f flag-slashpackage + touch flag-allstatic + touch flag-forcedevr # only used for skalibs + + # build inputs + truncate --size 0 import path-include path-library + for input in $nativeBuildInputs; do + [[ -a "$input/sysdeps" ]] && >> import printf "$input/sysdeps" + [[ -a "$input/include" ]] && >> path-include printf "$input/include" + [[ -a "$input/lib" ]] && >> path-library printf "$input/lib" + done + + popd >/dev/null + + # patch various scripts to use stdenv shell + patchShebangs src/sys + + runHook postConfigure +} + +export configurePhase=skarnetConfigure diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index a50400e492a8..b7a546a3ea06 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,36 +17,10 @@ in stdenv.mkDerivation rec { sha256 = "1s17g03z5hfpiz32g001g5wyamyvn9l36fr2csk3k7r0jkqfnl0d"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s" "${skalibs}/include" > path-include - printf "%s" "${skalibs}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://www.skarnet.org/software/s6-linux-utils/; description = "A set of minimalistic Linux-specific system utilities"; diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 039128e9df4c..491dc625cf21 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -1,4 +1,9 @@ -{stdenv, fetchurl, skalibs, execline}: +{ stdenv +, execline +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,38 +18,13 @@ in stdenv.mkDerivation rec { sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp"; }; - buildInputs = [ skalibs execline ]; + buildInputs = [ skalibs execline skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include - printf "%s\n%s" "${skalibs}/lib" "${execline}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ --replace '"execlineb"' '"${execline}/bin/execlineb"' - - patchShebangs src/sys ''; meta = { diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 8462ca0e9c69..6bfb1852f870 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,4 +1,8 @@ -{stdenv, fetchurl, skalibs}: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,37 +17,10 @@ in stdenv.mkDerivation rec { sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - printf "${skalibs}/sysdeps" > import - printf "${skalibs}/include" > path-include - printf "${skalibs}/lib" > path-library - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://skarnet.org/software/execline/; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 8da10b7eb582..650886351e6b 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,34 +17,10 @@ in stdenv.mkDerivation rec { sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/libexec" > conf-install-libexec - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s" "${skalibs}/include" > path-include - printf "%s" "${skalibs}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - preInstall = '' mkdir -p "$out/libexec" ''; diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index 9747dc587711..3b22458ebe3f 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://nethogs.sourceforge.net/; platforms = platforms.linux; - maintainers = with maintainers; [ wizeman ]; }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 881bb7dd32f4..16467e84a1e7 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,36 +17,10 @@ in stdenv.mkDerivation rec { sha256 = "1r82l5fnz2rrwm5wq2sldqp74lk9fifr0d8hyq98xdyh24hish68"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs skarnetConfCompile ]; sourceRoot = "web/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s" "${skalibs}/include" > path-include - printf "%s" "${skalibs}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://www.skarnet.org/software/s6-dns/; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 5faa2af8ba11..a4482bb71c3f 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -3,6 +3,7 @@ , fetchurl , s6Dns , skalibs +, skarnetConfCompile }: let @@ -18,41 +19,10 @@ in stdenv.mkDerivation rec { sha256 = "1np9m2j1i2450mbcjvpbb56kv3wc2fbyvmv2a039q61j2lk6vjz7"; }; - buildInputs = [ skalibs s6Dns execline ]; + buildInputs = [ skalibs s6Dns execline skarnetConfCompile ]; sourceRoot = "net/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - - rm -f path-include - rm -f path-library - for dep in "${execline}" "${s6Dns}" "${skalibs}"; do - printf "%s\n" "$dep/include" >> path-include - printf "%s\n" "$dep/lib" >> path-library - done - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - - preBuild = '' - patchShebangs src/sys - ''; - meta = { homepage = http://www.skarnet.org/software/s6-networking/; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b27e447009d..efdd46416667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4004,6 +4004,8 @@ let pythonProtobuf = pythonPackages.protobuf; }; + mujs = callPackage ../development/interpreters/mujs { }; + nix-exec = callPackage ../development/interpreters/nix-exec { nix = nixUnstable; git = gitMinimal; @@ -6831,6 +6833,8 @@ let skalibs = callPackage ../development/libraries/skalibs { }; + skarnetConfCompile = callPackage ../development/tools/build-managers/skarnet { }; + slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { @@ -10072,7 +10076,10 @@ let bison = bison2; }; - llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; }; + llpp = callPackage ../applications/misc/llpp { + inherit (ocamlPackages_4_02_1) lablgl findlib; + ocaml = ocaml_4_02_1; + }; lmms = callPackage ../applications/audio/lmms { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 60a8813b3df2..b2fc16d08c7b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1508,6 +1508,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in largeword = callPackage ../development/libraries/haskell/largeword {}; + lattices = callPackage ../development/libraries/haskell/lattices {}; + lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {}; lens = callPackage ../development/libraries/haskell/lens {}; |