diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index c3d4ae8fb51a..2f3b1eabb11d 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -119,7 +119,7 @@ $ nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc763
The name haskellPackages is really just a synonym
- for haskell.packages.ghc7101, because we prefer
+ for haskell.packages.ghc7102, because we prefer
that package set internally and recommend it to our users as their
default choice, but ultimately you are free to compile your Haskell
packages with any GHC version you please. The following command
@@ -134,7 +134,7 @@ haskell.compiler.ghc722 ghc-7.2.2
haskell.compiler.ghc742 ghc-7.4.2
haskell.compiler.ghc763 ghc-7.6.3
haskell.compiler.ghc784 ghc-7.8.4
-haskell.compiler.ghc7101 ghc-7.10.1
+haskell.compiler.ghc7102 ghc-7.10.2
haskell.compiler.ghcHEAD ghc-7.11.20150402
haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704
haskell.compiler.ghcjs ghcjs-0.1.0
@@ -167,7 +167,7 @@ $ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages
Instead of the default package set
haskellPackages, you can also use the more
- precise name haskell.compiler.ghc7101, which
+ precise name haskell.compiler.ghc7102, which
has the advantage that it refers to the same GHC version
regardless of what Nixpkgs considers "default" at any
given time.
@@ -254,7 +254,7 @@ $ nix-shell -p haskell.compiler.ghc784 --command "cabal configure"
$ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])"
[nix-shell:~]$ ghc-pkg list mtl
-/nix/store/zy79...-ghc-7.10.1/lib/ghc-7.10.1/package.conf.d:
+/nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d:
mtl-2.2.1
@@ -266,7 +266,7 @@ $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])"
{
packageOverrides = super: let self = super.pkgs; in
{
- myHaskellEnv = self.haskell.packages.ghc7101.ghcWithPackages
+ myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages
(haskellPackages: with haskellPackages; [
# libraries
arrows async cgi criterion
@@ -281,7 +281,7 @@ $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])"
nix-env -f "<nixpkgs>" -iA myHaskellEnv.
If you'd like to switch that development environment to a
different version of GHC, just replace the
- ghc7101 bit in the previous definition with the
+ ghc7102 bit in the previous definition with the
appropriate name. Of course, it's also possible to define any
number of these development environments! (You can't install two
of them into the same profile at the same time, though, because
@@ -296,11 +296,11 @@ $ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])"
$ cat $(type -p ghc)
#! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e
-export NIX_GHC=/nix/store/19sm...-ghc-7.10.1/bin/ghc
-export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.1/bin/ghc-pkg
-export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.1/share/doc/ghc/html
-export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.1/lib/ghc-7.10.1
-exec /nix/store/j50p...-ghc-7.10.1/bin/ghc "-B$NIX_GHC_LIBDIR" "$@"
+export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc
+export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg
+export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html
+export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2
+exec /nix/store/j50p...-ghc-7.10.2/bin/ghc "-B$NIX_GHC_LIBDIR" "$@"
The variables $NIX_GHC,
@@ -354,6 +354,90 @@ if [ -e ~/.nix-profile/bin/ghc ]; then
fi
+
+ How to install a compiler with libraries, hoogle and documentation indexes
+
+ If you plan to use your environment for interactive programming,
+ not just compiling random Haskell code, you might want to
+ replace ghcWithPackages in all the listings
+ above with ghcWithHoogle.
+
+
+ This environment generator not only produces an environment with
+ GHC and all the specified libraries, but also generates a
+ hoogle and haddock indexes
+ for all the packages, and provides a wrapper script around
+ hoogle binary that uses all those things. A
+ precise name for this thing would be
+ "ghcWithPackagesAndHoogleAndDocumentationIndexes",
+ which is, regrettably, too long and scary.
+
+
+ For example, installing the following environment
+
+
+{
+ packageOverrides = super: let self = super.pkgs; in
+ {
+ myHaskellEnv = self.haskellPackages.ghcWithHoogle
+ (haskellPackages: with haskellPackages; [
+ # libraries
+ arrows async cgi criterion
+ # tools
+ cabal-install haskintex
+ ]);
+ };
+}
+
+
+ allows one to browse module documentation index not
+ too dissimilar to this for all the specified packages and
+ their dependencies by directing a browser of choice to
+ ~/.nix-profiles/share/doc/hoogle/index.html
+ (or
+ /run/current-system/sw/share/doc/hoogle/index.html
+ in case you put it in
+ environment.systemPackages in NixOS).
+
+
+ After you've marveled enough at that try adding the following to
+ your ~/.ghc/ghci.conf
+
+
+:def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\""
+:def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\""
+
+
+ and test it by typing into ghci:
+
+
+:hoogle a -> a
+:doc a -> a
+
+
+ Be sure to note the links to haddock files in
+ the output. With any modern and properly configured terminal
+ emulator you can just click those links to navigate there.
+
+
+ Finally, you can run
+
+
+hoogle server -p 8080
+
+
+ and navigate to for
+ your own local Hoogle.
+ Note, however, that Firefox and possibly other browsers disallow
+ navigation from http: to
+ file: URIs for security reasons, which might
+ be quite an inconvenience. See this
+ page for workarounds.
+
+
How to create ad hoc environments for
<literal>nix-shell</literal>
@@ -371,7 +455,7 @@ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc
shell.nix that looks like this:
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }:
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }:
let
inherit (nixpkgs) pkgs;
ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [
@@ -451,7 +535,7 @@ $ cabal2nix . >foo.nix
default.nix:
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }:
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }:
nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { }
@@ -459,7 +543,7 @@ nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { }
shell.nix:
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7101" }:
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }:
(import ./default.nix { inherit nixpkgs compiler; }).env
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 1556ffd057f9..7ba24db2e050 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -899,6 +899,34 @@ following:
phase.
+
+ separateDebugInfo
+ If set to true, the standard
+ environment will enable debug information in C/C++ builds. After
+ installation, the debug information will be separated from the
+ executables and stored in the output named
+ debug. (This output is enabled automatically;
+ you don’t need to set the outputs attribute
+ explicitly.) To be precise, the debug information is stored in
+ debug/lib/debug/.build-id/XX/YYYY…,
+ where XXYYYY… is the build
+ ID of the binary — a SHA-1 hash of the contents of
+ the binary. Debuggers like GDB use the build ID to look up the
+ separated debug information.
+
+ For example, with GDB, you can add
+
+
+set debug-file-directory ~/.nix-profile/lib/debug
+
+
+ to ~/.gdbinit. GDB will then be able to find
+ debug information installed via nix-env
+ -i.
+
+
+
+
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 2300ee9c000b..5aad76e75e4d 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -78,6 +78,26 @@ rec {
listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));
+ /* Filter an attribute set recursivelly by removing all attributes for
+ which the given predicate return false.
+
+ Example:
+ filterAttrsRecursive (n: v: v != null) { foo = { bar = null; }; }
+ => { foo = {}; }
+ */
+ filterAttrsRecursive = pred: set:
+ listToAttrs (
+ concatMap (name:
+ let v = set.${name}; in
+ if pred name v then [
+ (nameValuePair name (
+ if isAttrs v then filterAttrsRecursive pred v
+ else v
+ ))
+ ] else []
+ ) (attrNames set)
+ );
+
/* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list:
foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]
=> { a = [ 2 3 ]; }
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b43b8385f550..5e9ab78a9559 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -7,6 +7,7 @@
so it's easy to ping a package @maintainer.
*/
+ a1russell = "Adam Russell ";
abaldeau = "Andreas Baldeau ";
abbradar = "Nikolay Amiantov ";
adev = "Adrien Devresse ";
@@ -69,6 +70,7 @@
cstrahan = "Charles Strahan ";
cwoac = "Oliver Matthews ";
DamienCassou = "Damien Cassou ";
+ davidak = "David Kleuker ";
davidrusu = "David Rusu ";
dbohdan = "Danyil Bohdan ";
DerGuteMoritz = "Moritz Heidkamp ";
@@ -79,6 +81,7 @@
dfoxfranke = "Daniel Fox Franke ";
dmalikov = "Dmitry Malikov ";
doublec = "Chris Double ";
+ ebzzry = "Rommel Martinez ";
ederoyd46 = "Matthew Brown ";
eduarrrd = "Eduard Bachmakov ";
edwtjo = "Edward Tjörnhammar ";
@@ -88,6 +91,7 @@
emery = "Emery Hemingway ";
epitrochoid = "Mabry Cervin ";
ericbmerritt = "Eric Merritt ";
+ erikryb = "Erik Rybakken ";
ertes = "Ertugrul Söylemez ";
exlevan = "Alexey Levan ";
falsifian = "James Cook ";
@@ -95,6 +99,7 @@
fluffynukeit = "Daniel Austin ";
forkk = "Andrew Okin ";
fpletz = "Franz Pletz ";
+ fridh = "Frederik Rietdijk ";
fro_ozen = "fro_ozen ";
ftrvxmtrx = "Siarhei Zirukin ";
funfunctor = "Edward O'Callaghan ";
@@ -104,6 +109,7 @@
garrison = "Jim Garrison ";
gavin = "Gavin Rogers ";
gebner = "Gabriel Ebner ";
+ gfxmonk = "Tim Cuthbertson ";
giogadi = "Luis G. Torres ";
globin = "Robin Gloster ";
goibhniu = "Cillian de Róiste ";
@@ -137,6 +143,7 @@
jwilberding = "Jordan Wilberding ";
jzellner = "Jeff Zellner ";
kamilchm = "Kamil Chmielewski ";
+ khumba = "Bryan Gardiner ";
kkallio = "Karn Kallio ";
koral = "Koral ";
kovirobi = "Kovacsics Robert ";
@@ -229,6 +236,7 @@
rszibele = "Richard Szibele ";
rushmorem = "Rushmore Mushambi ";
rycee = "Robert Helgesson ";
+ samuelrivas = "Samuel Rivas ";
sander = "Sander van der Burg ";
schmitthenner = "Fabian Schmitthenner ";
schristo = "Scott Christopher ";
diff --git a/lib/types.nix b/lib/types.nix
index a7f9bf1946e6..7276f9af9fee 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -6,7 +6,7 @@ with import ./attrsets.nix;
with import ./options.nix;
with import ./trivial.nix;
with import ./strings.nix;
-with {inherit (import ./modules.nix) mergeDefinitions; };
+with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; };
rec {
@@ -166,6 +166,23 @@ rec {
substSubModules = m: loaOf (elemType.substSubModules m);
};
+ # List or element of ...
+ loeOf = elemType: mkOptionType {
+ name = "element or list of ${elemType.name}s";
+ check = x: isList x || elemType.check x;
+ merge = loc: defs:
+ let
+ defs' = filterOverrides defs;
+ res = (head defs').value;
+ in
+ if isList res then concatLists (getValues defs')
+ else if lessThan 1 (length defs') then
+ throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
+ else if !isString res then
+ throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
+ else res;
+ };
+
uniq = elemType: mkOptionType {
inherit (elemType) name check;
merge = mergeOneOption;
diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh
deleted file mode 100755
index 63b309c5a77c..000000000000
--- a/maintainers/scripts/gnome-latest.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env bash
-
-GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
-
-project=$1
-
-if [ "$project" == "--help" ]; then
- echo "Usage: $0 project [major.minor]"
- exit 0
-fi
-
-baseVersion=$2
-
-if [ -z "$project" ]; then
- echo "No project specified, exiting"
- exit 1
-fi
-
-# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
-# any conversations with sysadmin. Somehow lftp works.
-if [ "$FTP_CLIENT" = "lftp" ]; then
- ls_ftp() {
- lftp -c "open $1; cls"
- }
-else
- ls_ftp() {
- curl -l "$1"/
- }
-fi
-
-if [ -z "$baseVersion" ]; then
- echo "Looking for available versions..." >&2
- available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
- echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
- echo -en "Choose one of them: " >&2
- read baseVersion
-fi
-
-FTPDIR="${GNOME_FTP}/${project}/${baseVersion}"
-
-#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
-# gnome's LATEST-IS is broken. Do not trust it.
-
-files=$(ls_ftp "${FTPDIR}")
-declare -A versions
-
-for f in $files; do
- case $f in
- (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
- ;;
- ($project-*.*.9*.tar.*):
- tmp=${f#$project-}
- tmp=${tmp%.tar*}
- echo "Ignored unstable version ${tmp}" >&2
- ;;
- ($project-*.tar.*):
- tmp=${f#$project-}
- tmp=${tmp%.tar*}
- versions[${tmp}]=1
- ;;
- (*):
- echo "UNKNOWN FILE $f"
- ;;
- esac
-done
-echo "Found versions ${!versions[@]}" >&2
-version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
-echo "Latest version is: ${version}" >&2
-
-name=${project}-${version}
-echo "Fetching .sha256 file" >&2
-curl -O http://${FTPDIR}/${name}.sha256sum
-
-extensions=( "xz" "bz2" "gz" )
-echo "Choosing archive extension (known are ${extensions[@]})..." >&2
-for ext in ${extensions[@]}; do
- if grep "\\.tar\\.${ext}$" ${name}.sha256sum >& /dev/null; then
- ext_pref=$ext
- sha256=$(grep "\\.tar\\.${ext}$" ${name}.sha256sum | cut -f1 -d\ )
- break
- fi
-done
-sha256=`nix-hash --to-base32 --type sha256 $sha256`
-echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
-
-cat <&2
diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
new file mode 100755
index 000000000000..cd2c57774036
--- /dev/null
+++ b/maintainers/scripts/gnome.sh
@@ -0,0 +1,138 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+
+GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
+
+usage() {
+ echo "Usage: $0 show|update project [major.minor]" >&2
+ exit 0
+}
+
+if [ "$#" -lt 1 ]; then
+ usage
+fi
+
+action="$1"
+project="$2"
+majorVersion="$3"
+
+if [ "$action" != "show" ] && [ "$action" != "update" ]; then
+ echo "Unknown action $action" >&2
+ usage
+fi
+
+if [ -z "$project" ]; then
+ echo "No project specified, exiting"
+ exit 1
+fi
+
+# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
+# any conversations with sysadmin. Somehow lftp works.
+if [ "$FTP_CLIENT" = "lftp" ]; then
+ ls_ftp() {
+ lftp -c "open $1; cls"
+ }
+else
+ ls_ftp() {
+ curl -s -l "$1"/
+ }
+fi
+
+if [ -z "$majorVersion" ]; then
+ echo "Looking for available versions..." >&2
+ available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
+ if [ "$?" -ne "0" ]; then
+ echo "Project $project not found" >&2
+ exit 1
+ fi
+
+ echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
+ echo -en "Choose one of them: " >&2
+ read majorVersion
+fi
+
+if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then
+ # not a major version
+ version="$majorVersion"
+ majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2)
+fi
+
+FTPDIR="${GNOME_FTP}/${project}/${majorVersion}"
+
+#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
+# gnome's LATEST-IS is broken. Do not trust it.
+
+if [ -z "$version" ]; then
+ files=$(ls_ftp "${FTPDIR}")
+ declare -A versions
+
+ for f in $files; do
+ case $f in
+ (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
+ ;;
+ ($project-*.*.9*.tar.*):
+ tmp=${f#$project-}
+ tmp=${tmp%.tar*}
+ echo "Ignored unstable version ${tmp}" >&2
+ ;;
+ ($project-*.tar.*):
+ tmp=${f#$project-}
+ tmp=${tmp%.tar*}
+ versions[${tmp}]=1
+ ;;
+ (*):
+ echo "UNKNOWN FILE $f"
+ ;;
+ esac
+ done
+ echo "Found versions ${!versions[@]}" >&2
+ version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
+ echo "Latest version is: ${version}" >&2
+fi
+
+name=${project}-${version}
+echo "Fetching .sha256 file" >&2
+sha256out=$(curl -s -f http://${FTPDIR}/${name}.sha256sum)
+
+if [ "$?" -ne "0" ]; then
+ echo "Version not found" >&2
+ exit 1
+fi
+
+extensions=( "xz" "bz2" "gz" )
+echo "Choosing archive extension (known are ${extensions[@]})..." >&2
+for ext in ${extensions[@]}; do
+ if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then
+ ext_pref=$ext
+ sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ )
+ break
+ fi
+done
+echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
+
+src="# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = \"${project}-${version}\";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/${project}/${majorVersion}/${project}-${version}.tar.${ext_pref};
+ sha256 = \"${sha256}\";
+ };
+}"
+
+if [ "$action" == "update" ]; then
+ # find project in nixpkgs tree
+ GNOME_TOP=$(readlink -e $(dirname "${BASH_SOURCE[0]}")"/../../pkgs/desktops/gnome-3/")
+ projectPath=$(find "$GNOME_TOP" -name "$project" -print)
+ if [ -z "$projectPath" ]; then
+ echo "Project $project not found under $GNOME_TOP"
+ exit 1
+ fi
+
+ echo "Updating $projectPath/src.nix"
+ echo -e "$src" > "$projectPath/src.nix"
+else
+ echo -e "\n$src"
+fi
\ No newline at end of file
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index d7d3d1a7fb13..098613f9685a 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -6,35 +6,48 @@
Release 15.09 (“Dingo”, 2015/09/??)
-In addition to numerous new and upgraded packages, this release has the following highlights:
+In addition to numerous new and upgraded packages, this release
+has the following highlights:
-
-
-
- The Haskell packages infrastructure has been re-designed from the ground up.
- NixOS now distributes the latest version of every single package registered on
- Hackage, i.e. well over
- 8000 Haskell packages. Further information and usage instructions for the
- improved infrastructure are available at https://nixos.org/wiki/Haskell.
- Users migrating from an earlier release will find also find helpful information
- below, in the list of backwards-incompatible changes.
-
-
+
-
-
- Users running an SSH server who worry about the quality of their
- /etc/ssh/moduli file with respect to the vulnerabilities
- discovered in the Diffie-Hellman key exchange can now replace OpenSSH's
- default version with one they generated themselves using the new
- services.openssh.moduliFile option.
-
-
-
+
+ The Haskell packages infrastructure has been re-designed
+ from the ground up. NixOS now distributes the latest version of
+ every single package registered on Hackage, i.e. well
+ over 8000 Haskell packages. Further information and usage
+ instructions for the improved infrastructure are available at
+ https://nixos.org/wiki/Haskell.
+ Users migrating from an earlier release will also find helpful
+ information below, in the list of backwards-incompatible changes.
+
-
+
+ Nix has been updated to version 1.10, which among other
+ improvements enables cryptographic signatures on binary caches for
+ improved security.
+
+
+
+ You can now keep your NixOS system up to date automatically
+ by setting
+
+
+system.autoUpgrade.enable = true;
+
+
+ This will cause the system to periodically check for updates in
+ your current channel and run nixos-rebuild.
+
+
+
+ This release is based on Glibc 2.21, GCC 4.9 and Linux
+ 3.18.
+
+
+
When upgrading from a previous release, please be aware of the
@@ -50,10 +63,11 @@ and want to continue to use them, please set
system.stateVersion = "14.12";
-(The new option ensures that
+The new option ensures that
certain configuration changes that could break existing systems (such
as the sshd host key setting) will maintain
-compatibility with the specified NixOS release.)
+compatibility with the specified NixOS release. NixOps sets the state
+version of existing deployments automatically.
cron is no longer enabled by
default, unless you have a non-empty
@@ -72,9 +86,9 @@ false.
and old steam package -- to steamOriginal.
-CMPlayer has been renamed to bomi upstream. Package cmplayer
-was accordingly renamed to bomi
-
+CMPlayer has been renamed to bomi upstream. Package
+cmplayer was accordingly renamed to
+bomi
Atom Shell has been renamed to Electron upstream. Package atom-shell
was accordingly renamed to electron
@@ -84,21 +98,20 @@ was accordingly renamed to electron
which contains the latest Elm platform.
-
- The CUPS printing service has been updated to version 2.0.2.
- Furthermore its systemd service has been renamed to cups.service.
-
-
- Local printers are no longer shared or advertised by default. This behavior
- can be changed by enabling services.printing.defaultShared
- or services.printing.browsing respectively.
-
+ The CUPS printing service has been updated to version
+ 2.0.2. Furthermore its systemd service has been
+ renamed to cups.service.
+
+ Local printers are no longer shared or advertised by
+ default. This behavior can be changed by enabling
+ services.printing.defaultShared or
+ services.printing.browsing respectively.
- The VirtualBox host and guest options have been moved/renamed more
- consistently and less confusing to be now found in
+ The VirtualBox host and guest options have been named more
+ consistently. They can now found in
virtualisation.virtualbox.host.* instead of
services.virtualboxHost.* and
virtualisation.virtualbox.guest.* instead of
@@ -207,25 +220,31 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install
-The following new services were added since the last release:
-
-
-brltty
-marathon
-tvheadend
-
-
-
-
Other notable improvements:
+
The nixos and nixpkgs channels were unified,
so one can use nix-env -iA nixos.bash
instead of nix-env -iA nixos.pkgs.bash.
See the commit for details.
+
+
+
+ Users running an SSH server who worry about the quality of their
+ /etc/ssh/moduli file with respect to the
+ vulnerabilities
+ discovered in the Diffie-Hellman key exchange can now
+ replace OpenSSH's default version with one they generated
+ themselves using the new
+ services.openssh.moduliFile option.
+
+
+
+
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 2781cee36148..2745fb2cbe42 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -7,21 +7,39 @@
Unstable
When upgrading from a previous release, please be aware of the
- following incompatible changes:
+following incompatible changes:
+
+
+
+ wmiiSnap has been replaced with
+ wmii_hg, but
+ services.xserver.windowManager.wmii.enable has
+ been updated respectively so this only affects you if you have
+ explicitly installed wmiiSnap.
+
+
+
+
+ wmiimenu is removed, as it has been
+ removed by the developers upstream. Use wimenu
+ from the wmii-hg package.
+
+
+
+ Gitit is no longer automatically added to the module list in
+ NixOS and as such there will not be any manual entries for it. You
+ will need to add an import statement to your NixOS configuration
+ in order to use it, e.g.
+
+ ];
+}
+]]>
+
+ will include the Gitit service configuration options.
+
+
+
-
-
- wmiiSnap has been replaced with
- wmii_hg, but
- services.xserver.windowManager.wmii.enable
- has been updated respectively so this only affects you if you
- have explicitly installed wmiiSnap.
-
-
- wmiimenu is removed, as it has been removed by
- the developers upstream. Use wimenu from the
- wmii-hg package.
-
-
-
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 922a9cf961df..be6662decea6 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -108,10 +108,8 @@ with lib;
subpixel = {
rgba = mkOption {
- type = types.string // {
- check = flip elem ["rgb" "bgr" "vrgb" "vbgr" "none"];
- };
default = "rgb";
+ type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"];
description = ''
Subpixel order, one of none,
rgb, bgr,
@@ -120,10 +118,8 @@ with lib;
};
lcdfilter = mkOption {
- type = types.str // {
- check = flip elem ["none" "default" "light" "legacy"];
- };
default = "default";
+ type = types.enum ["none" "default" "light" "legacy"];
description = ''
FreeType LCD filter, one of none,
default, light, or
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 3622b21626b3..f58e540a6e5c 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -52,6 +52,15 @@ in
'';
};
+ consoleUseXkbConfig = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If set, configure the console keymap from the xserver keyboard
+ settings.
+ '';
+ };
+
consoleKeyMap = mkOption {
type = mkOptionType {
name = "string or path";
@@ -74,6 +83,13 @@ in
config = {
+ i18n.consoleKeyMap = with config.services.xserver;
+ mkIf config.i18n.consoleUseXkbConfig
+ (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
+ '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \
+ -option '${xkbOptions}' -variant '${xkbVariant}' > "$out"
+ '');
+
environment.systemPackages =
optional (config.i18n.supportedLocales != []) glibcLocales;
diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index 1a01533c585b..c87996df8855 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -108,7 +108,7 @@ in
extraConfig = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
the end of the nslcd configuration file (nslcd.conf).
@@ -120,7 +120,7 @@ in
distinguishedName = mkOption {
default = "";
example = "cn=admin,dc=example,dc=com";
- type = types.string;
+ type = types.str;
description = ''
The distinguished name to bind to the LDAP server with. If this
is not specified, an anonymous bind will be done.
@@ -129,7 +129,7 @@ in
password = mkOption {
default = "/etc/ldap/bind.password";
- type = types.string;
+ type = types.str;
description = ''
The path to a file containing the credentials to use when binding
to the LDAP server (if not binding anonymously).
@@ -149,7 +149,7 @@ in
policy = mkOption {
default = "hard_open";
- type = types.string;
+ type = types.enum [ "hard_open" "hard_init" "soft" ];
description = ''
Specifies the policy to use for reconnecting to an unavailable
LDAP server. The default is hard_open, which
@@ -168,7 +168,7 @@ in
extraConfig = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
the end of the ldap configuration file (ldap.conf).
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index bff0b2991323..533280890a70 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -41,20 +41,7 @@ in
strings. The latter is concatenated, interspersed with colon
characters.
'';
- type = types.attrsOf (mkOptionType {
- name = "a string or a list of strings";
- merge = loc: defs:
- let
- defs' = filterOverrides defs;
- res = (head defs').value;
- in
- if isList res then concatLists (getValues defs')
- else if lessThan 1 (length defs') then
- throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
- else if !isString res then
- throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
- else res;
- });
+ type = types.attrsOf (types.loeOf types.str);
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
};
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index 3ab32f00fd1d..3362400326d2 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -23,20 +23,7 @@ in
strings. The latter is concatenated, interspersed with colon
characters.
'';
- type = types.attrsOf (mkOptionType {
- name = "a string or a list of strings";
- merge = loc: defs:
- let
- defs' = filterOverrides defs;
- res = (head defs').value;
- in
- if isList res then concatLists (getValues defs')
- else if lessThan 1 (length defs') then
- throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
- else if !isString res then
- throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
- else res;
- });
+ type = types.attrsOf (types.loeOf types.str);
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
};
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 3a9a09ee87c1..748ada99be69 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -103,16 +103,23 @@ in
[ "/bin"
"/etc/xdg"
"/info"
- "/lib"
+ "/lib" # FIXME: remove
+ #"/lib/debug/.build-id" # enables GDB to find separated debug info
"/man"
"/sbin"
+ "/share/applications"
+ "/share/desktop-directories"
"/share/doc"
"/share/emacs"
+ "/share/icons"
"/share/info"
"/share/man"
+ "/share/menus"
+ "/share/mime"
"/share/nano"
"/share/org"
"/share/terminfo"
+ "/share/themes"
"/share/vim-plugins"
];
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 1e5393f26b54..b0e9ceea10b3 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -229,6 +229,10 @@
riak = 205;
shout = 206;
gateone = 207;
+ namecoin = 208;
+ dnschain = 209;
+ #lxd = 210; # unused
+ kibana = 211;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -436,6 +440,10 @@
riak = 205;
#shout = 206; #unused
gateone = 207;
+ namecoin = 208;
+ #dnschain = 209; #unused
+ lxd = 210; # unused
+ #kibana = 211;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6734fa0b862b..b03f4494522b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -197,7 +197,7 @@
./services/misc/etcd.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix
- ./services/misc/gitit.nix
+ #./services/misc/gitit.nix
./services/misc/gitlab.nix
./services/misc/gitolite.nix
./services/misc/gpsd.nix
@@ -275,6 +275,7 @@
./services/networking/ddclient.nix
./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix
+ ./services/networking/dnschain.nix
./services/networking/dnscrypt-proxy.nix
./services/networking/dnsmasq.nix
./services/networking/docker-registry-server.nix
@@ -303,6 +304,7 @@
./services/networking/minidlna.nix
./services/networking/mstpd.nix
./services/networking/murmur.nix
+ ./services/networking/namecoind.nix
./services/networking/nat.nix
./services/networking/networkmanager.nix
./services/networking/ngircd.nix
@@ -363,6 +365,7 @@
./services/scheduling/fcron.nix
./services/scheduling/marathon.nix
./services/search/elasticsearch.nix
+ ./services/search/kibana.nix
./services/search/solr.nix
./services/security/clamav.nix
./services/security/fail2ban.nix
@@ -372,6 +375,7 @@
./services/security/haveged.nix
./services/security/hologram.nix
./services/security/munge.nix
+ ./services/security/physlock.nix
./services/security/torify.nix
./services/security/tor.nix
./services/security/torsocks.nix
@@ -393,7 +397,6 @@
./services/web-servers/lighttpd/default.nix
./services/web-servers/lighttpd/gitweb.nix
./services/web-servers/nginx/default.nix
- ./services/web-servers/nginx/reverse_proxy.nix
./services/web-servers/phpfpm.nix
./services/web-servers/shellinabox.nix
./services/web-servers/tomcat.nix
@@ -486,6 +489,7 @@
./virtualisation/docker.nix
./virtualisation/libvirtd.nix
./virtualisation/lxc.nix
+ ./virtualisation/lxd.nix
./virtualisation/amazon-options.nix
./virtualisation/openvswitch.nix
./virtualisation/parallels-guest.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index c207829aabd6..9aa0034783fa 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -47,7 +47,7 @@
];
# Include support for various filesystems.
- boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" "cifs" ];
+ boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
# Configure host id for ZFS to work
networking.hostId = "8425e349";
diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix
index d1b1915eea91..98df9b94380f 100644
--- a/nixos/modules/programs/cdemu.nix
+++ b/nixos/modules/programs/cdemu.nix
@@ -9,19 +9,28 @@ in {
programs.cdemu = {
enable = mkOption {
default = false;
- description = "Whether to enable cdemu for users of appropriate group (default cdrom)";
+ description = ''
+ cdemu for members of
+ .
+ '';
};
group = mkOption {
default = "cdrom";
- description = "Required group for users of cdemu";
+ description = ''
+ Group that users must be in to use cdemu.
+ '';
};
gui = mkOption {
default = true;
- description = "Whether to install cdemu GUI (gCDEmu)";
+ description = ''
+ Whether to install the cdemu GUI (gCDEmu).
+ '';
};
image-analyzer = mkOption {
default = true;
- description = "Whether to install image analyzer";
+ description = ''
+ Whether to install the image analyzer.
+ '';
};
};
};
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 3b5ae07e82f7..ca3188b18199 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -41,7 +41,7 @@ in
dates = mkOption {
default = "*:0/15";
- type = types.string;
+ type = types.str;
description = ''
Specification (in the format described by
systemd.time
@@ -52,7 +52,7 @@ in
user = mkOption {
default = "root";
- type = types.string;
+ type = types.str;
description = ''
User for running venus script.
'';
@@ -60,7 +60,7 @@ in
group = mkOption {
default = "root";
- type = types.string;
+ type = types.str;
description = ''
Group for running venus script.
'';
@@ -68,7 +68,7 @@ in
name = mkOption {
default = "NixOS Planet";
- type = types.string;
+ type = types.str;
description = ''
Your planet's name.
'';
@@ -76,7 +76,7 @@ in
link = mkOption {
default = "http://planet.nixos.org";
- type = types.string;
+ type = types.str;
description = ''
Link to the main page.
'';
@@ -84,7 +84,7 @@ in
ownerName = mkOption {
default = "Rok Garbas";
- type = types.string;
+ type = types.str;
description = ''
Your name.
'';
@@ -92,7 +92,7 @@ in
ownerEmail = mkOption {
default = "some@example.com";
- type = types.string;
+ type = types.str;
description = ''
Your e-mail address.
'';
diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix
index 8e7d0e51a4e0..1ed929ed4afa 100644
--- a/nixos/modules/programs/wvdial.nix
+++ b/nixos/modules/programs/wvdial.nix
@@ -24,7 +24,7 @@ in
dialerDefaults = mkOption {
default = "";
- type = types.string;
+ type = types.str;
example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
description = ''
Contents of the "Dialer Defaults" section of
@@ -40,7 +40,7 @@ in
persist
noauth
'';
- type = types.string;
+ type = types.str;
description = "Default ppp settings for wvdial.";
};
diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
index d30a85922cff..90b6304fa999 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -32,25 +32,25 @@ in
};
fileSystem = mkOption {
- type = types.string;
+ type = types.str;
description = "XFS filesystem hosting the xfs_quota project.";
default = "/";
};
path = mkOption {
- type = types.string;
+ type = types.str;
description = "Project directory.";
};
sizeSoftLimit = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "30g";
description = "Soft limit of the project size";
};
sizeHardLimit = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "50g";
description = "Hard limit of the project size.";
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index cb378b024490..62be7dc6cae2 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -165,5 +165,6 @@ in zipModules ([]
++ obsolete' [ "services" "syslog-ng" "serviceName" ]
++ obsolete' [ "services" "syslog-ng" "listenToJournal" ]
++ obsolete' [ "ec2" "metadata" ]
+++ obsolete' [ "services" "openvpn" "enable" ]
)
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 474b93b4984d..88760574cbc6 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -419,7 +419,7 @@ in
users.motd = mkOption {
default = null;
example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178.";
- type = types.nullOr types.string;
+ type = types.nullOr types.lines;
description = "Message of the day shown to users when they log in.";
};
diff --git a/nixos/modules/security/prey.nix b/nixos/modules/security/prey.nix
index e29fa5395a1a..1c643f2e1a57 100644
--- a/nixos/modules/security/prey.nix
+++ b/nixos/modules/security/prey.nix
@@ -16,19 +16,28 @@ in {
default = false;
type = types.bool;
description = ''
- Enables http://preyproject.com/ bash client. Be sure to specify api and device keys.
- Once setup, cronjob will run evert 15 minutes and report status.
+ Enables the
+ shell client. Be sure to specify both API and device keys.
+ Once enabled, a cron job will run every 15
+ minutes to report status information.
'';
};
deviceKey = mkOption {
- type = types.string;
- description = "Device Key obtained from https://panel.preyproject.com/devices (and clicking on the device)";
+ type = types.str;
+ description = ''
+ Device key obtained by visiting
+
+ and clicking on your device.
+ '';
};
apiKey = mkOption {
- type = types.string;
- description = "API key obtained from https://panel.preyproject.com/profile";
+ type = types.str;
+ description = ''
+ API key obtained from
+ .
+ '';
};
};
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 9e3ae66f808b..69f3c3f8a758 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -169,14 +169,17 @@ in {
type = types.bool;
default = false;
description = ''
- Whether to enable Bacula File Daemon.
+ Whether to enable the Bacula File Daemon.
'';
};
name = mkOption {
default = "${config.networking.hostName}-fd";
description = ''
- The client name that must be used by the Director when connecting. Generally, it is a good idea to use a name related to the machine so that error messages can be easily identified if you have multiple Clients. This directive is required.
+ The client name that must be used by the Director when connecting.
+ Generally, it is a good idea to use a name related to the machine
+ so that error messages can be easily identified if you have multiple
+ Clients. This directive is required.
'';
};
@@ -184,7 +187,9 @@ in {
default = 9102;
type = types.int;
description = ''
- This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in the Client resource of the Director's configuration file. The default is 9102.
+ This specifies the port number on which the Client listens for
+ Director connections. It must agree with the FDPort specified in
+ the Client resource of the Director's configuration file.
'';
};
@@ -202,7 +207,7 @@ in {
description = ''
Extra configuration to be passed in Client directive.
'';
- example = ''
+ example = literalExample ''
Maximum Concurrent Jobs = 20;
Heartbeat Interval = 30;
'';
@@ -213,7 +218,7 @@ in {
description = ''
Extra configuration to be passed in Messages directive.
'';
- example = ''
+ example = literalExample ''
console = all
'';
};
diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
index 5f2b4e76aeeb..6e4721ded68b 100644
--- a/nixos/modules/services/backup/sitecopy-backup.nix
+++ b/nixos/modules/services/backup/sitecopy-backup.nix
@@ -21,15 +21,16 @@ in
enable = mkOption {
default = false;
description = ''
- Whether to enable sitecopy backups of specified directories.
+ Whether to enable sitecopy backups of specified
+ directories.
'';
};
period = mkOption {
default = "15 04 * * *";
description = ''
- This option defines (in the format used by cron) when the
- sitecopy backup are being run.
+ This option defines (in the format used by cron)
+ when the sitecopy backups are to be run.
The default is to update at 04:15 (at night) every day.
'';
};
@@ -47,9 +48,10 @@ in
];
default = [];
description = ''
- List of attributesets describing the backups.
+ List of attribute sets describing the backups.
- Username/password are extracted from ${stateDir}/sitecopy.secrets at activation
+ Username/password are extracted from
+ ${stateDir}/sitecopy.secrets at activation
time. The secrets file lines should have the following structure:
server username password
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index ba09f04d502b..a06384e27139 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -73,7 +73,7 @@ in {
};
port = mkOption {
- description = "Kubernets apiserver listening port.";
+ description = "Kubernetes apiserver listening port.";
default = 8080;
type = types.int;
};
@@ -211,7 +211,7 @@ in {
};
port = mkOption {
- description = "Kubernets scheduler listening port.";
+ description = "Kubernetes scheduler listening port.";
default = 10251;
type = types.int;
};
@@ -243,7 +243,7 @@ in {
};
port = mkOption {
- description = "Kubernets controller manager listening port.";
+ description = "Kubernetes controller manager listening port.";
default = 10252;
type = types.int;
};
@@ -299,7 +299,7 @@ in {
};
port = mkOption {
- description = "Kubernets kubelet info server listening port.";
+ description = "Kubernetes kubelet info server listening port.";
default = 10250;
type = types.int;
};
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 1cdecedfc772..efc52e917b00 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -167,6 +167,12 @@ in
unitConfig.RequiresMountsFor = "${cfg.dataDir}";
+ path = [
+ # Needed for the mysql_install_db command in the preStart script
+ # which calls the hostname command.
+ pkgs.nettools
+ ];
+
preStart =
''
if ! test -e ${cfg.dataDir}/mysql; then
diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix
index d6c05a3d620c..03e530b2c96d 100644
--- a/nixos/modules/services/hardware/brltty.nix
+++ b/nixos/modules/services/hardware/brltty.nix
@@ -4,10 +4,6 @@ with lib;
let
cfg = config.services.brltty;
-
- stateDir = "/run/brltty";
-
- pidFile = "${stateDir}/brltty.pid";
in {
@@ -24,14 +20,24 @@ in {
config = mkIf cfg.enable {
systemd.services.brltty = {
- description = "Braille console driver";
- preStart = ''
- mkdir -p ${stateDir}
- '';
+ description = "Braille Device Support";
+ unitConfig = {
+ Documentation = "http://mielke.cc/brltty/";
+ DefaultDependencies = "no";
+ RequiresMountsFor = "${pkgs.brltty}/var/lib/brltty";
+ };
serviceConfig = {
- ExecStart = "${pkgs.brltty}/bin/brltty --pid-file=${pidFile}";
- Type = "forking";
- PIDFile = pidFile;
+ ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon";
+ Type = "simple"; # Change to notidy after next releae
+ TimeoutStartSec = 5;
+ TimeoutStopSec = 10;
+ Restart = "always";
+ RestartSec = 30;
+ Nice = -10;
+ OOMScoreAdjust = -900;
+ ProtectHome = "read-only";
+ ProtectSystem = "full";
+ SystemCallArchitectures = "native";
};
before = [ "sysinit.target" ];
wantedBy = [ "sysinit.target" ];
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
index 7867956c1ab0..2be339766069 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -2,40 +2,42 @@
with lib;
-{
+let
- ###### interface
+ cfg = config.services.freefall;
- options = with types; {
+in {
- services.freefall = {
+ options.services.freefall = {
- enable = mkOption {
- default = false;
- description = ''
- Whether to protect HP/Dell laptop hard drives (not SSDs) in free fall.
- '';
- type = bool;
- };
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to protect HP/Dell laptop hard drives (not SSDs) in free fall.
+ '';
+ };
- devices = mkOption {
- default = [ "/dev/sda" ];
- description = ''
- Device paths to all internal spinning hard drives.
- '';
- type = listOf string;
- };
+ package = mkOption {
+ type = types.package;
+ default = pkgs.freefall;
+ description = ''
+ freefall derivation to use.
+ '';
+ };
+ devices = mkOption {
+ type = types.listOf types.string;
+ default = [ "/dev/sda" ];
+ description = ''
+ Device paths to all internal spinning hard drives.
+ '';
};
};
- ###### implementation
-
config = let
- cfg = config.services.freefall;
-
mkService = dev:
assert dev != "";
let dev' = utils.escapeSystemdPath dev; in
@@ -43,12 +45,8 @@ with lib;
description = "Free-fall protection for ${dev}";
after = [ "${dev'}.device" ];
wantedBy = [ "${dev'}.device" ];
- path = [ pkgs.freefall ];
- unitConfig = {
- DefaultDependencies = false;
- };
serviceConfig = {
- ExecStart = "${pkgs.freefall}/bin/freefall ${dev}";
+ ExecStart = "${cfg.package}/bin/freefall ${dev}";
Restart = "on-failure";
Type = "forking";
};
@@ -56,9 +54,9 @@ with lib;
in mkIf cfg.enable {
- environment.systemPackages = [ pkgs.freefall ];
+ environment.systemPackages = [ cfg.package ];
- systemd.services = listToAttrs (map mkService cfg.devices);
+ systemd.services = builtins.listToAttrs (map mkService cfg.devices);
};
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 513eb27b4069..c747c24db67d 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -180,9 +180,7 @@ in
firmware to function). If multiple packages contain firmware
files with the same name, the first package in the list takes
precedence. Note that you must rebuild your system if you add
- files to any of these directories. For quick testing,
- put firmware files in /root/test-firmware
- and add that directory to the list.
+ files to any of these directories.
'';
apply = list: pkgs.buildEnv {
name = "firmware";
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 117ee1c900f5..aec45d9286d8 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -132,6 +132,7 @@ in
description = "Logstash Daemon";
wantedBy = [ "multi-user.target" ];
environment = { JAVA_HOME = jre; };
+ path = [ pkgs.bash ];
serviceConfig = {
ExecStart =
"${cfg.package}/bin/logstash agent " +
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 5843a6745f58..e2b37522cb16 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -14,7 +14,7 @@ let
alias = domain: list: "${list}: \"|${pkgs.mlmmj}/bin/mlmmj-receive -L ${listDir domain list}/\"";
subjectPrefix = list: "[${list}]";
listAddress = domain: list: "${list}@${domain}";
- customHeaders = list: domain: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ];
+ customHeaders = domain: list: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ];
footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}";
createList = d: l: ''
${pkgs.coreutils}/bin/mkdir -p ${listCtl d l}
@@ -90,14 +90,15 @@ in
enable = true;
recipientDelimiter= "+";
extraMasterConf = ''
- mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nextHop
+ mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nexthop
'';
extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists;
extraConfig = ''
- transport = hash:${stateDir}/transports
- virtual = hash:${stateDir}/virtuals
+ transport_maps = hash:${stateDir}/transports
+ virtual_alias_maps = hash:${stateDir}/virtuals
+ propagate_unmatched_extensions = virtual
'';
};
@@ -108,9 +109,10 @@ in
${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir}
${lib.concatMapStrings (createList cfg.listDomain) cfg.mailLists}
echo ${lib.concatMapStrings (virtual cfg.listDomain) cfg.mailLists} > ${stateDir}/virtuals
- echo ${cfg.listDomain} mailman: > ${stateDir}/transports
- echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} >> ${stateDir}/transports
- '';
+ echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} > ${stateDir}/transports
+ ${pkgs.postfix}/bin/postmap ${stateDir}/virtuals
+ ${pkgs.postfix}/bin/postmap ${stateDir}/transports
+ '';
systemd.services."mlmmj-maintd" = {
description = "mlmmj maintenance daemon";
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 10a706fbd71d..befd8c628f16 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -35,6 +35,7 @@ let
};
haskellPackages = mkOption {
+ default = pkgs.haskellPackages;
defaultText = "pkgs.haskellPackages";
example = literalExample "pkgs.haskell.packages.ghc784";
description = "haskellPackages used to build gitit and plugins.";
@@ -99,7 +100,7 @@ let
};
authenticationMethod = mkOption {
- type = types.enum [ "form" "http" "generic"];
+ type = types.enum [ "form" "http" "generic" "github" ];
default = "form";
description = ''
'form' means that users will be logged in and registered using forms
@@ -137,6 +138,7 @@ let
staticDir = mkOption {
type = types.path;
+ default = gititShared + "/data/static";
description = ''
Specifies the path of the static directory (containing javascript,
css, and images). If it does not exist, gitit will create it and
@@ -207,6 +209,7 @@ let
templatesDir = mkOption {
type = types.path;
+ default = gititShared + "/data/templates";
description = ''
Specifies the path of the directory containing page templates. If it
does not exist, gitit will create it with default templates. Users
@@ -288,6 +291,7 @@ let
plugins = mkOption {
type = with types; listOf str;
+ default = [ (gititShared + "/plugins/Dot.hs") ];
description = ''
Specifies a list of plugins to load. Plugins may be specified either
by their path or by their module name. If the plugin name starts
@@ -537,6 +541,42 @@ video/x-ms-wmx wmx
through xss-sanitize. Set to no only if you trust all of your users.
'';
};
+
+ oauthClientId = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "OAuth client ID";
+ };
+
+ oauthClientSecret = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "OAuth client secret";
+ };
+
+ oauthCallback = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "OAuth callback URL";
+ };
+
+ oauthAuthorizeEndpoint = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "OAuth authorize endpoint";
+ };
+
+ oauthAccessTokenEndpoint = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "OAuth access token endpoint";
+ };
+
+ githubOrg = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "Github organization";
+ };
};
configFile = pkgs.writeText "gitit.conf" ''
@@ -587,6 +627,14 @@ video/x-ms-wmx wmx
pdf-export: ${toYesNo cfg.pdfExport}
pandoc-user-data: ${toString cfg.pandocUserData}
xss-sanitize: ${toYesNo cfg.xssSanitize}
+
+ [Github]
+ oauthclientid: ${toString cfg.oauthClientId}
+ oauthclientsecret: ${toString cfg.oauthClientSecret}
+ oauthcallback: ${toString cfg.oauthCallback}
+ oauthauthorizeendpoint: ${toString cfg.oauthAuthorizeEndpoint}
+ oauthaccesstokenendpoint: ${toString cfg.oauthAccessTokenEndpoint}
+ github-org: ${toString cfg.githubOrg}
'';
in
@@ -597,13 +645,6 @@ in
config = mkIf cfg.enable {
- services.gitit = {
- haskellPackages = mkDefault pkgs.haskellPackages;
- staticDir = gititShared + "/data/static";
- templatesDir = gititShared + "/data/templates";
- plugins = [ ];
- };
-
users.extraUsers.gitit = {
group = config.users.extraGroups.gitit.name;
description = "Gitit user";
@@ -681,4 +722,3 @@ NAMED
};
};
}
-
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 981299352575..6a7a7f4cee72 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -52,7 +52,7 @@ in
systemd.services.nix-gc =
{ description = "Nix Garbage Collector";
- script = "exec ${config.nix.package}/bin/nix-store --gc ${cfg.options}";
+ script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}";
startAt = optionalString cfg.automatic cfg.dates;
};
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 7a53ce174542..7e8dea4ec024 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -30,6 +30,7 @@ in {
package = mkOption {
type = types.package;
+ default = pkgs.bosun;
example = literalExample "pkgs.bosun";
description = ''
bosun binary to use.
@@ -95,8 +96,6 @@ in {
config = mkIf cfg.enable {
- services.bosun.package = mkDefault pkgs.bosun;
-
systemd.services.bosun = {
description = "bosun metrics collector (part of Bosun)";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index f987c4792e93..0393d01054d1 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -206,7 +206,7 @@ in {
package = mkOption {
description = "Package to use.";
- default = pkgs.grafana-backend;
+ default = pkgs.grafana;
type = types.package;
};
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 61ba16123252..1017005226b2 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -119,7 +119,7 @@ in
recipient = mkOption {
default = "root";
- type = types.string;
+ type = types.str;
description = "Recipient of the notification messages.";
};
@@ -153,7 +153,7 @@ in
display = mkOption {
default = ":${toString config.services.xserver.display}";
- type = types.string;
+ type = types.str;
description = "DISPLAY to send X11 notifications to.";
};
};
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index bbf21634c368..72e9b6144d4b 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -97,8 +97,8 @@ in
description = ''
Enabling this will add a line directly after pam_unix.so.
Whenever a password is changed the samba password will be updated as well.
- However you still yave to add the samba password once using smbpasswd -a user
- If you don't want to maintain an extra pwd database you still can send plain text
+ However, you still have to add the samba password once, using smbpasswd -a user.
+ If you don't want to maintain an extra password database, you still can send plain text
passwords which is not secure.
'';
};
diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 27b7dd71d9e5..5e6847097a94 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -16,11 +16,12 @@ let
''
[settings]
RunMode = Daemon
- User = bitlbee
+ User = bitlbee
ConfigDir = ${cfg.configDir}
DaemonInterface = ${cfg.interface}
DaemonPort = ${toString cfg.portNumber}
AuthMode = ${cfg.authMode}
+ Plugindir = ${pkgs.bitlbee-plugins cfg.plugins}/lib/bitlbee
${lib.optionalString (cfg.hostName != "") "HostName = ${cfg.hostName}"}
${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}
${cfg.extraSettings}
@@ -72,7 +73,7 @@ in
Open -- Accept connections from anyone, use NickServ for user authentication.
Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all.
Registered -- Only allow registered users to use this server; this disables the register- and the account command until the user identifies himself.
- '';
+ '';
};
hostName = mkOption {
@@ -85,6 +86,15 @@ in
'';
};
+ plugins = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ example = literalExample "[ pkgs.bitlbee-facebook ]";
+ description = ''
+ The list of bitlbee plugins to install.
+ '';
+ };
+
configDir = mkOption {
default = "/var/lib/bitlbee";
type = types.path;
@@ -107,14 +117,14 @@ in
default = "";
description = ''
Will be inserted in the Settings section of the config file.
- '';
+ '';
};
extraDefaults = mkOption {
default = "";
description = ''
Will be inserted in the Default section of the config file.
- '';
+ '';
};
};
@@ -138,7 +148,7 @@ in
gid = config.ids.gids.bitlbee;
};
- systemd.services.bitlbee =
+ systemd.services.bitlbee =
{ description = "BitlBee IRC to other chat networks gateway";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 482b61997ae1..deb1cbfc1858 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -5,7 +5,12 @@ with lib;
let
cfg = config.networking.connman;
+ configFile = pkgs.writeText "connman.conf" ''
+ [General]
+ NetworkInterfaceBlacklist=${concatStringsSep "," cfg.networkInterfaceBlacklist}
+ ${cfg.extraConfig}
+ '';
in {
###### interface
@@ -22,6 +27,23 @@ in {
'';
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = ''
+ '';
+ description = ''
+ Configuration lines appended to the generated connman configuration file.
+ '';
+ };
+
+ networkInterfaceBlacklist = mkOption {
+ type = with types; listOf string;
+ default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ];
+ description = ''
+ Default blacklisted interfaces, this includes NixOS containers interfaces (ve).
+ '';
+ };
+
};
};
@@ -51,7 +73,7 @@ in {
Type = "dbus";
BusName = "net.connman";
Restart = "on-failure";
- ExecStart = "${pkgs.connman}/sbin/connmand --nodaemon";
+ ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon";
StandardOutput = "null";
};
};
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
new file mode 100644
index 000000000000..f17f8c832ee4
--- /dev/null
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -0,0 +1,110 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services;
+
+ dnschainConf = pkgs.writeText "dnschain.conf" ''
+ [log]
+ level=info
+
+ [dns]
+ host = 127.0.0.1
+ port = 5333
+ oldDNSMethod = NO_OLD_DNS
+ # TODO: check what that address is acutally used for
+ externalIP = 127.0.0.1
+
+ [http]
+ host = 127.0.0.1
+ port=8088
+ tlsPort=4443
+ '';
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.dnschain = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to run dnschain. That implies running
+ namecoind as well, so make sure to configure
+ it appropriately.
+ '';
+ };
+
+ };
+
+ services.dnsmasq = {
+ resolveDnschainQueries = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Resolve .bit top-level domains
+ with dnschain and namecoind.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.dnschain.enable {
+
+ services.namecoind.enable = true;
+
+ services.dnsmasq.servers = optionals cfg.dnsmasq.resolveDnschainQueries [ "/.bit/127.0.0.1#5333" ];
+
+ users.extraUsers = singleton
+ { name = "dnschain";
+ uid = config.ids.uids.dnschain;
+ extraGroups = [ "namecoin" ];
+ description = "Dnschain daemon user";
+ home = "/var/lib/dnschain";
+ createHome = true;
+ };
+
+ systemd.services.dnschain = {
+ description = "Dnschain Daemon";
+ after = [ "namecoind.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.openssl ];
+ preStart = ''
+ # Link configuration file into dnschain HOME directory
+ if [ "$(${pkgs.coreutils}/bin/realpath /var/lib/dnschain/.dnschain.conf)" != "${dnschainConf}" ]; then
+ rm -rf /var/lib/dnschain/.dnschain.conf
+ ln -s ${dnschainConf} /var/lib/dnschain/.dnschain.conf
+ fi
+
+ # Create empty namecoin.conf so that dnschain is not
+ # searching for /etc/namecoin/namecoin.conf
+ if [ ! -e /var/lib/dnschain/.namecoin/namecoin.conf ]; then
+ mkdir -p /var/lib/dnschain/.namecoin
+ touch /var/lib/dnschain/.namecoin/namecoin.conf
+ fi
+ '';
+ serviceConfig = {
+ Type = "simple";
+ User = "dnschain";
+ EnvironmentFile = config.services.namecoind.userFile;
+ ExecStart = "${pkgs.dnschain}/bin/dnschain --rpcuser=\${USER} --rpcpassword=\${PASSWORD} --rpcport=8336";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
+ };
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index eb3551515723..6907d63d7611 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -96,7 +96,7 @@ in
Type = "dbus";
BusName = "uk.org.thekelleys.dnsmasq";
ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
- ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
restartTriggers = [ config.environment.etc.hosts.source ];
};
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
new file mode 100644
index 000000000000..83fc1ec66679
--- /dev/null
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -0,0 +1,150 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.namecoind;
+
+ namecoinConf =
+ let
+ useSSL = (cfg.rpcCertificate != null) && (cfg.rpcKey != null);
+ in
+ pkgs.writeText "namecoin.conf" ''
+ server=1
+ daemon=0
+ rpcallowip=127.0.0.1
+ walletpath=${cfg.wallet}
+ gen=${if cfg.generate then "1" else "0"}
+ rpcssl=${if useSSL then "1" else "0"}
+ ${optionalString useSSL "rpcsslcertificatechainfile=${cfg.rpcCertificate}"}
+ ${optionalString useSSL "rpcsslprivatekeyfile=${cfg.rpcKey}"}
+ ${optionalString useSSL "rpcsslciphers=TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH"}
+ txindex=1
+ txprevcache=1
+ '';
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.namecoind = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to run namecoind.
+ '';
+ };
+
+ wallet = mkOption {
+ type = types.path;
+ example = "/etc/namecoin/wallet.dat";
+ description = ''
+ Wallet file. The ownership of the file has to be
+ namecoin:namecoin, and the permissions must be 0640.
+ '';
+ };
+
+ userFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/etc/namecoin/user";
+ description = ''
+ File containing the user name and user password to
+ authenticate RPC connections to namecoind.
+ The content of the file is of the form:
+
+ USER=namecoin
+ PASSWORD=secret
+
+ The ownership of the file has to be namecoin:namecoin,
+ and the permissions must be 0640.
+ '';
+ };
+
+ generate = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to generate (mine) Namecoins.
+ '';
+ };
+
+ rpcCertificate = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/etc/namecoin/server.cert";
+ description = ''
+ Certificate file for securing RPC connections.
+ '';
+ };
+
+ rpcKey = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/etc/namecoin/server.pem";
+ description = ''
+ Key file for securing RPC connections.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers = singleton
+ { name = "namecoin";
+ uid = config.ids.uids.namecoin;
+ description = "Namecoin daemon user";
+ home = "/var/lib/namecoin";
+ createHome = true;
+ };
+
+ users.extraGroups = singleton
+ { name = "namecoin";
+ gid = config.ids.gids.namecoin;
+ };
+
+ systemd.services.namecoind = {
+ description = "Namecoind Daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ if [ "$(stat --printf '%u' ${cfg.userFile})" != "${toString config.ids.uids.namecoin}" \
+ -o "$(stat --printf '%g' ${cfg.userFile})" != "${toString config.ids.gids.namecoin}" \
+ -o "$(stat --printf '%a' ${cfg.userFile})" != "640" ]; then
+ echo "ERROR: bad ownership or rights on ${cfg.userFile}" >&2
+ exit 1
+ fi
+ if [ "$(stat --printf '%u' ${cfg.wallet})" != "${toString config.ids.uids.namecoin}" \
+ -o "$(stat --printf '%g' ${cfg.wallet})" != "${toString config.ids.gids.namecoin}" \
+ -o "$(stat --printf '%a' ${cfg.wallet})" != "640" ]; then
+ echo "ERROR: bad ownership or rights on ${cfg.wallet}" >&2
+ exit 1
+ fi
+ '';
+ serviceConfig = {
+ Type = "simple";
+ User = "namecoin";
+ EnvironmentFile = cfg.userFile;
+ ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${namecoinConf} -rpcuser=\${USER} -rpcpassword=\${PASSWORD} -printtoconsole";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
+ StandardOutput = "null";
+ Nice = "10";
+ };
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index a9183577d0a2..5256fc9bc071 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -6,6 +6,8 @@ let
inherit (pkgs) ntp;
+ cfg = config.services.ntp;
+
stateDir = "/var/lib/ntp";
ntpUser = "ntp";
@@ -16,10 +18,10 @@ let
restrict 127.0.0.1
restrict -6 ::1
- ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)}
+ ${toString (map (server: "server " + server + " iburst\n") cfg.servers)}
'';
- ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup";
+ ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}";
in
@@ -51,6 +53,12 @@ in
'';
};
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ description = "Extra flags passed to the ntpd command.";
+ default = [];
+ };
+
};
};
diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
index 923e7cd0986e..738ab8313a5d 100644
--- a/nixos/modules/services/networking/oidentd.nix
+++ b/nixos/modules/services/networking/oidentd.nix
@@ -28,7 +28,9 @@ with lib;
jobs.oidentd =
{ startOn = "started network-interfaces";
daemonType = "fork";
- exec = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
+ exec = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" +
+ optionalString config.networking.enableIPv6 " -a ::"
+ ;
};
users.extraUsers.oidentd = {
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 9dc88e61865d..a96888dec864 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -67,12 +67,6 @@ in
options = {
- /* !!! Obsolete. */
- services.openvpn.enable = mkOption {
- default = true;
- description = "Whether to enable OpenVPN.";
- };
-
services.openvpn.servers = mkOption {
default = {};
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 64620bf16041..3436bd01d848 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -37,6 +37,12 @@ in {
type = types.bool;
};
+ package = mkOption {
+ description = "Elasticsearch package to use.";
+ default = pkgs.elasticsearch;
+ type = types.package;
+ };
+
host = mkOption {
description = "Elasticsearch listen address.";
default = "127.0.0.1";
@@ -123,7 +129,7 @@ in {
after = [ "network-interfaces.target" ];
environment = { ES_HOME = cfg.dataDir; };
serviceConfig = {
- ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
+ ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
User = "elasticsearch";
PermissionsStartOnly = true;
};
@@ -142,7 +148,7 @@ in {
'';
};
- environment.systemPackages = [ pkgs.elasticsearch ];
+ environment.systemPackages = [ cfg.package ];
users.extraUsers = singleton {
name = "elasticsearch";
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
new file mode 100644
index 000000000000..f47ab8f55861
--- /dev/null
+++ b/nixos/modules/services/search/kibana.nix
@@ -0,0 +1,168 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.kibana;
+
+ cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
+ (filterAttrsRecursive (n: v: v != null) ({
+ server = {
+ host = cfg.host;
+ port = cfg.port;
+ ssl = {
+ cert = cfg.cert;
+ key = cfg.key;
+ };
+ };
+
+ kibana = {
+ index = cfg.index;
+ defaultAppId = cfg.defaultAppId;
+ };
+
+ elasticsearch = {
+ url = cfg.elasticsearch.url;
+ username = cfg.elasticsearch.username;
+ password = cfg.elasticsearch.password;
+ ssl = {
+ cert = cfg.elasticsearch.cert;
+ key = cfg.elasticsearch.key;
+ ca = cfg.elasticsearch.ca;
+ };
+ };
+
+ logging = {
+ verbose = cfg.logLevel == "verbose";
+ quiet = cfg.logLevel == "quiet";
+ silent = cfg.logLevel == "silent";
+ dest = "stdout";
+ };
+ } // cfg.extraConf)
+ )));
+in {
+ options.services.kibana = {
+ enable = mkEnableOption "enable kibana service";
+
+ host = mkOption {
+ description = "Kibana listening host";
+ default = "127.0.0.1";
+ type = types.str;
+ };
+
+ port = mkOption {
+ description = "Kibana listening port";
+ default = 5601;
+ type = types.int;
+ };
+
+ cert = mkOption {
+ description = "Kibana ssl certificate.";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ key = mkOption {
+ description = "Kibana ssl key.";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ index = mkOption {
+ description = "Elasticsearch index to use for saving kibana config.";
+ default = ".kibana";
+ type = types.str;
+ };
+
+ defaultAppId = mkOption {
+ description = "Elasticsearch default application id.";
+ default = "discover";
+ type = types.str;
+ };
+
+ elasticsearch = {
+ url = mkOption {
+ description = "Elasticsearch url";
+ default = "http://localhost:9200";
+ type = types.str;
+ };
+
+ username = mkOption {
+ description = "Username for elasticsearch basic auth.";
+ default = null;
+ type = types.nullOr types.str;
+ };
+
+ password = mkOption {
+ description = "Password for elasticsearch basic auth.";
+ default = null;
+ type = types.nullOr types.str;
+ };
+
+ ca = mkOption {
+ description = "CA file to auth against elasticsearch.";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ cert = mkOption {
+ description = "Certificate file to auth against elasticsearch.";
+ default = null;
+ type = types.nullOr types.path;
+ };
+
+ key = mkOption {
+ description = "Key file to auth against elasticsearch.";
+ default = null;
+ type = types.nullOr types.path;
+ };
+ };
+
+ logLevel = mkOption {
+ description = "Kibana log level";
+ default = "normal";
+ type = types.enum ["verbose" "normal" "silent" "quiet"];
+ };
+
+ package = mkOption {
+ description = "Kibana package to use";
+ default = pkgs.kibana;
+ type = types.package;
+ };
+
+ dataDir = mkOption {
+ description = "Kibana data directory";
+ default = "/var/lib/kibana";
+ type = types.path;
+ };
+
+ extraConf = mkOption {
+ description = "Kibana extra configuration";
+ default = {};
+ type = types.attrs;
+ };
+ };
+
+ config = mkIf (cfg.enable) {
+ systemd.services.kibana = {
+ description = "Kibana Service";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-interfaces.target" "elasticsearch.service" ];
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}";
+ User = "kibana";
+ WorkingDirectory = cfg.dataDir;
+ };
+ };
+
+ environment.systemPackages = [ cfg.package ];
+
+ users.extraUsers = singleton {
+ name = "kibana";
+ uid = config.ids.uids.kibana;
+ description = "Kibana service user";
+ home = cfg.dataDir;
+ createHome = true;
+ };
+ };
+}
diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
new file mode 100644
index 000000000000..34d0be3b1beb
--- /dev/null
+++ b/nixos/modules/services/security/physlock.nix
@@ -0,0 +1,114 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.physlock;
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.physlock = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable the physlock screen locking mechanism.
+
+ Enable this and then run systemctl start physlock
+ to securely lock the screen.
+
+ This will switch to a new virtual terminal, turn off console
+ switching and disable SysRq mechanism (when
+ is set)
+ until the root or
+ password is given.
+ '';
+ };
+
+ user = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ User whose password will be used to unlock the screen on par
+ with the root password.
+ '';
+ };
+
+ disableSysRq = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to disable SysRq when locked with physlock.
+ '';
+ };
+
+ lockOn = {
+
+ suspend = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to lock screen with physlock just before suspend.
+ '';
+ };
+
+ hibernate = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to lock screen with physlock just before hibernate.
+ '';
+ };
+
+ extraTargets = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "display-manager.service" ];
+ description = ''
+ Other targets to lock the screen just before.
+
+ Useful if you want to e.g. both autologin to X11 so that
+ your ~/.xsession gets executed and
+ still to have the screen locked so that the system can be
+ booted relatively unattended.
+ '';
+ };
+
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ # for physlock -l and physlock -L
+ environment.systemPackages = [ pkgs.physlock ];
+
+ systemd.services."physlock" = {
+ enable = true;
+ description = "Physlock";
+ wantedBy = optional cfg.lockOn.suspend "suspend.target"
+ ++ optional cfg.lockOn.hibernate "hibernate.target"
+ ++ cfg.lockOn.extraTargets;
+ before = optional cfg.lockOn.suspend "systemd-suspend.service"
+ ++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
+ ++ cfg.lockOn.extraTargets;
+ serviceConfig.Type = "forking";
+ script = ''
+ ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.user != null) " -u ${cfg.user}"}
+ '';
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 00df4042d890..becd57055d41 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -36,6 +36,8 @@ in {
wantedBy = [ "multi-user.target" ];
path = [ pkgs.pythonPackages.deluge ];
serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
+ # To prevent "Quit & shutdown daemon" from working; we want systemd to manage it!
+ serviceConfig.Restart = "on-success";
serviceConfig.User = "deluge";
serviceConfig.Group = "deluge";
};
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 8884569c7bc8..921f774bcaa0 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -5,8 +5,8 @@ with lib;
let
- version = "4.2";
- fullversion = "${version}.2";
+ version = "4.3";
+ fullversion = "${version}";
# Our bare-bones wp-config.php file using the above settings
wordpressConfig = pkgs.writeText "wp-config.php" ''
@@ -40,6 +40,8 @@ let
RewriteRule ^(.*\.php)$ $1 [L]
RewriteRule . index.php [L]
+
+ ${config.extraHtaccess}
'';
# WP translation can be found here:
@@ -72,7 +74,7 @@ let
owner = "WordPress";
repo = "WordPress";
rev = "${fullversion}";
- sha256 = "0gq1j9b0d0rykql3jzdb2yn4adj0rrcsvqrmj3dzx11ir57ilsgc";
+ sha256 = "0sz5jjhjpwqis8336gyq9a77cr4sf8zahd1y4pzmpvpzn9cn503y";
};
installPhase = ''
mkdir -p $out
@@ -220,7 +222,18 @@ in
settings, see .
'';
};
- };
+ extraHtaccess = mkOption {
+ default = "";
+ example =
+ ''
+ php_value upload_max_filesize 20M
+ php_value post_max_size 20M
+ '';
+ description = ''
+ Any additional text to be appended to Wordpress's .htaccess file.
+ '';
+ };
+ };
documentRoot = wordpressRoot;
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index b16f701a0c9f..25816446e999 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -8,12 +8,13 @@ let
configFile = pkgs.writeText "nginx.conf" ''
user ${cfg.user} ${cfg.group};
daemon off;
+
${cfg.config}
+
${optionalString (cfg.httpConfig != "") ''
http {
- ${cfg.httpConfig}
- ${cfg.httpServers}
- ${cfg.httpDefaultServer}
+ include ${cfg.package}/conf/mime.types;
+ ${cfg.httpConfig}
}
''}
${cfg.appendConfig}
@@ -62,32 +63,7 @@ in
httpConfig = mkOption {
type = types.lines;
default = "";
- description = ''
- Configuration lines to be placed at the top inside of
- the http {} block. The option is intended to be used for
- the default configuration of the servers.
- '';
- };
-
- httpServers = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Configuration lines to be placed inside of the http {}
- block. The option is intended to be used for defining
- individual servers.
- '';
- };
-
- httpDefaultServer = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Configuration lines to be placed at the bottom inside of
- the http {} block. The option is intended to be used for
- setting up the default servers. The default server is used
- if no previously specified server matches a request.
- '';
+ description = "Configuration lines to be appended inside of the http {} block.";
};
stateDir = mkOption {
diff --git a/nixos/modules/services/web-servers/nginx/reverse_proxy.nix b/nixos/modules/services/web-servers/nginx/reverse_proxy.nix
deleted file mode 100644
index c21406dff29a..000000000000
--- a/nixos/modules/services/web-servers/nginx/reverse_proxy.nix
+++ /dev/null
@@ -1,233 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.nginx;
-
- defaultSSL = cfg.httpDefaultKey != null || cfg.httpDefaultCertificate != null;
-
- validSSL = key: cert: cert != null && key != null || cert == null && key == null;
-
-in
-
-{
- options = {
-
- services.nginx = {
-
- reverseProxies = mkOption {
- type = types.attrsOf (types.submodule (
- {
- options = {
- proxy = mkOption {
- type = types.str;
- default = [];
- description = ''
- Exclude files and directories matching these patterns.
- '';
- };
-
- key = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = ''
- Exclude files and directories matching these patterns.
- '';
- };
-
- certificate = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = ''
- Exclude files and directories matching these patterns.
- '';
- };
- };
- }
- ));
-
- default = {};
-
- example = literalExample ''
- {
- "hydra.yourdomain.org" =
- { proxy = "localhost:3000";
- key = "/etc/nixos/certs/hydra_key.key";
- certificate = "/etc/nixos/certs/hydra_cert.crt";
- };
- }
- '';
-
- description = ''
- A reverse proxy server configuration is created for every attribute.
- The attribute name corresponds to the name the server is listening to,
- and the proxy option defines the target to forward the requests to.
- If a key and certificate are given, then the server is secured through
- a SSL connection. Non-SSL requests on port 80 are automatically
- re-directed to the SSL server on port 443.
- '';
- };
-
- httpDefaultKey = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/etc/nixos/certs/defaut_key.key";
- description = ''
- Key of SSL certificate for default server.
- The default certificate is presented by the default server during
- the SSL handshake when no specialized server configuration matches
- a request.
- A default SSL certificate is also helpful if browsers do not
- support the TLS Server Name Indication extension (SNI, RFC 6066).
- '';
- };
-
- httpDefaultCertificate = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/etc/nixos/certs/defaut_key.crt";
- description = ''
- SSL certificate for default server.
- The default certificate is presented by the default server during
- the SSL handshake when no specialized server configuration matches
- a request.
- A default SSL certificate is also helpful if browsers do not
- support the TLS Server Name Indication extension (SNI, RFC 6066).
- '';
- };
-
- };
-
- };
-
-
- config = mkIf (cfg.reverseProxies != {}) {
-
- assertions = [
- { assertion = all id (mapAttrsToList (n: v: validSSL v.certificate v.key) cfg.reverseProxies);
- message = ''
- One (or more) reverse proxy configurations specify only either
- the key option or the certificate option. Both certificate
- with associated key have to be configured to enable SSL for a
- server configuration.
-
- services.nginx.reverseProxies: ${toString cfg.reverseProxies}
- '';
- }
- { assertion = validSSL cfg.httpDefaultCertificate cfg.httpDefaultKey;
- message = ''
- The default server configuration specifies only either the key
- option or the certificate option. Both httpDefaultCertificate
- with associated httpDefaultKey have to be configured to enable
- SSL for the default server configuration.
-
- services.nginx.httpDefaultCertificate: ${toString cfg.httpDefaultCertificate}
-
- services.nginx.httpDefaultKey : ${toString cfg.httpDefaultKey}
- '';
- }
- ];
-
- services.nginx.config = mkBefore ''
- worker_processes 1;
- error_log logs/error.log debug;
- pid logs/nginx.pid;
- events {
- worker_connections 1024;
- }
- '';
-
- services.nginx.httpConfig = mkBefore ''
- log_format main '$remote_addr - $remote_user [$time_local] "$request" '
- '$status $body_bytes_sent "$http_referer" '
- '"$http_user_agent" "$http_x_forwarded_for"';
- access_log logs/access.log main;
- sendfile on;
- tcp_nopush on;
- keepalive_timeout 10;
- gzip on;
-
- ${lib.optionalString defaultSSL ''
- ssl_session_cache shared:SSL:10m;
- ssl_session_timeout 10m;
- ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
- ssl_ciphers HIGH:!aNULL:!MD5;
- ssl_certificate ${cfg.httpDefaultCertificate};
- ssl_certificate_key ${cfg.httpDefaultKey};
- ''}
- '';
-
- services.nginx.httpDefaultServer = mkBefore ''
- # reject as default policy
- server {
- listen 80 default_server;
- listen [::]:80 default_server;
- ${lib.optionalString defaultSSL "listen 443 default_server ssl;"}
- return 444;
- }
- '';
-
- services.nginx.httpServers =
- let
- useSSL = certificate: key: certificate != null && key != null;
-
- server = servername: proxy: certificate: key: useSSL: ''
- server {
- server_name ${servername};
- keepalive_timeout 70;
-
- ${if !useSSL then ''
- listen 80;
- listen [::]:80;
- '' else ''
- listen 443 ssl;
- ssl_session_cache shared:SSL:10m;
- ssl_session_timeout 10m;
- ssl_certificate ${certificate};
- ssl_certificate_key ${key};
- ''}
-
- location / {
- proxy_pass ${proxy};
-
- ### force timeouts if one of backend is dead ##
- proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
-
- ### Set headers ####
- proxy_set_header Accept-Encoding "";
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
- ${lib.optionalString useSSL ''
- ### Most PHP, Python, Rails, Java App can use this header ###
- #proxy_set_header X-Forwarded-Proto https;##
- #This is better##
- proxy_set_header X-Forwarded-Proto $scheme;
- add_header Front-End-Https on;
- ''}
-
- ### By default we don't want to redirect it ####
- proxy_redirect off;
- proxy_buffering off;
- }
- }
-
- ${lib.optionalString useSSL ''
- # redirect http to https
- server {
- listen 80;
- listen [::]:80;
- server_name ${servername};
- return 301 https://$server_name$request_uri;
- }
- ''}
- '';
- in
- concatStrings (mapAttrsToList (n: v: server n v.proxy v.certificate v.key (useSSL v.proxy v.certificate)) cfg.reverseProxies);
-
- };
-
-}
diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/e19.nix
index 74065c862ef7..2d5c7b192bc6 100644
--- a/nixos/modules/services/x11/desktop-managers/e19.nix
+++ b/nixos/modules/services/x11/desktop-managers/e19.nix
@@ -62,7 +62,6 @@ in
waitPID=$!
'';
}];
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidPrograms = [ "e19_freqset" ];
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 507c2d2da139..fdee5fbc6c5b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -99,7 +99,6 @@ in {
networking.networkmanager.enable = mkDefault true;
services.upower.enable = config.powerManagement.enable;
hardware.bluetooth.enable = mkDefault true;
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = false; # true doesn't make sense here, GNOME just doesn't handle it anymore
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 7830e984219a..21b6243ba188 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -111,7 +111,6 @@ in
exec ${kde_workspace}/bin/startkde
'';
};
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton
{ program = "kcheckpass";
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 01a8704fea71..5061d59b7c7f 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -78,7 +78,6 @@ in
bgSupport = true;
start = ''exec ${plasma5.plasma-workspace}/bin/startkde;'';
};
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton {
program = "kcheckpass";
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index e6d6efaf3a61..de00ff93b17c 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -25,7 +25,6 @@ in
waitPID=$!
'';
}];
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages = [ pkgs.kodi ];
};
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 746f810a11ff..88eefa13de35 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -37,7 +37,6 @@ in
exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
'';
};
- services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages =
[ pkgs.gtk # To get GTK+'s themes.
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 55af2ecbb764..887b6f88a741 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -23,6 +23,10 @@ in
GDM is very experimental and may render system unusable.
'';
+ debug = mkEnableOption ''
+ debugging messages in GDM
+ '';
+
autoLogin = mkOption {
default = {};
description = ''
@@ -69,8 +73,7 @@ in
config = mkIf cfg.gdm.enable {
assertions = [
- { assertion = let autoLogin = cfg.gdm.autoLogin; in
- if autoLogin.enable then autoLogin.user != null else true;
+ { assertion = cfg.gdm.autoLogin.enable -> cfg.gdm.autoLogin.user != null;
message = "GDM auto-login requires services.xserver.displayManager.gdm.autoLogin.user to be set";
}
];
@@ -109,13 +112,21 @@ in
programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
+ # Use AutomaticLogin if delay is zero, because it's immediate.
+ # Otherwise with TimedLogin with zero seconds the prompt is still
+ # presented and there's a little delay.
environment.etc."gdm/custom.conf".text = ''
[daemon]
- ${optionalString cfg.gdm.autoLogin.enable ''
- TimedLoginEnable=true
- TimedLogin=${cfg.gdm.autoLogin.user}
- TimedLoginDelay=${toString cfg.gdm.autoLogin.delay}
- ''}
+ ${optionalString cfg.gdm.autoLogin.enable (
+ if cfg.gdm.autoLogin.delay > 0 then ''
+ TimedLoginEnable=true
+ TimedLogin=${cfg.gdm.autoLogin.user}
+ TimedLoginDelay=${toString cfg.gdm.autoLogin.delay}
+ '' else ''
+ AutomaticLoginEnable=true
+ AutomaticLogin=${cfg.gdm.autoLogin.user}
+ '')
+ }
[security]
@@ -126,6 +137,7 @@ in
[chooser]
[debug]
+ ${optionalString cfg.gdm.debug "Enable=true"}
'';
# GDM LFS PAM modules, adapted somehow to NixOS
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 4f39e05f0f8d..ffae22d2d670 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -1,58 +1,90 @@
{ config, lib, pkgs, ... }:
+
with lib;
+
let
+
cfg = config.services.redshift;
in {
- options = {
- services.redshift.enable = mkOption {
+
+ options.services.redshift = {
+ enable = mkOption {
type = types.bool;
default = false;
example = true;
- description = "Enable Redshift to change your screen's colour temperature depending on the time of day";
+ description = ''
+ Enable Redshift to change your screen's colour temperature depending on
+ the time of day.
+ '';
};
- services.redshift.latitude = mkOption {
- description = "Your current latitude";
+ latitude = mkOption {
type = types.str;
+ description = ''
+ Your current latitude.
+ '';
};
- services.redshift.longitude = mkOption {
- description = "Your current longitude";
+ longitude = mkOption {
type = types.str;
+ description = ''
+ Your current longitude.
+ '';
};
- services.redshift.temperature = {
+ temperature = {
day = mkOption {
- description = "Colour temperature to use during day time";
+ type = types.int;
default = 5500;
- type = types.int;
+ description = ''
+ Colour temperature to use during the day.
+ '';
};
night = mkOption {
- description = "Colour temperature to use during night time";
+ type = types.int;
default = 3700;
- type = types.int;
+ description = ''
+ Colour temperature to use at night.
+ '';
};
};
- services.redshift.brightness = {
+ brightness = {
day = mkOption {
- description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
- default = "1";
type = types.str;
+ default = "1";
+ description = ''
+ Screen brightness to apply during the day,
+ between 0.1 and 1.0.
+ '';
};
night = mkOption {
- description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
- default = "1";
type = types.str;
+ default = "1";
+ description = ''
+ Screen brightness to apply during the night,
+ between 0.1 and 1.0.
+ '';
};
};
- services.redshift.extraOptions = mkOption {
+ package = mkOption {
+ type = types.package;
+ default = pkgs.redshift;
+ description = ''
+ redshift derivation to use.
+ '';
+ };
+
+ extraOptions = mkOption {
type = types.listOf types.str;
default = [];
example = [ "-v" "-m randr" ];
- description = "Additional command-line arguments to pass to the redshift(1) command";
+ description = ''
+ Additional command-line arguments to pass to
+ redshift.
+ '';
};
};
@@ -63,7 +95,7 @@ in {
after = [ "display-manager.service" ];
wantedBy = [ "graphical.target" ];
serviceConfig.ExecStart = ''
- ${pkgs.redshift}/bin/redshift \
+ ${cfg.package}/bin/redshift \
-l ${cfg.latitude}:${cfg.longitude} \
-t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
-b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
@@ -73,4 +105,5 @@ in {
serviceConfig.Restart = "always";
};
};
+
}
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 1ec098fded6e..3348e8d0582c 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -13,7 +13,6 @@ let
# Map video driver names to driver packages. FIXME: move into card-specific modules.
knownVideoDrivers = {
- nouveau = { modules = [ pkgs.xf86_video_nouveau ]; };
unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; };
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; };
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index a977ddb7bb4d..81088a56fb12 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -99,7 +99,9 @@ let
# makes it bootable.
baseSystem = showWarnings (
if [] == failed then pkgs.stdenv.mkDerivation {
- name = "nixos-${config.system.nixosVersion}";
+ name = let hn = config.networking.hostName;
+ nn = if (hn != "") then hn else "unnamed";
+ in "nixos-system-${nn}-${config.system.nixosVersion}";
preferLocalBuild = true;
allowSubstitutes = false;
buildCommand = systemBuilder;
diff --git a/nixos/modules/system/boot/loader/efi.nix b/nixos/modules/system/boot/loader/efi.nix
index 241cfc7e836d..726634e664d7 100644
--- a/nixos/modules/system/boot/loader/efi.nix
+++ b/nixos/modules/system/boot/loader/efi.nix
@@ -15,7 +15,7 @@ with lib;
efiSysMountPoint = mkOption {
default = "/boot";
- type = types.string;
+ type = types.str;
description = "Where the EFI System Partition is mounted.";
};
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 1b4f0d401e6d..4a14ff1879c9 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -242,20 +242,20 @@ in
name = mkOption {
example = "luksroot";
- type = types.string;
+ type = types.str;
description = "Named to be used for the generated device in /dev/mapper.";
};
device = mkOption {
example = "/dev/sda2";
- type = types.string;
+ type = types.str;
description = "Path of the underlying block device.";
};
header = mkOption {
default = null;
example = "/root/header.img";
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
description = ''
The name of the file or block device that
should be used as header for the encrypted device.
@@ -265,7 +265,7 @@ in
keyFile = mkOption {
default = null;
example = "/dev/sdb1";
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
description = ''
The name of the file (can be a raw device or a partition) that
should be used as the decryption key for the encrypted device. If
@@ -349,7 +349,7 @@ in
ramfsMountPoint = mkOption {
default = "/crypt-ramfs";
- type = types.string;
+ type = types.str;
description = "Path where the ramfs used to update the LUKS key will be mounted during early boot.";
};
@@ -369,19 +369,19 @@ in
fsType = mkOption {
default = "vfat";
- type = types.string;
+ type = types.str;
description = "The filesystem of the unencrypted device.";
};
mountPoint = mkOption {
default = "/crypt-storage";
- type = types.string;
+ type = types.str;
description = "Path where the unencrypted device will be mounted during early boot.";
};
path = mkOption {
default = "/crypt-storage/default";
- type = types.string;
+ type = types.str;
description = ''
Absolute path of the salt on the unencrypted device with
that device's root directory as "/".
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index c49380899664..9bb10eac9880 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -85,11 +85,7 @@ with lib;
'')}
${config.boot.extraModprobeConfig}
'';
- environment.etc."modprobe.d/usb-load-ehci-first.conf".text =
- ''
- softdep uhci_hcd pre: ehci_hcd
- softdep ohci_hcd pre: ehci_hcd
- '';
+ environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 893861a2eed2..f782eca3f647 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -241,6 +241,9 @@ let
};
symlink = "/etc/modprobe.d/ubuntu.conf";
}
+ { object = pkgs.kmod-debian-aliases;
+ symlink = "/etc/modprobe.d/debian.conf";
+ }
];
};
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index 0370e36fbec2..8b5dd22fd380 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -22,21 +22,21 @@ let
blkDev = mkOption {
default = null;
example = "/dev/sda1";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
description = "Location of the backing encrypted device.";
};
label = mkOption {
default = null;
example = "rootfs";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
description = "Label of the backing encrypted device.";
};
keyFile = mkOption {
default = null;
example = "/root/.swapkey";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
description = "File system location of keyfile.";
};
};
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index ce21d9fe7621..ce9e3555b6cd 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -22,14 +22,14 @@ let
device = mkOption {
default = null;
example = "/dev/sda";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
description = "Location of the device.";
};
label = mkOption {
default = null;
example = "root-partition";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
description = "Label of the device (if any).";
};
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index a967fc77e686..9931c977e8f0 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -499,7 +499,7 @@ in
interface = mkOption {
example = "enp4s0";
- type = types.string;
+ type = types.str;
description = "The interface the macvlan will transmit packets through.";
};
@@ -605,7 +605,7 @@ in
interface = mkOption {
example = "enp4s0";
- type = types.string;
+ type = types.str;
description = "The interface the vlan will transmit packets through.";
};
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 3f554d127c35..1013396c0498 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -26,7 +26,7 @@ in
${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
rm $diskImage
'';
- diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+ diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
buildInputs = [ pkgs.utillinux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index 3a956caca0c3..0eb46d39b521 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -26,7 +26,7 @@ in
rm $diskImageBase
popd
'';
- diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+ diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
buildInputs = [ pkgs.utillinux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 59f486ff78b7..02cf1fe46a55 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -12,6 +12,12 @@ let
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
su = "${pkgs.shadow.su}/bin/su";
inherit (pkgs) utillinux;
+
+ postInstall = ''
+ t=$out/etc/bash_completion.d
+ mkdir -p $t
+ cp ${./nixos-container-completion.sh} $t/nixos-container
+ '';
};
# The container's init script, a small wrapper around the regular
@@ -102,7 +108,7 @@ in
};
hostAddress = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "10.231.136.1";
description = ''
@@ -111,7 +117,7 @@ in
};
localAddress = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "10.231.136.2";
description = ''
@@ -299,7 +305,7 @@ in
''
#! ${pkgs.stdenv.shell} -e
${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
- bash --login -c "/nix/var/nix/profiles/system/bin/switch-to-configuration test"
+ bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
'';
SyslogIdentifier = "container %i";
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index ba078cc0a11f..0115b972e80d 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -67,7 +67,7 @@ in
postStart =
mkOption {
- type = types.string;
+ type = types.lines;
default = ''
while ! [ -e /var/run/docker.sock ]; do
sleep 0.1
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 516da926f847..f21ddc12ca5a 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -30,7 +30,7 @@ in
rm $out/disk.raw
popd
'';
- diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+ diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
buildInputs = [ pkgs.utillinux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
new file mode 100644
index 000000000000..488153334bc1
--- /dev/null
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -0,0 +1,64 @@
+# Systemd services for lxd.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.virtualisation.lxd;
+
+in
+
+{
+ ###### interface
+
+ options = {
+
+ virtualisation.lxd.enable =
+ mkOption {
+ type = types.bool;
+ default = false;
+ description =
+ ''
+ This option enables lxd, a daemon that manages
+ containers. Users in the "lxd" group can interact with
+ the daemon (e.g. to start or stop containers) using the
+ lxc command line tool, among others.
+ '';
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages =
+ [ pkgs.lxd ];
+
+ systemd.services.lxd =
+ { description = "LXD Container Management Daemon";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "systemd-udev-settle.service" ];
+
+ # TODO(wkennington): Add lvm2 and thin-provisioning-tools
+ path = with pkgs; [ acl rsync gnutar xz btrfsProgs ];
+
+ serviceConfig.ExecStart = "@${pkgs.lxd}/bin/lxd lxd --syslog --group lxd";
+ serviceConfig.Type = "simple";
+ serviceConfig.KillMode = "process"; # when stopping, leave the containers alone
+ };
+
+ users.extraGroups.lxd.gid = config.ids.gids.lxd;
+
+ users.extraUsers.root = {
+ subUidRanges = [ { startUid = 1000000; count = 65536; } ];
+ subGidRanges = [ { startGid = 1000000; count = 65536; } ];
+ };
+
+ };
+
+}
diff --git a/nixos/modules/virtualisation/nixos-container-completion.sh b/nixos/modules/virtualisation/nixos-container-completion.sh
new file mode 100644
index 000000000000..0fe8ab811a17
--- /dev/null
+++ b/nixos/modules/virtualisation/nixos-container-completion.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+_nixos-container() {
+ local cur prev opts
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="list create destroy start stop status update login root-login run show-ip show-host-key"
+ startstop_opts=$(nixos-container list)
+ update_opts="--config"
+
+ if [[ "$prev" == "nixos-container" ]]
+ then
+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+ return 0
+ fi
+
+ if [[ $(echo "$opts" | grep "$prev") ]]
+ then
+ if [[ "$prev" == "start" || "$prev" == "stop" ]]
+ then
+ COMPREPLY=( $(compgen -W "${startstop_opts}" -- ${cur}) )
+ return 0
+ elif [[ "$prev" == "update" ]]
+ then
+ COMPREPLY=( $(compgen -W "${update_opts}" -- ${cur}) )
+ return 0
+ fi
+ fi
+}
+
+complete -F _nixos-container nixos-container
+
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index f1d9e64ee38f..004385f728c6 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -290,7 +290,8 @@ elsif ($action eq "show-ip") {
}
elsif ($action eq "show-host-key") {
- my $fn = "$root/etc/ssh/ssh_host_ecdsa_key.pub";
+ my $fn = "$root/etc/ssh/ssh_host_ed25519_key.pub";
+ $fn = "$root/etc/ssh/ssh_host_ecdsa_key.pub" unless -e $fn;
exit 1 if ! -f $fn;
print read_file($fn);
}
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 2f40283b3e1d..204ab0b0df67 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -17,7 +17,7 @@ in
type = types.bool;
default = false;
description = ''
- This enables Parallel Tools for Linux guests, along with provided
+ This enables Parallels Tools for Linux guests, along with provided
video, mouse and other hardware drivers.
'';
};
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index c1538feb9df5..2d3b4834fc5b 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -101,7 +101,7 @@ in {
system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
{ buildInputs = [ pkgs.linuxPackages.virtualbox ];
vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
- fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
+ fileName = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
}
''
echo "creating VirtualBox VM..."
@@ -109,7 +109,8 @@ in {
VBoxManage createvm --name "$vmName" --register \
--ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
VBoxManage modifyvm "$vmName" \
- --memory 1536 --acpi on --vram 10 \
+ --memory 1536 --acpi on --vram 32 \
+ ${optionalString (pkgs.stdenv.system == "i686-linux") "--pae on"} \
--nictype1 virtio --nic1 nat \
--audiocontroller ac97 --audio alsa \
--rtcuseutc on \
diff --git a/nixos/release.nix b/nixos/release.nix
index 2dbc35c7d7bf..4492ee4046ea 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -226,6 +226,7 @@ in rec {
tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
#tests.gitlab = callTest tests/gitlab.nix {};
tests.gnome3 = callTest tests/gnome3.nix {};
+ tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
tests.i3wm = callTest tests/i3wm.nix {};
tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test);
tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 3624131b364e..213dd4ca43b3 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -44,6 +44,8 @@ import ./make-test.nix (
search --onlyvisible --name "startup done"
windowfocus --sync
windowactivate --sync
+ ''}");
+ $machine->execute("${xdo "new-window" ''
key Ctrl+n
''}");
});
@@ -55,6 +57,8 @@ import ./make-test.nix (
search --onlyvisible --name "new tab"
windowfocus --sync
windowactivate --sync
+ ''}");
+ $machine->execute("${xdo "close-window" ''
key Ctrl+w
''}");
for (1..20) {
@@ -155,6 +159,8 @@ import ./make-test.nix (
$machine->succeed("${xdo "submit-url" ''
search --sync --onlyvisible --name "sandbox status"
windowfocus --sync
+ ''}");
+ $machine->succeed("${xdo "submit-url" ''
key --delay 1000 Ctrl+a Ctrl+c
''}");
diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix
index 8a4e7fffce0e..bac4ec6a918b 100644
--- a/nixos/tests/etcd.nix
+++ b/nixos/tests/etcd.nix
@@ -82,7 +82,7 @@ import ./make-test.nix ({ pkgs, ... } : {
subtest "single node", sub {
$simple->start();
$simple->waitForUnit("etcd.service");
- $simple->succeed("etcdctl set /foo/bar 'Hello world'");
+ $simple->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'");
$simple->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
};
@@ -91,7 +91,7 @@ import ./make-test.nix ({ pkgs, ... } : {
$node2->start();
$node1->waitForUnit("etcd.service");
$node2->waitForUnit("etcd.service");
- $node1->succeed("etcdctl set /foo/bar 'Hello world'");
+ $node1->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'");
$node2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
$node1->shutdown();
$node2->shutdown();
@@ -104,7 +104,7 @@ import ./make-test.nix ({ pkgs, ... } : {
$discovery2->start();
$discovery1->waitForUnit("etcd.service");
$discovery2->waitForUnit("etcd.service");
- $discovery1->succeed("etcdctl set /foo/bar 'Hello world'");
+ $discovery1->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'");
$discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
};
'';
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
new file mode 100644
index 000000000000..1c07ddf79c2e
--- /dev/null
+++ b/nixos/tests/gnome3-gdm.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "gnome3-gdm";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ lethalman ];
+ };
+
+ machine =
+ { config, pkgs, ... }:
+
+ { imports = [ ./common/user-account.nix ];
+
+ services.xserver.enable = true;
+
+ services.xserver.displayManager.gdm = {
+ enable = true;
+ autoLogin = {
+ enable = true;
+ user = "alice";
+ };
+ };
+ services.xserver.desktopManager.gnome3.enable = true;
+
+ virtualisation.memorySize = 512;
+ };
+
+ testScript =
+ ''
+ $machine->waitForX;
+ $machine->sleep(15);
+
+ # Check that logging in has given the user ownership of devices.
+ $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+
+ $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
+ $machine->waitForWindow(qr/Terminal/);
+ $machine->sleep(20);
+ $machine->screenshot("screen");
+ '';
+})
diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix
index 317ea063e17c..edece352cafe 100644
--- a/nixos/tests/logstash.nix
+++ b/nixos/tests/logstash.nix
@@ -19,8 +19,8 @@ import ./make-test.nix ({ pkgs, ...} : {
exec { command => "echo dragons" interval => 1 type => "test" }
'';
filterConfig = ''
- if [type] == "test" {
- grep { match => ["message", "flowers"] drop => true }
+ if [message] =~ /dragons/ {
+ drop {}
}
'';
outputConfig = ''
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 83a8b2835dc2..1a5a6f7b5bbc 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -1,26 +1,41 @@
+{ debug ? false, ... } @ args:
+
import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
- debug = false;
+ testVMConfig = vmName: attrs: { config, pkgs, ... }: let
+ guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions;
- testVMConfig = vmName: attrs: { config, pkgs, ... }: {
- boot.kernelParams = let
- miniInit = ''
- #!${pkgs.stdenv.shell} -xe
- export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"
+ miniInit = ''
+ #!${pkgs.stdenv.shell} -xe
+ export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"
- ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService
- ${(attrs.vmScript or (const "")) pkgs}
+ mkdir -p /etc/dbus-1 /var/run/dbus
+ cat > /etc/passwd < /etc/group <execute(ru $cmd);
@@ -286,9 +297,15 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || :
'';
+ sysdDetectVirt = pkgs: ''
+ ${pkgs.systemd}/bin/systemd-detect-virt > /mnt-root/result
+ '';
+
vboxVMs = mapAttrs createVM {
simple = {};
+ detectvirt.vmScript = sysdDetectVirt;
+
test1.vmFlags = hostonlyVMFlags;
test1.vmScript = dhcpScript;
@@ -307,7 +324,7 @@ in {
mkVMConf = name: val: val.machine // { key = "${name}-config"; };
vmConfigs = mapAttrsToList mkVMConf vboxVMs;
in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
- virtualisation.memorySize = 768;
+ virtualisation.memorySize = 1024;
virtualisation.virtualbox.host.enable = true;
users.extraUsers.alice.extraGroups = let
inherit (config.virtualisation.virtualbox.host) enableHardening;
@@ -372,6 +389,18 @@ in {
destroyVM_simple;
+ subtest "systemd-detect-virt", sub {
+ createVM_detectvirt;
+ vbm("startvm detectvirt");
+ waitForStartup_detectvirt;
+ waitForVMBoot_detectvirt;
+ shutdownVM_detectvirt;
+ my $result = $machine->succeed("cat '$detectvirt_sharepath/result'");
+ chomp $result;
+ die "systemd-detect-virt returned \"$result\" instead of \"oracle\""
+ if $result ne "oracle";
+ };
+
subtest "net-hostonlyif", sub {
createVM_test1;
createVM_test2;
@@ -403,4 +432,4 @@ in {
destroyVM_test2;
};
'';
-})
+}) args
diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index 3997855a75b6..7113a169e808 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "beast-0.7.1";
src = fetchurl {
- url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2;
+ url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2";
sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
};
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 2f236eab4e17..fcd30e476cf3 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,16 +1,58 @@
{ stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }:
-let version = "1.1.2"; in
-stdenv.mkDerivation {
+let
+
+ version = "1.2.5";
+ rev = "v${version}";
+ sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
+
+ reaperFork = {
+ src = fetchFromGitHub {
+ sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
+ rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16";
+ repo = "reaper";
+ owner = "gillesdegottex";
+ };
+ meta = with stdenv.lib; {
+ license = licenses.asl20;
+ };
+ };
+
+ libqaudioextra = {
+ src = fetchFromGitHub {
+ sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1";
+ rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3";
+ repo = "libqaudioextra";
+ owner = "gillesdegottex";
+ };
+ meta = with stdenv.lib; {
+ license = licenses.gpl3Plus;
+ };
+ };
+
+in stdenv.mkDerivation {
name = "dfasma-${version}";
src = fetchFromGitHub {
- sha256 = "0xqam5hm4kvfksdlyz1rviijv386fk3px4lhz6glfsimbcvvzl0r";
- rev = "v${version}";
+ inherit sha256 rev;
repo = "dfasma";
owner = "gillesdegottex";
};
+ buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
+
+ postPatch = ''
+ substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
+ cp -Rv "${reaperFork.src}"/* external/REAPER
+ cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra
+ '';
+
+ configurePhase = ''
+ qmake PREFIX=$out PREFIXSHORTCUT=$out dfasma.pro
+ '';
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
inherit version;
description = "Analyse and compare audio files in time and frequency";
@@ -23,25 +65,8 @@ stdenv.mkDerivation {
amplitude, this software does not aim to be an audio editor.
'';
homepage = http://gillesdegottex.github.io/dfasma/;
- license = licenses.gpl3Plus;
- platforms = with platforms; linux;
+ license = [ licenses.gpl3Plus reaperFork.meta.license ];
+ platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
-
- buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
-
- postPatch = ''
- substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
- '';
-
- configurePhase = ''
- qmake DESTDIR=$out/bin dfasma.pro
- '';
-
- enableParallelBuilding = true;
-
- postInstall = ''
- install -Dm644 distrib/dfasma.desktop $out/share/applications/dfasma.desktop
- install -Dm644 icons/dfasma.png $out/share/pixmaps/dfasma.png
- '';
}
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index 025ca594dffe..4ccbb4256127 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20";
homepage = https://github.com/sampov2/foo-yc20;
license = "BSD";
- maintainers = stdenv.lib.maintainers.magnetophon;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index d5de42f6a6ef..dc90aeda47df 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchFromGitHub, libav, libkeyfinder_0_11 }:
+{ stdenv, fetchFromGitHub, libav, libkeyfinder }:
-let version = "20150201"; in
+let version = "2015-09-13"; in
stdenv.mkDerivation rec {
name = "keyfinder-cli-${version}";
src = fetchFromGitHub {
repo = "keyfinder-cli";
owner = "EvanPurkhiser";
- rev = "e8a20e73f8a465a6c3c9e71dabf4b636244a9b0c";
- sha256 = "0x198ijr6wgzq24642s4pz5zxn4gvcc7dxmb6d1bfn3dwzi3j8lp";
+ rev = "8579282f15ab3ebad937fed398ec5c88843be03d";
+ sha256 = "0jylykigxmsqvdny265k58vpxa4cqs1hq2f7mph1nl3apfx2shrh";
};
+ buildInputs = [ libav libkeyfinder ];
+
+ makeFlagsArray = "PREFIX=$(out)";
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
inherit version;
inherit (src.meta) homepage;
@@ -21,13 +27,7 @@ stdenv.mkDerivation rec {
used to estimate the musical key of many different audio formats.
'';
license = licenses.gpl3Plus;
- platforms = with platforms; linux;
+ platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
-
- buildInputs = [ libav libkeyfinder_0_11 ];
-
- makeFlagsArray = "PREFIX=$(out)";
-
- enableParallelBuilding = true;
}
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
new file mode 100644
index 000000000000..704f3f01c00e
--- /dev/null
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }:
+
+stdenv.mkDerivation rec {
+ name = "renoise";
+
+ buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
+
+ src =
+ if builtins.currentSystem == "x86_64-linux" then
+ if demo then
+ fetchurl {
+ url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";
+ sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg";
+ }
+ else
+ requireFile {
+ url = "http://backstage.renoise.com/frontend/app/index.html#/login";
+ name = "rns_3_0_1_reg_x86_64.tar.gz";
+ sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";
+ }
+ else if builtins.currentSystem == "i686-linux" then
+ if demo then
+ fetchurl {
+ url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";
+ sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58";
+ }
+ else
+ requireFile {
+ url = "http://backstage.renoise.com/frontend/app/index.html#/login";
+ name = "rns_3_0_1_reg_x86.tar.gz";
+ sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";
+ }
+ else throw "platform is not suppored by Renoise";
+
+ installPhase = ''
+ cp -r Resources $out
+
+ mkdir -p $out/lib/
+
+ mv $out/AudioPluginServer* $out/lib/
+
+ cp renoise $out/renoise
+
+ for path in ${toString buildInputs}; do
+ ln -s $path/lib/*.so* $out/lib/
+ done
+
+ ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
+
+ mkdir $out/bin
+ ln -s $out/renoise $out/bin/renoise
+
+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
+ '';
+
+ meta = {
+ description = "modern tracker-based DAW";
+ homepage = http://www.renoise.com/;
+ license = stdenv.lib.licenses.unfree;
+ };
+}
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 943379890552..457d8c4b0caa 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,30 +1,31 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, x11, libxklavier, libgcrypt
+, intltool, x11, libxklavier, libgcrypt, libaudit
, qt4 ? null, qt5 ? null
}:
let
- ver_branch = "1.14";
- version = "1.14.2";
+ ver_branch = "1.16";
+ version = "1.16.2";
in
stdenv.mkDerivation rec {
name = "lightdm-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
- sha256 = "18dvipdkp6hc1hysyiwpd5nwq6db3mg98rwi3am2ly3hk2bpic18";
+ sha256 = "062jj21bjrl29mk66lpihwhrff038h2wny3p6b5asacf2mklf0hq";
};
patches = [ ./fix-paths.patch ];
buildInputs = [
pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
- qt4
+ qt4 libaudit
] ++ stdenv.lib.optional (qt5 != null) qt5.base;
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
+ "--disable-tests"
] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5";
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index c32ab32e9e95..4de862b0254b 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
};
in stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.0.10";
+ version = "1.0.4";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "16rbp76c46n24a9a3cygg94bx6y7j038h34w4qr7j24aiy5bfzwv";
+ sha256 = "0jki2ca12mazvszy05xc7zy8nfpavl0rnzcyksvvic32l3w2yxj7";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 750234b6399f..53b7b5750a04 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-pch=no" ]
++ optional contribPlugins "--with-contrib-plugins";
+ # Fix boost 1.59 compat
+ # Try removing in the next version
+ CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
+
meta = with stdenv.lib; {
maintainers = [ maintainers.linquize ];
platforms = platforms.all;
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 6f09aa481e1d..9d85c05206a8 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -127,6 +127,29 @@ rec {
};
};
+ bytecode-outline = buildEclipsePlugin rec {
+ name = "bytecode-outline-${version}";
+ version = "2.4.3";
+
+ srcFeature = fetchurl {
+ url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar";
+ sha256 = "0imhwp73gxy1y5d5gpjgd05ywn0xg3vqc5980wcx3fd51g4ifc67";
+ };
+
+ srcPlugin = fetchurl {
+ url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar";
+ sha256 = "0230i88mvvxhn11m9c5mv3494zhh1xkxyfyva9qahck0wbqwpzkw";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://andrei.gmxhome.de/bytecode/;
+ description = "Shows disassembled bytecode of current java editor or class file";
+ license = licenses.bsd2;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+ };
+
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
version = "8.7.0";
@@ -148,12 +171,12 @@ rec {
checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
- version = "6.5.0.201504121610";
+ version = "6.9.0.201508291549";
src = fetchzip {
stripRoot = false;
- url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.5.0/net.sf.eclipsecs-updatesite_6.5.0.201504121610-bin.zip";
- sha256 = "1zikpkss0c3l460ipvznp22kpak8w31n7k6yk41nc1w49zflvcf0";
+ url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.9.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
+ sha256 = "0r6lfbyhqcwa628i6wjp9d6mfp4jnc46bmwp9j7v02m79f8wx74g";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 35f9bd3ceb2a..9a0f6855567c 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchgit, emacs, colorTheme}:
-
+{stdenv, fetchzip, emacs, colorTheme}:
+let
+ commit = "412713a0fcedd520d208a7b783fea03d710bcc61";
+in
stdenv.mkDerivation rec {
- name = "color-theme-6.5.5";
+ name = "color-theme-solarized-1.0.0";
- src = fetchgit {
- url = https://github.com/sellout/emacs-color-theme-solarized.git;
- rev = "6a2c7ca0181585858e6e8054cb99db837e2ef72f";
- sha256 = "3c46a3d66c75ec4456209eeafdb03282148b289b12e8474f6a8962f3894796e8";
+ src = fetchzip {
+
+ url = "https://github.com/sellout/emacs-color-theme-solarized/archive/${commit}.zip";
+ sha256 = "1xd2yk7p39zxgcf91s80pqknzdxw9d09cppjb87g7ihj6f0wxqjv";
};
buildInputs = [ emacs ];
@@ -25,6 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Precision colors for machines and people";
homepage = http://ethanschoonover.com/solarized;
+ maintainer = "Samuel Rivas ";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
new file mode 100644
index 000000000000..84a52d169a3b
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, erlang }:
+
+stdenv.mkDerivation {
+
+ name = "erlang-mode-${erlang.version}";
+
+ buildInputs = [ ];
+
+ inherit erlang;
+
+ buildCommand = ''
+ mkdir -p "$out/share/emacs/site-lisp"
+ cp "$erlang/lib/erlang/lib/tools"*/emacs/*.el $out/share/emacs/site-lisp/
+ '';
+
+ # emacs highlighting */
+
+ meta = with stdenv.lib; {
+ homepage = "http://github.com/erlang/otp";
+ description = "Erlang mode for Emacs";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.samuelrivas ];
+ };
+}
diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
new file mode 100644
index 000000000000..3cc8156337e0
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, emacs }:
+
+let
+ version = "3.6-4-gb659bf8";
+in
+stdenv.mkDerivation {
+ name = "ido-ubiquitous-${version}";
+
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "ido-ubiquitous";
+ rev = version;
+ sha256 = "06r8qpfr60gc673w881m0nplj91b6bfw77bxgl6irz1z9bp7cc4y";
+ };
+
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs -L . --batch -f batch-byte-compile *.el
+ '';
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install *.el *.elc $out/share/emacs/site-lisp
+ '';
+}
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index 9e4496ff1a48..7ed6355f9815 100644
--- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
@@ -11,7 +11,8 @@ in stdenv.mkDerivation {
# a quick configure to get the Makefile generated. Since
# we do not build the ocaml itself, we don't really
# need it to support any features.
- configureFlags = [ "-no-tk" "-no-curses" "-no-pthread" ];
+ configureFlags = (with stdenv.lib; optional (!(versionAtLeast version "4.02")) "-no-tk") ++
+ [ "-no-curses" "-no-pthread" ];
buildInputs = [ emacs ];
dontBuild = true;
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e394ae4d6a38..e2889abb913d 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -273,25 +273,25 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "4.5.3";
- build = "141.1899";
+ version = "4.5.4";
+ build = "141.2569";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
- url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "13f3mp7gcl27fikxjlwk7n1gyxa46q0wfgniang4knb596wlfli0";
+ url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
+ sha256 = "0a2208rjcvcm9dww317clwiil3ddza3qq9wqkvr0rrcfp1739pbb";
};
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "4.5.3";
- build = "141.1899";
+ version = "4.5.4";
+ build = "141.2569";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
- url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "00b66fy841vjm54n2fby5wf7y8ihihqgydr6329iv9p5s0mgzh2s";
+ url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
+ sha256 = "1dy64myih92kxmi6h9y142dbmmwwphs2n3vswyg53881g5i0lfhd";
};
};
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index f66ce799d26b..11322e8240c2 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -1,11 +1,7 @@
-{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging }:
+{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging, bsh }:
let
version = "5.2.0";
- bsh = fetchurl {
- url = http://www.beanshell.org/bsh-2.0b5.jar;
- sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";
- };
bcpg = fetchurl {
url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar;
sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d";
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index cd7db6bb82e3..fd4f13ab6500 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,6 +1,9 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc
-args@{pkgs, source ? "default", ...}: with args;
+args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext
+, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
+, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
+, libICE, ... }: with args;
let inherit (args.composableDerivation) composableDerivation edf;
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index 482e59833b35..0e0b6fc8e50d 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -1,4 +1,7 @@
-args@{...}: with args;
+args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext
+, composableDerivation, lib, config, python, perl, tcl, ruby, qt4
+, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
+, libICE, ... }: with args;
let tag = "20140827";
sha256 = "02adf2212872db3c5d133642d2c12fbfc28b506e4c0c42552e3d079756f63f65";
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index a4dc3fe367ad..916f296b3fcc 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -1,6 +1,3 @@
-# Note: this relies on dyre patched for NIX_GHC which is done in
-# haskell-ng only.
-#
# To use this for hacking of your Yi config file, drop into a shell
# with env attribute.
{ stdenv, makeWrapper
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 4ded807cb29a..e5c49846b23c 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -1,27 +1,29 @@
-{stdenv, fetchurl, djvulibre, qt4, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }:
+let
+ qt = qt4;
+ # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error
+in
stdenv.mkDerivation rec {
- name = "djview-4.8";
- src = fetchurl {
- url = "mirror://sourceforge/djvu/${name}.tar.gz";
- sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c";
- };
-
- buildInputs = [djvulibre qt4];
+ name = "djview-4.10.3";
+ src = fetchurl {
+ url = "mirror://sourceforge/djvu/${name}.tar.gz";
+ sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h";
+ };
nativeBuildInputs = [ pkgconfig ];
- patches = [ ./djview4-qt-4.8.patch ];
+ buildInputs = [ djvulibre qt xorg.libXt libtiff ];
passthru = {
mozillaPlugin = "/lib/netscape/plugins";
};
- meta = {
- homepage = http://djvu.sourceforge.net/djview4.html;
- description = "A new portable DjVu viewer and browser plugin";
- license = stdenv.lib.licenses.gpl2;
- inherit (qt4.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
- };
+ meta = with stdenv.lib; {
+ homepage = http://djvu.sourceforge.net/djview4.html;
+ description = "A portable DjVu viewer and browser plugin";
+ license = licenses.gpl2;
+ inherit (qt.meta) platforms;
+ maintainers = [ maintainers.urkud ];
+ };
}
diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch
deleted file mode 100644
index ce3694197f60..000000000000
--- a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Origin: OpenSUSE
-Index: djview-4.8/src/qdjvuwidget.cpp
-===================================================================
---- djview-4.8.orig/src/qdjvuwidget.cpp
-+++ djview-4.8/src/qdjvuwidget.cpp
-@@ -153,7 +153,7 @@ all_numbers(const char *s)
- }
-
- template static inline void
--swap(T& x, T& y)
-+myswap(T& x, T& y)
- {
- T tmp;
- tmp = x;
-@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k)
- /* Sort v[lo], v[m], v[hi] by insertion */
- m = (lo+hi)/2;
- if (v[lo]>v[m])
-- swap(v[lo],v[m]);
-+ myswap(v[lo],v[m]);
- if (v[m]>v[hi]) {
-- swap(v[m],v[hi]);
-+ myswap(v[m],v[hi]);
- if (v[lo]>v[m])
-- swap(v[lo],v[m]);
-+ myswap(v[lo],v[m]);
- }
- /* Extract pivot, place sentinel */
- pivot = v[m];
-@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k)
- do ++l; while (v[l]pivot);
- if (l < h) {
-- swap(v[l],v[h]);
-+ myswap(v[l],v[h]);
- goto loop;
- }
- /* Finish up */
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 536249e70a60..95cfcaef01a2 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
, libX11, quantumdepth ? 8}:
-let version = "1.3.18"; in
+let version = "1.3.21"; in
stdenv.mkDerivation {
name = "graphicsmagick-${version}";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
- sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
+ sha256 = "07rwpxy62r9m4r2cg6yll2nr698mxyvbji8vgsivcxhpk56k0ich";
};
configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 2d41cfe51891..7ae6d6e050fa 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,21 +1,30 @@
-{ stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }:
+{ stdenv, fetchurl, cmake, makeWrapper, qt5, exiv2, graphicsmagick }:
let
- version = "1.2";
+ version = "1.3";
+ qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [
+ qt5.quickcontrols
+ qt5.declarative
+ qt5.multimedia
+ ];
in
stdenv.mkDerivation rec {
name = "photoqt-${version}";
src = fetchurl {
url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
- sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa";
+ sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
};
- buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ];
+ buildInputs = [ cmake makeWrapper qt5.base qt5.tools exiv2 graphicsmagick ];
preConfigure = ''
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
'';
+ postInstall = ''
+ wrapProgram $out/bin/photoqt --set QML2_IMPORT_PATH "${qmlPath}"
+ '';
+
meta = {
homepage = "http://photoqt.org/";
description = "Simple, yet powerful and good looking image viewer";
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 2591c3f7ffb8..ba95445a50a2 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb, libxml2
-, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
+{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
+, libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
-let version = "3.17.90"; in
+let version = "3.17.92"; in
stdenv.mkDerivation rec {
name = "simple-scan-${version}";
src = fetchurl {
- sha256 = "0xc3ln97dgvxrwy2qn82k9qvsr5kxksms4igzkivya3xpq2kx85c";
+ sha256 = "0ax4rqqpwcz65nvw8l89npjc5v0g1ik1mb5w3025xlipm7djgybp";
url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
};
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
+ inherit version;
description = "Simple scanning utility";
longDescription = ''
A really easy way to scan both documents and photos. You can crop out the
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://launchpad.net/simple-scan;
license = licenses.gpl3Plus;
- platforms = with platforms; linux;
+ platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 9fa624435ed4..372c11b5bda5 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm
-, libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick
-, intltool
+{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
+, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
+, imagemagick, intltool
}:
let
- version = "0.64.3";
+ version = "1.0.1";
ETL = stdenv.mkDerivation rec {
- name = "ETL-0.04.17";
+ name = "ETL-0.04.19";
src = fetchurl {
- url = "mirror://sourceforge/synfig/${name}.tar.gz";
- sha256 = "0rb9czkgan41q6xlck97kh77g176vjm1wnq620sqky7k2hiahr3s";
+ url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
+ sha256 = "1zmqv2fa5zxprza3wbhk5mxjk7491jqshxxai92s7fdiza0nhs91";
};
};
@@ -19,8 +19,8 @@ let
name = "synfig-${version}";
src = fetchurl {
- url = "mirror://sourceforge/synfig/synfig-${version}.tar.gz";
- sha256 = "0p4wqjidb4k3viahck4wzbh777f5ifpivn4vxhxs5fbq8nsvqksh";
+ url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
+ sha256 = "0l1f2xwmzds32g46fqwsq7j5qlnfps6944chbv14d3ynzgyyp1i3";
};
configureFlags = [
@@ -28,10 +28,8 @@ let
"--with-boost-libdir=${boost.lib}/lib"
];
- patches = [ ./synfig-cstring.patch ];
-
buildInputs = [
- ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango
+ ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libtool libxmlxx pango
pkgconfig
];
};
@@ -40,22 +38,19 @@ stdenv.mkDerivation rec {
name = "synfigstudio-${version}";
src = fetchurl {
- url = "mirror://sourceforge/synfig/${name}.tar.gz";
- sha256 = "1li3ac8qvg25h9fgym0zywnq5bg3sgbv162xs4c6pwksn75i6gsv";
+ url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
+ sha256 = "0jfa946rfh0dbagp18zknlj9ffrd4h45xcy2dh2vlhn6jdm08yfi";
};
buildInputs = [
- ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool
- intltool libsigcxx libtool libxmlxx pkgconfig synfig
+ ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool
+ libjack2 libsigcxx libtool libxmlxx makeWrapper mlt-qt5 pkgconfig
+ synfig
];
- configureFlags = [
- "--with-boost=${boost.dev}"
- "--with-boost-libdir=${boost.lib}/lib"
- ];
-
- preBuild = ''
- export FONTCONFIG_FILE=${fontsConf}
+ postInstall = ''
+ wrapProgram "$out/bin/synfigstudio" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch b/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
deleted file mode 100644
index 51eb77042161..000000000000
--- a/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://www.synfig.org/issues/thebuggenie/synfig/issues/438
---- a/src/modules/mod_png/trgt_png.cpp
-+++ b/src/modules/mod_png/trgt_png.cpp
-@@ -39,6 +39,7 @@
- #include
- #include
- #include
-+#include
-
- #endif
-
-
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index cacefc9bcc12..7e01d3847d56 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -1,4 +1,4 @@
-a :
+a @ { libXt, libX11, libXext, xextproto, xproto, gsl, aalib, zlib, intltool, gettext, perl, ... }:
let
fetchurl = a.fetchurl;
diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh
index 875141341a7c..a18324e513f1 100755
--- a/pkgs/applications/kde-apps-15.04/packages.sh
+++ b/pkgs/applications/kde-apps-15.04/packages.sh
@@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/applications/15.04.3/" \
"$@" -A '*.tar.xz'
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
diff --git a/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch b/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch
deleted file mode 100644
index f01fec390d43..000000000000
--- a/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 55e33019afcb3256cccedf606548b86816f6da59 Mon Sep 17 00:00:00 2001
-From: Chris Bagwell
-Date: Sat, 13 Dec 2014 12:48:37 -0600
-Subject: [PATCH 1/2] Check for minimum size sphere headers
-
----
- src/sphere.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/sphere.c b/src/sphere.c
-index 479a552..a3fd1c6 100644
---- a/src/sphere.c
-+++ b/src/sphere.c
-@@ -47,6 +47,11 @@ static int start_read(sox_format_t * ft)
-
- /* Determine header size, and allocate a buffer large enough to hold it. */
- sscanf(fldsval, "%lu", &header_size_ul);
-+ if (header_size_ul < 16) {
-+ lsx_fail_errno(ft, SOX_EHDR, "Error reading Sphere header");
-+ return (SOX_EOF);
-+ }
-+
- buf = lsx_malloc(header_size = header_size_ul);
-
- /* Skip what we have read so far */
---
-2.1.0
-
diff --git a/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch b/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch
deleted file mode 100644
index 72c2d765a945..000000000000
--- a/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ebb64cddde59ecc9cedf3741ce2337c72148cc0c Mon Sep 17 00:00:00 2001
-From: Chris Bagwell
-Date: Sat, 13 Dec 2014 12:49:55 -0600
-Subject: [PATCH 2/2] More checks for invalid MS ADPCM blocks.
-
-If block doesn't exacty match blockAlign then do not allow
-number of samples in invalid size block to ever be more than
-what WAV header defined as samplesPerBlock.
----
- src/wav.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wav.c b/src/wav.c
-index 61d5908..5202556 100644
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -168,7 +168,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * ft)
- /* work with partial blocks. Specs say it should be null */
- /* padded but I guess this is better than trailing quiet. */
- samplesThisBlock = lsx_ms_adpcm_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t)0);
-- if (samplesThisBlock == 0)
-+ if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock)
- {
- lsx_warn("Premature EOF on .wav input file");
- return 0;
---
-2.1.0
-
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index fa6e53bcf972..9a30e4669eed 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -11,20 +11,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "sox-14.4.1";
+ name = "sox-14.4.2";
src = fetchurl {
url = "mirror://sourceforge/sox/${name}.tar.gz";
- sha256 = "16x8gykfjdhxg0kdxwzcwgwpm5caa08y2mx18siqsq0ywmpjr34s";
+ sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl";
};
- patches = [
- # Patches for CVE-2014-8145, found via RedHat bug 1174792. It was not
- # clear whether these address a NULL deref and a division by zero.
- ./0001-Check-for-minimum-size-sphere-headers.patch
- ./0002-More-checks-for-invalid-MS-ADPCM-blocks.patch
- ];
-
buildInputs =
optional (enableAlsa && stdenv.isLinux) alsaLib ++
optional enableLibao libao ++
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index abea6201e759..5bd9bcf5c49e 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "calibre-${version}";
- version = "2.36.0";
+ version = "2.38.0";
src = fetchurl {
url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
- sha256 = "1my7fjj1lc28mhmvb85rcc4c5bwsycs6bgmafbx9agil5bgrbnb2";
+ sha256 = "075axil53djss99fj9drfh5cvxdbjw6z5z5qk53vm13k5pw6bmhn";
};
inherit python;
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
new file mode 100644
index 000000000000..50ae2b2d15f6
--- /dev/null
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }:
+
+stdenv.mkDerivation rec {
+ name = "devilspie2-${version}";
+ version = "0.39";
+
+ src = fetchurl {
+ url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.39-src.tar.gz";
+ sha256 = "07b74ffc078e5f01525d9da7a1978b4c1a9725b814b344f83a1a203cf4caae09";
+ };
+
+ buildInputs = [ intltool pkgconfig glib gtk lua libwnck3 ];
+
+ patchPhase = ''
+ sed -i -e s@/usr/local@$out@ Makefile
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/man/man1
+ cp bin/devilspie2 $out/bin
+ cp devilspie2.1 $out/share/man/man1
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Devilspie2 is a window matching utility.";
+ longDescription = ''
+ Devilspie2 is a window matching utility, allowing the user to
+ perform scripted actions on windows as they are created. For
+ example you can script a terminal program to always be
+ positioned at a specific screen position, or position a window
+ on a specific workspace.
+ '';
+ homepage = http://www.gusnan.se/devilspie2/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.ebzzry ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 40bb2e8fe568..ba3bd5f0f0de 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchgit, cmake, qt5, file, kde5}:
let
- version = "git-2015-06-10";
+ version = "git-2015-07-25";
in
stdenv.mkDerivation rec {
name = "dfilemanager-${version}";
src = fetchgit {
url = "git://git.code.sf.net/p/dfilemanager/code";
- rev = "806a28aa8fed30941a2fd6784c7c9c240bca30e3";
- sha256 = "1k15qzjmqg9ffv4cl809b071dpyckf8jspkhfhpbmfd9wasr0m7i";
+ rev = "99afcde199378eb0d499c49a9e28846c22e27483";
+ sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf";
};
buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://dfilemanager.sourceforge.net/";
description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling";
- #license = stdenv.lib.licenses; # license not specified
+ license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.eduarrrd ];
};
diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index 3e737544d186..10b8065c6237 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }:
stdenv.mkDerivation rec {
-
- name = "gpa-0.9.7";
+ name = "gpa-0.9.9";
src = fetchurl {
url = "mirror://gnupg/gpa/${name}.tar.bz2";
- sha256 = "1r8pnvfw66b2m9lhajlarbxx9172c1gzripdij01bawgbrhwp33y";
+ sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38";
};
buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ];
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 32c95ec147bd..1e6d924b63a5 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -1,4 +1,4 @@
-a :
+a @ { libgphoto2, fuse, pkgconfig, glib, libtool, ... } :
let
fetchurl = a.fetchurl;
s = import ./src-info-for-gphotofs.nix;
diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix
index 823b6cdf5387..5ff14458840b 100644
--- a/pkgs/applications/misc/grass/default.nix
+++ b/pkgs/applications/misc/grass/default.nix
@@ -1,4 +1,11 @@
-{ config, ... }@a:
+{ config, libXmu, libXext, libXp, libX11, libXt, libSM, libICE, libXpm
+ , libXaw, libXrender
+ , composableDerivation, stdenv, fetchurl
+ , lib, flex, bison, cairo, fontconfig
+ , gdal, zlib, ncurses, gdbm, proj, pkgconfig, swig
+ , blas, liblapack, libjpeg, libpng, mysql, unixODBC, mesa, postgresql, python
+ , readline, sqlite, tcl, tk, libtiff, freetype, makeWrapper, wxGTK, ffmpeg, fftw
+ , wxPython, motif, opendwg }@a:
# You can set gui by exporting GRASS_GUI=..
# see http://grass.itc.it/gdp/html_grass64/g.gui.html
@@ -28,7 +35,7 @@ a.composableDerivation.composableDerivation {} (fix: {
name = "grass-6.4.0RC6";
buildInputs = [
- # gentoos package depends on gmath ?
+ # gentoos package depends on gmath ?
a.pkgconfig
a.flex a.bison a.libXmu a.libXext a.libXp a.libX11 a.libXt a.libSM a.libICE
a.libXpm a.libXaw a.flex a.bison a.gdbm
@@ -72,7 +79,7 @@ a.composableDerivation.composableDerivation {} (fix: {
configureFlags = [ "--with-python=${a.python}/bin/python-config" ];
buildInputs = [a.python a.swig];
};
-
+
}
// edf { name = "_64bit"; feat = "64bit"; }
// wwfp a.ncurses { name = "curses"; }
@@ -119,7 +126,7 @@ a.composableDerivation.composableDerivation {} (fix: {
// wwfp a.unixODBC { name = "odbc"; }
// wwfp a.fftw { name = "fftw"; }
// wwf {
- name = "blas";
+ name = "blas";
enable.configureFlags = [ "--with-blas-libs=${a.blas}/lib" ];
}
// wwf {
diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix
index 8a31c591b29b..bb91c90e2fcf 100644
--- a/pkgs/applications/misc/hello/ex-2/default.nix
+++ b/pkgs/applications/misc/hello/ex-2/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
- doCheck = true;
+ doCheck = false;
+
+ separateDebugInfo = true;
meta = {
description = "A program that produces a familiar, friendly greeting";
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index ff61ea5d0103..6a5ce9fd6043 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }:
stdenv.mkDerivation {
- name = "keepassx2-2.0beta1";
+ name = "keepassx2-2.0beta2";
src = fetchurl {
- url = "https://github.com/keepassx/keepassx/archive/2.0-beta1.tar.gz";
- sha256 = "1wnbk9laixz16lmchr1lnv8m9i6rkxv6slnx8f0fyczx90y97qdw";
+ url = "https://github.com/keepassx/keepassx/archive/2.0-beta2.tar.gz";
+ sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q";
};
buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 4bf398609899..e626f3998f9f 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgs, pythonPackages }:
pythonPackages.buildPythonPackage rec {
- version = "0.4.1";
+ version = "0.5.0";
name = "khard-${version}";
namePrefix = "";
src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
- sha256 = "09yibjzly711hwpg345n653rz47llvrj4shnlcxd8snzvg8m5gri";
+ sha256 = "0k3pix4zdr5jc323w63kwrfhkvmn5ijnznzfhf6rvqp05lrkyh9x";
};
propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix
index 9295eaabf322..8db606fd6d59 100644
--- a/pkgs/applications/misc/lxappearance/default.nix
+++ b/pkgs/applications/misc/lxappearance/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }:
stdenv.mkDerivation rec {
- name = "lxappearance-0.5.5";
+ name = "lxappearance-0.6.1";
src = fetchurl{
url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz";
- sha256 = "8cae82e6425ba8a0267774e4d10096df2d91b0597520058331684a5ece068b4c";
+ sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9";
};
buildInputs = [ intltool libX11 pkgconfig gtk ];
meta = {
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 12dbbe6a9aa4..e1807b3aff94 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -2,12 +2,12 @@
, libX11, libXext }:
stdenv.mkDerivation rec {
- version = "1.7a";
+ version = "1.7";
name = "mupdf-${version}";
src = fetchurl {
url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
- sha256 = "073xq6kczq331awycvznpc49b22idqzdlw4g9254zi0z07x5y0wc";
+ sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh";
};
buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
new file mode 100644
index 000000000000..b39eeac68789
--- /dev/null
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -0,0 +1,114 @@
+{ stdenv
+, makeWrapper
+, fetchurl
+, wxPython
+, libXmu
+, cabextract
+, gettext
+, glxinfo
+, gnupg1compat
+, icoutils
+, imagemagick
+, netcat
+, p7zip
+, python
+, unzip
+, wget
+, wine
+, xdg-user-dirs
+, xterm
+}:
+
+stdenv.mkDerivation rec {
+ name = "playonlinux-${version}";
+ version = "4.2.9";
+
+ src = fetchurl {
+ url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
+ sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildInputs =
+ [ wxPython
+ libXmu
+ cabextract
+ gettext
+ glxinfo
+ gnupg1compat
+ icoutils
+ imagemagick
+ netcat
+ p7zip
+ python
+ unzip
+ wget
+ wine
+ xdg-user-dirs
+ xterm
+ ];
+
+ patchPhase = ''
+ PYFILES="python/*.py python/lib/*.py tests/python/*.py"
+ sed -i "s/env python[0-9.]*/python/" $PYFILES
+ sed -i "s/ %F//g" etc/PlayOnLinux.desktop
+ '';
+
+ installPhase = ''
+ install -d $out/share/playonlinux
+ install -d $out/bin
+ cp -r . $out/share/playonlinux/
+
+ echo "#!${stdenv.shell}" > $out/bin/playonlinux
+ echo "$prefix/share/playonlinux/playonlinux \"\$@\"" >> $out/bin/playonlinux
+ chmod +x $out/bin/playonlinux
+
+ install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
+ '';
+
+ preFixupPhases = [ "preFixupPhase" ];
+
+ preFixupPhase = ''
+ for f in $out/bin/*; do
+ wrapProgram $f \
+ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
+ --prefix PATH : \
+ ${cabextract}/bin:\
+ ${gettext}/bin:\
+ ${glxinfo}/bin:\
+ ${gnupg1compat}/bin:\
+ ${icoutils}/bin:\
+ ${imagemagick}/bin:\
+ ${netcat}/bin:\
+ ${p7zip}/bin:\
+ ${python}/bin:\
+ ${unzip}/bin:\
+ ${wget}/bin:\
+ ${wine}/bin:\
+ ${xdg-user-dirs}/bin:\
+ ${xterm}/bin
+
+ done
+
+ for f in $out/share/playonlinux/bin/*; do
+ bunzip2 $f
+ done
+ '';
+
+ postFixupPhases = [ "postFixupPhase" ];
+
+ postFixupPhase = ''
+ for f in $out/share/playonlinux/bin/*; do
+ bzip2 $f
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GUI for managing Windows programs under linux";
+ homepage = https://www.playonlinux.com/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.a1russell ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index ea7663c24069..01f55498f806 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks }:
+{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }:
stdenv.mkDerivation rec {
name = "spacefm-${version}";
diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix
index 988db35500ba..73a9e343df9b 100644
--- a/pkgs/applications/misc/super_user_spark/default.nix
+++ b/pkgs/applications/misc/super_user_spark/default.nix
@@ -29,5 +29,5 @@ mkDerivation rec {
homepage = "https://github.com/NorfairKing/super-user-spark";
description = "A safe way to never worry about your beautifully configured system again";
platforms = ghc.meta.platforms;
- maintainers = stdenv.lib.maintainers.badi;
+ maintainers = [ stdenv.lib.maintainers.badi ];
}
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 946556140232..2afebec9ee36 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -16,7 +16,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/Applications
mkdir -p $out/bin
cp -r terminal-notifier.app $out/Applications
- ln -s $out/Applications/terminal-notifier.app/Contents/MacOS/terminal-notifier $out/bin/terminal-notifier
+ cat >$out/bin/terminal-notifier < openssl != null;
assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
-assert mouseSupport -> gpm != null;
+assert mouseSupport -> gpm-ncurses != null;
stdenv.mkDerivation rec {
name = "w3m-0.5.3";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ncurses boehmgc gettext zlib]
++ stdenv.lib.optional sslSupport openssl
- ++ stdenv.lib.optional mouseSupport gpm
+ ++ stdenv.lib.optional mouseSupport gpm-ncurses
++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix
index 14f5d251240e..596163336f7b 100644
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ b/pkgs/applications/networking/cluster/chronos/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules";
maintainers = with maintainers; [ offline ];
platforms = with platforms; unix;
+ broken = true; # doesn't build http://hydra.nixos.org/build/25768319
};
}
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
index 7dd2702325b2..968218309ed7 100644
--- a/pkgs/applications/networking/copy-com/default.nix
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation {
RPATH=${libPaths}:$out/${appdir}
echo "Updating rpaths to $RPATH in:"
- find "$out/${appdir}" -type f -a -perm /0100 \
+ find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
'';
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
deleted file mode 100644
index 0af104fa380f..000000000000
--- a/pkgs/applications/networking/drive/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
- rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68";
- name = "drive-${lib.strings.substring 0 7 rev}";
- goPackagePath = "github.com/odeke-em/drive";
- src = fetchFromGitHub {
- inherit rev;
- owner = "odeke-em";
- repo = "drive";
- sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps";
- };
-
- subPackages = [ "cmd/drive" ];
-
- buildInputs = [ pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client cli-spinner oauth2 text net ];
-
- dontInstallSrc = true;
-
- meta = with lib; {
- description = "A tiny program to pull or push Google Drive files";
- homepage = https://github.com/odeke-em/drive;
- license = licenses.asl20;
- maintainers = with maintainers; [ bobvanderlinden ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 3fa6fb51ee14..3b157857ff96 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -19,11 +19,11 @@
let
# NOTE: When updating, please also update in current stable, as older versions stop working
- version = "3.8.5";
+ version = "3.8.9";
sha256 =
{
- "x86_64-linux" = "1r0wz2fsx2piasl04qsgwbl88bi0ajr0dm2swbslxwkf789vk18y";
- "i686-linux" = "1dvfgp9dg3frhwmchwa6fyws4im9vgicchfsv0zzflvc7rm9fcig";
+ "x86_64-linux" = "1mdhf57bqi4vihbzv5lz8zk4n576c1qjm7hzcq4f5qvkdsmp5in2";
+ "i686-linux" = "0gighh782jjmlgqgbw2d00a3ri5h3inqdik7v70f1yygvkr7awy8";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
@@ -101,12 +101,12 @@ in stdenv.mkDerivation {
rm "$out/${appdir}/qt.conf"
rm -fr "$out/${appdir}/plugins"
- find "$out/${appdir}" -type f -a -perm /0100 \
+ find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
echo "updating rpaths to: $RPATH"
- find "$out/${appdir}" -type f -a -perm /0100 \
+ find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
mkdir -p "$out/share/applications"
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index e6f6c162067c..5786d708cd6c 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,29 +1,16 @@
{ stdenv, fetchFromGitHub, cppcheck, libmrss }:
-let version = "2.0"; in
+let version = "2015-09-06"; in
stdenv.mkDerivation rec {
name = "rsstail-${version}";
src = fetchFromGitHub {
- sha256 = "0fbsyl5bdxr2g25ps7kd34sa0mzggklbg4v7qss68gh82zdp16ch";
- rev = "69dc5e30439b89c037aa49c5af861f28df607c72";
+ sha256 = "1rfzib5fzm0i8wf3njld1lvxgbci0hxxnvp2qx1k4bwpv744xkpx";
+ rev = "16636539e4cc75dafbfa7f05539769be7dad4b66";
repo = "rsstail";
owner = "flok99";
};
- meta = with stdenv.lib; {
- inherit version;
- description = "Monitor RSS feeds for new entries";
- longDescription = ''
- RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
- detects a new entry it'll emit only that new entry.
- '';
- homepage = http://www.vanheusden.com/rsstail/;
- license = licenses.gpl2Plus;
- platforms = with platforms; linux;
- maintainers = with maintainers; [ nckx ];
- };
-
buildInputs = [ libmrss ]
++ stdenv.lib.optional doCheck cppcheck;
@@ -35,4 +22,17 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
+
+ meta = with stdenv.lib; {
+ inherit version;
+ description = "Monitor RSS feeds for new entries";
+ longDescription = ''
+ RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
+ detects a new entry it'll emit only that new entry.
+ '';
+ homepage = http://www.vanheusden.com/rsstail/;
+ license = licenses.gpl2Plus;
+ platforms = with platforms; linux;
+ maintainers = with maintainers; [ nckx ];
+ };
}
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 2e8a28d03c87..51b5df176ccf 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
-, pkgconfig, xdg_utils, gtk2, sqlite }:
+, pkgconfig, xdg_utils, gtk2, sqlite, pugixml }:
-let version = "3.12.0.2"; in
+let version = "3.14.0"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "038xgvajn0nq1dzw1pac3xwhmil1y17vhadd2hx0vl4lrp16yabs";
+ sha256 = "1zbrsmrqnxzj6cnf2y1sx384nv6c8l3338ynazjfbiqbyfs5lf4j";
};
configureFlags = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
buildInputs = [
dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite
- ];
+ pugixml ];
meta = with stdenv.lib; {
homepage = http://filezilla-project.org/;
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
new file mode 100644
index 000000000000..1427cc06ce42
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ name = "bitlbee-facebook-2015-08-27";
+
+ src = fetchFromGitHub {
+ rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062";
+ owner = "jgeboski";
+ repo = "bitlbee-facebook";
+ sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl";
+ };
+
+ buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ];
+
+ preConfigure = ''
+ export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+ ./autogen.sh
+ '';
+
+ meta = {
+ description = "The Facebook protocol plugin for bitlbee";
+
+ homepage = https://github.com/jgeboski/bitlbee-facebook;
+ license = licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index ddaaa35da558..41a698be2907 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
+{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -12,12 +12,21 @@ stdenv.mkDerivation rec {
buildInputs = [ gnutls glib pkgconfig libotr python ]
++ optional doCheck check;
+ patches = [(fetchpatch {
+ url = "https://github.com/bitlbee/bitlbee/commit/34d16d5b4b5265990125894572a90493284358cd.patch";
+ sha256 = "05in9kxabb6s2c1l4b9ry58ppfciwmwzrkaq33df2zv0pr3z7w33";
+ })];
+
configureFlags = [
"--gcov=1"
"--otr=1"
"--ssl=gnutls"
];
+ buildPhase = ''
+ make install-dev
+ '';
+
doCheck = true;
meta = {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
new file mode 100644
index 000000000000..4e05e7cae970
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
@@ -0,0 +1,20 @@
+{ stdenv, bitlbee }:
+
+with stdenv.lib;
+
+plugins:
+
+stdenv.mkDerivation {
+ inherit bitlbee plugins;
+ name = "bitlbee-plugins";
+ buildInputs = [ bitlbee plugins ];
+ phases = [ "installPhase" ];
+ installPhase = ''
+ mkdir -p $out/lib/bitlbee
+ for plugin in $plugins; do
+ for thing in $(ls $plugin/lib/bitlbee); do
+ ln -s $plugin/lib/bitlbee/$thing $out/lib/bitlbee/
+ done
+ done
+ '';
+}
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index addbc060977e..7bb14efc1bb5 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -3,11 +3,11 @@
pythonPackages.buildPythonPackage rec {
name = "blink-${version}";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchurl {
url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
- sha256 = "0vd4ky4djhrrlmfpz7g43bxjynhpql4d3s9jdirh21kc8d1bgayk";
+ sha256 = "0lpc3gm0hk55m7i2hlmk2p76akcfvnqxg0hyamfhha90nv6fk7sf";
};
patches = [ ./pythonpath.patch ];
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 909d6404193c..7368a8842147 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -1,11 +1,15 @@
-args : with args;
+args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss
+, gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
+, libtool, automake, autoconf, gstreamer
+, gtk, glib
+, libXScrnSaver, scrnsaverproto, libX11, xproto, kbproto, ... }: with args;
/*
arguments: all buildInputs
- optional: purple2Source: purple-2 source - place to copy libpurple from
+ optional: purple2Source: purple-2 source - place to copy libpurple from
(to use a fresher pidgin build)
*/
-let
- externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
+let
+ externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
in
rec {
src = fetchurl {
@@ -16,9 +20,9 @@ rec {
buildInputs = [gtkspell aspell
gstreamer startupnotification
libxml2 openssl nss
- libXScrnSaver ncurses scrnsaverproto
+ libXScrnSaver ncurses scrnsaverproto
libX11 xproto kbproto GConf avahi
- dbus dbus_glib glib python
+ dbus dbus_glib glib python
autoconf libtool automake];
propagatedBuildInputs = [
@@ -38,11 +42,11 @@ rec {
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
++ (lib.optional externalPurple2 "postInstall")
;
-
+
name = "carrier-2.5.0";
meta = {
description = "PidginIM GUI fork with user-friendly development model";
- homepage = http://funpidgin.sf.net;
+ homepage = http://funpidgin.sf.net;
};
} // (if externalPurple2 then {
postInstall = fullDepEntry (''
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index f82ffa5ecd38..c6551307df9d 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -5,7 +5,7 @@
let
- version = "2.2.1373";
+ version = "2.2.1388";
rpath = stdenv.lib.makeSearchPath "lib" [
stdenv.glibc
@@ -47,12 +47,12 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
- sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n";
+ sha256 = "18vl0c7xgyzd2miwkfzc638z0wzszgsdlbnslkkvxmg95ykdrdnz";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
- sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5";
+ sha256 = "12q8hf3gmcgrqg6v9xqyknwsmwywpwm76jc54sfniiqv5ngq24hl";
}
else
throw "HipChat is not supported on ${stdenv.system}";
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 195c95884780..494f40f804e1 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, makeDesktopItem, unzip, ant, jdk }:
+{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
+# Optional, Jitsi still runs without, but you may pass null:
+, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xlibs
+}:
+
+assert stdenv.isLinux;
stdenv.mkDerivation rec {
@@ -22,6 +27,21 @@ stdenv.mkDerivation rec {
categories = "Application;Internet;";
};
+ libPath = lib.makeLibraryPath ([
+ stdenv.cc.cc # For libstdc++.
+ ] ++ lib.filter (x: x != null) [
+ alsaLib
+ dbus_libs
+ gtk2
+ libpulseaudio
+ openssl
+ ] ++ lib.optionals (xlibs != null) [
+ xlibs.libX11
+ xlibs.libXext
+ xlibs.libXScrnSaver
+ xlibs.libXv
+ ]);
+
buildInputs = [unzip ant jdk];
buildPhase = ''ant make'';
@@ -29,12 +49,21 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
cp -a lib $out/
+ rm -rf $out/lib/native/solaris
cp -a sc-bundles $out/
mkdir $out/bin
cp resources/install/generic/run.sh $out/bin/jitsi
chmod +x $out/bin/jitsi
- sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi
+ substituteInPlace $out/bin/jitsi \
+ --subst-var-by JAVA ${jdk}/bin/java \
+ --subst-var-by EXTRALIBS ${gtk2}/lib
patchShebangs $out
+
+ libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
+ find $out/ -type f -name '*.so' | while read file; do
+ patchelf --set-rpath "$libPath" "$file" && \
+ patchelf --shrink-rpath "$file"
+ done
'';
meta = {
@@ -42,6 +71,7 @@ stdenv.mkDerivation rec {
description = "Open Source Video Calls and Chat";
license = stdenv.lib.licenses.lgpl21Plus.shortName;
platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.khumba ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
index 9163cecd175b..9db7ec368b08 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
+++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
@@ -7,7 +7,7 @@
+
+#mkdir -p $HOME/.sip-communicator/log
+
-+cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )" )"
++cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
# Get architecture
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
@@ -24,4 +24,4 @@
export PATH=$PATH:native
-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
-+exec java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
++LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 8b19f338d3e6..36be2517fbd0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
-let version = "1.18.1"; in
+let version = "1.20.0"; in
stdenv.mkDerivation {
name = "pidgin-sipe-${version}";
src = fetchurl {
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
- sha256 = "18ch7jpi7ki7xlpahi88xrnmnhc6dcq4hafm0z6d5nfjfp8ldal5";
+ sha256 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 1a9f8f8feab6..ac4776c20722 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
-, ncurses, libotr, curl, libstrophe
+, ncurses, libotr, curl, libstrophe, readline, libuuid
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
@@ -12,15 +12,15 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "profanity-${version}";
- version = "0.4.6";
+ version = "0.4.7";
src = fetchurl {
url = "http://www.profanity.im/profanity-${version}.tar.gz";
- sha256 = "17ra53c1m0w0lzm5bj63y1ysx8bv119z5h0csisxsn4r85z6cwln";
+ sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h";
};
buildInputs = [
- automake autoconf pkgconfig
+ automake autoconf pkgconfig readline libuuid
glib openssl expat ncurses libotr curl libstrophe
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk_pixbuf ];
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index c1944cf6d0de..4cc54b9f8120 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -54,6 +54,8 @@ in with stdenv; mkDerivation rec {
])
);
+ NIX_CFLAGS_COMPILE = "-fPIC";
+
cmakeFlags = [
"-DEMBED_DATA=OFF"
"-DSTATIC=OFF" ]
diff --git a/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch b/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
new file mode 100644
index 000000000000..46224ede33d4
--- /dev/null
+++ b/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
@@ -0,0 +1,43 @@
+From e57f22a5089f194013534c9a9bbc42ee639297f1 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel
+Date: Sat, 19 Sep 2015 11:10:32 -0500
+Subject: [PATCH] unbundled qwt
+
+---
+ linssid-app/linssid-app.pro | 4 +---
+ linssid.pro | 4 +---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/linssid-app/linssid-app.pro b/linssid-app/linssid-app.pro
+index 26f61e7..7b80b60 100644
+--- a/linssid-app/linssid-app.pro
++++ b/linssid-app/linssid-app.pro
+@@ -19,13 +19,11 @@ QMAKE_CC = gcc
+ QMAKE_CXX = g++
+ DEFINES +=
+ INCLUDEPATH += /usr/include/qt5
+-# /usr/local/qwt-6.1.0/include
+-INCLUDEPATH += ../qwt-lib/src
+ # LIBS += /usr/lib/x86_64-linux-gnu/libboost_regex.a
+ # LIBS += -lboost_regex
+ LIBS += -l:libboost_regex.a
+ # /usr/local/qwt-6.1.0/lib/libqwt.a
+-LIBS += ../qwt-lib/lib/libqwt.a
++LIBS += -lqwt
+ QMAKE_CXXFLAGS += -std=c++11
+ #
+ TARGET = linssid
+diff --git a/linssid.pro b/linssid.pro
+index 42dc277..26d1a2c 100644
+--- a/linssid.pro
++++ b/linssid.pro
+@@ -1,5 +1,3 @@
+ TEMPLATE = subdirs
+ CONFIG += ordered
+-SUBDIRS = qwt-lib \
+- linssid-app
+-linssid-app.depends = qwt-lib
++SUBDIRS = linssid-app
+--
+2.5.2
+
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 2b4c5f564bec..369010f41b52 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw }:
+{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw, qwt6 }:
stdenv.mkDerivation rec {
name = "linssid-${version}";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
};
- buildInputs = [ qt5 pkgconfig boost ];
+ buildInputs = [ qt5.base qt5.svg pkgconfig boost qwt6 ];
+
+ patches = [ ./0001-unbundled-qwt.patch ];
postPatch = ''
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
@@ -20,6 +22,9 @@ stdenv.mkDerivation rec {
sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp
sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp
+
+ # Remove bundled qwt
+ rm -fr qwt-lib
'';
configurePhase = "qmake linssid.pro";
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index c22c1a275c36..23f5e4ec1bab 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv
, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, libarchive
, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager, openldap
-, perl, pkgconfig, poppler, python, webkitgtk2
+, perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2
# Build options
# TODO: A flag to build the manual.
@@ -39,6 +39,7 @@ stdenv.mkDerivation {
homepage = http://www.claws-mail.org/;
license = licenses.gpl3;
platforms = platforms.linux;
+ maintainers = [ maintainers.khumba ];
};
src = fetchurl {
@@ -46,6 +47,8 @@ stdenv.mkDerivation {
sha256 = "0w13xzri9d3165qsxf1dig1f0gxn3ib4lysfc9pgi4zpyzd0zgrw";
};
+ patches = [ ./mime.patch ];
+
buildInputs =
[ curl dbus dbus_glib gtk gnutls libetpan perl pkgconfig python ]
++ optional enableSpellcheck enchant
@@ -78,4 +81,13 @@ stdenv.mkDerivation {
++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin"
++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin"
++ optional (!enableSpellcheck) "--disable-enchant";
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ mkdir -p $out/share/applications
+ cp claws-mail.desktop $out/share/applications
+
+ ln -sT ${shared_mime_info}/share/mime $out/share/mime
+ '';
}
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
new file mode 100644
index 000000000000..5437c1c65d76
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
@@ -0,0 +1,14 @@
+--- a/src/procmime.c 2015-09-18 04:03:11.767654094 -0700
++++ b/src/procmime.c 2015-09-18 04:08:38.834503034 -0700
+@@ -1196,11 +1196,7 @@
+ if (mime_type_list)
+ return mime_type_list;
+
+-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
+-#else
+- if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL)
+-#endif
+ {
+ fp_is_glob_file = FALSE;
+ if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) {
diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix
index 6ea7089b3fb0..855ebdd05936 100644
--- a/pkgs/applications/networking/p2p/retroshare/0.6.nix
+++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchsvn, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
-, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher }:
+{ stdenv, fetchFromGitHub, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
+, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }:
stdenv.mkDerivation {
- name = "retroshare-0.6-svn-7445";
+ name = "retroshare-0.6-git-fabc3a3";
- src = fetchsvn {
- url = svn://svn.code.sf.net/p/retroshare/code/trunk;
- rev = 7445;
- sha256 = "1dqh65bn21g7ix752ddrr10kijjdwjgjipgysyxnm90zjmdlx3cc";
+ src = fetchFromGitHub {
+ owner = "RetroShare";
+ repo = "RetroShare";
+ rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a";
+ sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher";
@@ -29,12 +30,14 @@ stdenv.mkDerivation {
# retroshare-nogui/src/retroshare-nogui.pro
buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
- protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher ];
+ protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ];
configurePhase = ''
qmake PREFIX=$out DESTDIR=$out RetroShare.pro
'';
+ enableParallelBuilding = true;
+
postInstall = ''
mkdir -p $out/bin
mv $out/retroshare-nogui $out/bin
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 01ba9ff47eaa..5d76b295dda3 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, makeWrapper, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
+{ stdenv, autoconf, automake, libtool, makeWrapper, fetchgit, pkgconfig
+, intltool, gtk3, json_glib, curl }:
stdenv.mkDerivation rec {
- name = "transmission-remote-gtk-1.1.1";
+ name = "transmission-remote-gtk-${version}";
+ version = "1.2";
- src = fetchurl {
- url = "http://transmission-remote-gtk.googlecode.com/files/${name}.tar.gz";
- sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz";
+ src = fetchgit {
+ url = "https://github.com/ajf8/transmission-remote-gtk.git";
+ rev = "aa4e0c7d836cfcc10d8effd10225abb050343fc8";
+ sha256 = "0qz0jzr5w5fik2awfps0q49blwm4z7diqca2405rr3fyhyjhx42b";
};
- buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ];
+ buildInputs = [ libtool autoconf automake makeWrapper pkgconfig intltool
+ gtk3 json_glib curl ];
+
+ preConfigure = "sh autogen.sh";
preFixup = ''
wrapProgram "$out/bin/transmission-remote-gtk" \
@@ -19,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib;
{ description = "GTK remote control for the Transmission BitTorrent client";
- homepage = http://code.google.com/p/transmission-remote-gtk/;
+ homepage = https://github.com/ajf8/transmission-remote-gtk;
license = licenses.gpl2;
maintainers = [ maintainers.emery ];
platforms = platforms.linux;
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ac2d11a33f16..40e3fdef9803 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null;
with stdenv.lib;
let
- version = "1.12.5";
+ version = "1.12.7";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2";
- sha256 = "10mxgj916bwv92pfhk4kldcaanr9vndjklzp9ypdxr29xyr7gwfh";
+ sha256 = "0b7rc1l1gvzcz7gfa6g7pcn32zrcfiqjx0rxm6cg3q1cwwa1qjn7";
};
buildInputs = [
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
deleted file mode 100644
index f42426b3cafd..000000000000
--- a/pkgs/applications/networking/syncthing/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, fetchgit, goPackages }:
-
-with goPackages;
-
-buildGoPackage rec {
- name = "syncthing-${version}";
- version = "0.11.22";
- goPackagePath = "github.com/syncthing/syncthing";
- src = fetchgit {
- url = "git://github.com/syncthing/syncthing.git";
- rev = "refs/tags/v${version}";
- sha256 = "0zdk5ppsq35s10chf8m3rw3sk9d77ms7x1vj3inw4lrm1h13w9wk";
- };
-
- subPackages = [ "cmd/syncthing" ];
-
- buildFlagsArray = "-ldflags=-w -X main.Version v${version}";
-
- preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-
- doCheck = true;
-
- dontInstallSrc = true;
-
- meta = {
- homepage = http://syncthing.net/;
- description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ matejc theuni ];
- platforms = with lib.platforms; unix;
- };
-}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 21551beb9dce..f1adef86dc94 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,23 +1,17 @@
-# when updating version, wait for the build to fail
-# run make without sourcing the environment and let libreoffice
-# download all extra files
-# then list extra files separated by newline and pipe them to
-# generate-libreoffice-srcs.sh and copy output to libreoffice-srcs.nix
-
{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, cups, xorg
+, icu, boost, jdk, ant, cups, xorg, libcmis
, openssl, gperf, cppunit, GConf, ORBit2, poppler
-, librsvg, gnome_vfs, mesa
+, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb
+, gdb, commonsLogging
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
, withHelp ? true
}:
@@ -26,27 +20,11 @@ let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "5";
minor = "0";
- patch = "0";
- tweak = "5";
+ patch = "1";
+ tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
- # doesn't exist in srcs
- # 0.8 version is in 0.7.0 tarball
- libixion = stdenv.mkDerivation rec {
- version = "0.7.0";
- name = "libixion-${version}";
-
- src = fetchurl {
- url = "http://kohei.us/files/ixion/src/${name}.tar.bz2";
- sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9";
- };
-
- buildInputs = [ boost mdds pkgconfig ];
-
- configureFlags = [ "--with-boost=${boost.dev}" ];
- };
-
fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
inherit name md5;
url = if brief then
@@ -55,19 +33,6 @@ let
"http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}";
};
- # Can't find Boost inside LO build
- liborcus = stdenv.mkDerivation rec {
- name = "liborcus-0.7.0";
- src = fetchThirdParty (stdenv.lib.findFirst
- (x: x.name == "${name}.tar.bz2")
- ("Error: update liborcus version inside LO expression")
- (import ./libreoffice-srcs.nix));
-
- buildInputs = [ boost mdds pkgconfig zlib /*libixion*/ ];
-
- configureFlags = [ "--with-boost=${boost.dev}" ];
- };
-
fetchSrc = {name, sha256}: fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
inherit sha256;
@@ -82,24 +47,23 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "0x86vf1fhgnjgkj25rqcfgrvid6smikmb96121sasydmg0jcsypm";
+ sha256 = "0z8qf4ri8wmzgc5601fxcwxwym1h9rwk0kaqpxhqbkj04h9z0xq7";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "18wqmbm3yvjz6pfnz5qfklwv4d53vrv2npiz3796d4d1j245ylcv";
+ sha256 = "0iz9jz0ppghzh33kzw7v0xqchim9brys6mnmlk74nzrhci2vj7f7";
};
};
-in
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
name = "libreoffice-${version}";
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "046f5lakw2rygs5qjmhsxmdw7pa9gwcamavnyqpk1rfbis2ga5wv";
+ sha256 = "06nj1wnx09a6v3kx9k48810mkb19dbkaln1af33f4m7bxg5bjl87";
};
# Openoffice will open libcups dynamically, so we link it directly
@@ -119,30 +83,21 @@ stdenv.mkDerivation rec {
ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
'';
- patchPhase = ''
- find . -type f -print0 | xargs -0 sed -i \
- -e 's,! */bin/bash,!${bash}/bin/bash,' -e 's,\(!\|SHELL=\) */usr/bin/env bash,\1${bash}/bin/bash,' \
- -e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \
- -e 's,! */usr/bin/python,!${python3}/bin/${python3.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python3.executable},'
- #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
-
- '';
-
QT4DIR = qt4;
KDE4DIR = kde4.kdelibs;
- preConfigure = ''
- # Needed to find genccode
- PATH=$PATH:${icu}/sbin
+ # Fix boost 1.59 compat
+ # Try removing in the next version
+ CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
+ preConfigure = ''
configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES"
"--with-lang=${langsSpaces}"
- "${if withHelp then "" else "--without-help"}"
-
);
chmod a+x ./bin/unpack-sources
+ patchShebangs .
# It is used only as an indicator of the proper current directory
touch solenv/inc/target.mk
'';
@@ -167,7 +122,7 @@ stdenv.mkDerivation rec {
# This is required as some cppunittests require fontconfig configured
export FONTCONFIG_FILE=${fontsConf}
- # This to aovid using /lib:/usr/lib at linking
+ # This to avoid using /lib:/usr/lib at linking
sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
@@ -177,74 +132,76 @@ stdenv.mkDerivation rec {
# It installs only things to $out/lib/libreoffice
postInstall = ''
- mkdir -p $out/bin $out/share
+ mkdir -p $out/bin $out/share/desktop
+
for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done
- ln -s $out/bin/soffice $out/bin/libreoffice
+ ln -s $out/bin/soffice $out/bin/libreoffice
ln -s $out/lib/libreoffice/share/xdg $out/share/applications
+
for f in $out/share/applications/*.desktop; do
substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice"
substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice"
done
- mkdir -p "$out/share/desktop"
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
'';
configureFlags = [
+ "${if withHelp then "" else "--without-help"}"
"--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.lib}/lib"
+ "--with-beanshell-jar=${bsh}"
"--with-vendor=NixOS"
-
- # Without these, configure does not finish
- "--without-junit"
-
- # Without this, it wants to download
+ "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
+ "--disable-report-builder"
"--enable-python=system"
"--enable-dbus"
"--enable-kde4"
- "--disable-odk"
- "--with-system-cairo"
- "--with-system-libs"
- "--with-system-headers"
- "--with-system-openssl"
- "--with-system-openldap"
- "--without-system-libwps" # TODO
- "--without-doxygen"
-
- # I imagine this helps. Copied from go-oo.
- # Modified on every upgrade, though
- "--disable-kde"
- "--disable-postgresql-sdbc"
"--with-package-format=installed"
"--enable-epm"
"--with-jdk-home=${jdk.home}"
"--with-ant-home=${ant}/lib/ant"
+ "--with-system-cairo"
+ "--with-system-libs"
+ "--with-system-headers"
+ "--with-system-openssl"
+ "--with-system-libabw"
+ "--with-system-libcmis"
+ "--with-system-libwps"
+ "--with-system-openldap"
+ "--with-system-coinmp"
+
+ # Without these, configure does not finish
+ "--without-junit"
+
+ # I imagine this helps. Copied from go-oo.
+ # Modified on every upgrade, though
+ "--disable-kde"
+ "--disable-odk"
+ "--disable-postgresql-sdbc"
+ "--disable-firebird-sdbc"
"--without-fonts"
"--without-myspell-dicts"
- "--without-system-beanshell"
+ "--without-doxygen"
+
+ # TODO: package these as system libraries
+ "--with-system-beanshell"
"--without-system-hsqldb"
- "--without-system-jars"
"--without-system-altlinuxhyph"
"--without-system-lpsolve"
"--without-system-npapi-headers"
- "--without-system-libcmis"
-
"--without-system-libetonyek"
"--without-system-libfreehand"
- "--without-system-libabw"
- "--without-system-firebird"
"--without-system-liblangtag"
"--without-system-libmspub"
-
"--without-system-libpagemaker"
- "--without-system-coinmp"
"--without-system-libgltf"
-
+ # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"
];
@@ -260,21 +217,21 @@ stdenv.mkDerivation rec {
hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
- libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
+ libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base
neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
python3 sablotron saneBackends tcsh unzip vigra which zip zlib
- mdds bluez5 glibc
+ mdds bluez5 glibc libcmis libwps libabw
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew
- libodfgen
+ libodfgen CoinMP
];
meta = with stdenv.lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = http://libreoffice.org/;
license = licenses.lgpl3;
- maintainers = [ maintainers.viric maintainers.raskin ];
+ maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
deleted file mode 100755
index e5a867463bfc..000000000000
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/run/current-system/sw/bin/bash
-
-# Take the list of files from the main package, ooo.lst.in
-
-cat <&2;
- ;;
- *_MD5SUM\ :=*)
- read tbline;
- line=${line##* };
- tbline=${tbline##* };
- md5=$line
- name=$tbline;
- brief=true;
- write_entry;
- ;;
- *_TARBALL\ :=*)
- line=${line##* };
- md5=${line:0:32};
- name=${line:33};
- brief=false;
- write_entry;
- ;;
- *)
- echo Skipping: "$line" >&2;
- ;;
- esac
-done
-
-echo ']'
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index e8a0753c198b..22cf1857ae48 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -1,9 +1,5 @@
+# DEPRECATED: these dependencies sould be system libraries
[
-{
- name = "libabw-0.1.1.tar.bz2";
- md5 = "7a3815b506d064313ba309617b6f5a0b";
- brief = true;
-}
{
name = "commons-codec-1.6-src.tar.gz";
md5 = "2e482c7567908d334785ce7d69ddfff7";
@@ -44,61 +40,21 @@
md5 = "71a11d037240b292f824ba1eb537b4e3";
brief = true;
}
-{
- name = "boost_1_55_0.tar.bz2";
- md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
- brief = false;
-}
-{
- name = "bsh-2.0b5-src.zip";
- md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
- brief = false;
-}
-{
- name = "cairo-1.10.2.tar.gz";
- md5 = "f101a9e88b783337b20b2e26dfd26d5f";
- brief = false;
-}
-{
- name = "libcdr-0.1.1.tar.bz2";
- md5 = "b33fd0be3befdd1b37777e08ce058bd9";
- brief = true;
-}
{
name = "clucene-core-2.3.3.4.tar.gz";
md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
brief = false;
}
-{
- name = "libcmis-0.5.0.tar.gz";
- md5 = "5821b806a98e6c38370970e682ce76e8";
- brief = false;
-}
-{
- name = "CoinMP-1.7.6.tgz";
- md5 = "1cce53bf4b40ae29790d2c5c9f8b1129";
- brief = true;
-}
{
name = "collada2gltf-master-cb1d97788a.tar.bz2";
md5 = "4b87018f7fff1d054939d19920b751a0";
brief = false;
}
-{
- name = "cppunit-1.13.2.tar.gz";
- md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
- brief = true;
-}
{
name = "ConvertTextToNumber-1.3.2.oxt";
md5 = "451ccf439a36a568653b024534669971";
brief = false;
}
-{
- name = "curl-7.43.0.tar.bz2";
- md5 = "11bddbb452a8b766b932f859aaeeed39";
- brief = true;
-}
{
name = "libe-book-0.1.2.tar.bz2";
md5 = "6b48eda57914e6343efebc9381027b78";
@@ -119,16 +75,6 @@
md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
brief = false;
}
-{
- name = "Firebird-2.5.2.26540-0.tar.bz2";
- md5 = "21154d2004e025c8a3666625b0357bb5";
- brief = true;
-}
-{
- name = "fontconfig-2.8.0.tar.gz";
- md5 = "77e15a92006ddc2adbb06f840d591c0e";
- brief = false;
-}
{
name = "crosextrafonts-20130214.tar.gz";
md5 = "368f114c078f94214a308a74c7e991bc";
@@ -194,16 +140,6 @@
md5 = "dbf2caca1d3afd410a29217a9809d397";
brief = false;
}
-{
- name = "glew-1.10.0.zip";
- md5 = "594eb47b4b1210e25438d51825404d5a";
- brief = false;
-}
-{
- name = "glm-0.9.4.6-libreoffice.zip";
- md5 = "bae83fa5dc7f081768daace6e199adc3";
- brief = false;
-}
{
name = "graphite2-1.2.4.tgz";
md5 = "2ef839348fe28e3b923bf8cced440227";
@@ -289,16 +225,6 @@
md5 = "39bb3fcea1514f1369fcfc87542390fd";
brief = false;
}
-{
- name = "jpegsrc.v9a.tar.gz";
- md5 = "3353992aecaee1805ef4109aadd433e7";
- brief = true;
-}
-{
- name = "libjpeg-turbo-1.3.1.tar.gz";
- md5 = "2c3a68129dac443a72815ff5bb374b05";
- brief = true;
-}
{
name = "language-subtag-registry-2015-06-08.tar.bz2";
md5 = "d431bd8a70455be1fa8523fa633c005b";
@@ -345,26 +271,11 @@
md5 = "1f24ab1d39f4a51faf22244c94a6203f";
brief = false;
}
-{
- name = "libxml2-2.9.1.tar.gz";
- md5 = "9c0cfef285d5c4a5c80d00904ddab380";
- brief = false;
-}
-{
- name = "libxslt-1.1.28.tar.gz";
- md5 = "9667bf6f9310b957254fdcf6596600b7";
- brief = false;
-}
{
name = "lp_solve_5.5.tar.gz";
md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
brief = false;
}
-{
- name = "mariadb_client-2.0.0-src.tar.gz";
- md5 = "a233181e03d3c307668b4c722d881661";
- brief = false;
-}
{
name = "mdds_0.12.1.tar.bz2";
md5 = "ef2560ed5416652a7fe195305b14cebe";
@@ -410,16 +321,6 @@
md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6";
brief = true;
}
-{
- name = "openldap-2.4.31.tgz";
- md5 = "804c6cb5698db30b75ad0ff1c25baefd";
- brief = false;
-}
-{
- name = "openssl-1.0.2a.tar.gz";
- md5 = "a06c547dac9044161a477211049f60ef";
- brief = true;
-}
{
name = "liborcus-0.7.0.tar.bz2";
md5 = "7681383be6ce489d84c1c74f4e7f9643";
@@ -445,16 +346,6 @@
md5 = "35c0660065d023365e9854c13e289d12";
brief = true;
}
-{
- name = "postgresql-9.2.1.tar.bz2";
- md5 = "c0b4799ea9850eae3ead14f0a60e9418";
- brief = false;
-}
-{
- name = "Python-3.3.5.tgz";
- md5 = "803a75927f8f241ca78633890c798021";
- brief = true;
-}
{
name = "raptor2-2.0.9.tar.gz";
md5 = "4ceb9316488b0ea01acf011023cf7fff";
@@ -495,39 +386,9 @@
md5 = "0168229624cfac409e766913506961a8";
brief = false;
}
-{
- name = "vigra1.6.0.tar.gz";
- md5 = "d62650a6f908e85643e557a236ea989c";
- brief = false;
-}
-{
- name = "libvisio-0.1.1.tar.bz2";
- md5 = "726c1f5be65eb7d649e0d48b63d920e7";
- brief = true;
-}
-{
- name = "libwpd-0.10.0.tar.bz2";
- md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
- brief = true;
-}
-{
- name = "libwpg-0.3.0.tar.bz2";
- md5 = "17da9770cb8b317b7633f9807b32b71a";
- brief = true;
-}
-{
- name = "libwps-0.4.0.tar.bz2";
- md5 = "e9162d2566421d9d71b3ad2377a68fd5";
- brief = true;
-}
{
name = "xsltml_2.1.2.zip";
md5 = "a7983f859eafb2677d7ff386a023bc40";
brief = false;
}
-{
- name = "zlib-1.2.8.tar.gz";
- md5 = "44d667c142d7cda120332623eab69f40";
- brief = true;
-}
]
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index 0c3297ccc937..750fca150282 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -3,17 +3,19 @@
stdenv.mkDerivation rec {
name = "pinpoint-${version}";
- version = "0.1.4";
+ version = "0.1.6";
src = fetchurl {
- url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.bz2";
- sha256 = "26df7ba171d13f697c30c272460989b0f1b45e70c797310878a589ed5a6a47de";
+ url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz";
+ sha256 = "0jzkf74w75paflnvsil2y6qsyaqgxf6akz97176xdg6qri4nwal1";
};
buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf
cairo ];
- meta = {
+ meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint;
description = "A tool for making hackers do excellent presentations";
- license = stdenv.lib.licenses.lgpl21;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index c18a6ed7426c..63b757945d29 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -1,4 +1,4 @@
-args : with args;
+args @ { libxml2, perl, intltool, libtool, pkgconfig, gtk, ... } : with args;
let version = lib.attrByPath ["version"] "1.1.0" args; in
rec {
src = fetchurl {
@@ -17,7 +17,7 @@ rec {
doPreBuild = fullDepEntry (''
cp drgeo.desktop.in drgeo.desktop
'') ["minInit" "doUnpack"];
-
+
name = "drgeo-" + version;
meta = {
description = "Interactive geometry program";
diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix
index c59c4b062708..adae2dd067a3 100644
--- a/pkgs/applications/science/logic/coq/8.3.nix
+++ b/pkgs/applications/science/logic/coq/8.3.nix
@@ -1,6 +1,9 @@
# - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+# However, coq can build without csdp by setting it to null.
+# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-{ stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null }:
+{ stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }:
let
version = "8.3pl4";
@@ -11,6 +14,10 @@ let
"\"-I\"; \"+lablgtk2\"" \
"\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
'' else "";
+ csdpPatch = if csdp != null then ''
+ substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+ substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.search_exe_in_path \"csdp\"" "Some \"${csdp}/bin/csdp\""
+ '' else "";
in
stdenv.mkDerivation {
@@ -44,6 +51,7 @@ stdenv.mkDerivation {
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
${idePatch}
+ ${csdpPatch}
'';
# This post install step is needed to build ssrcoqide from the ssreflect package
diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix
index 87b476249f44..2afa18d40a4b 100644
--- a/pkgs/applications/science/logic/coq/8.5.nix
+++ b/pkgs/applications/science/logic/coq/8.5.nix
@@ -1,12 +1,19 @@
# - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+# However, coq can build without csdp by setting it to null.
+# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
let
version = "8.5b2";
coq-version = "8.5";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+ csdpPatch = if csdp != null then ''
+ substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+ substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+ '' else "";
in
stdenv.mkDerivation {
@@ -28,6 +35,7 @@ stdenv.mkDerivation {
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+ ${csdpPatch}
'';
setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 7b5d1ce62b4e..3656b5cab191 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -1,12 +1,19 @@
# - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+# However, coq can build without csdp by setting it to null.
+# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
let
version = "8.5pre-0c999f02";
coq-version = "8.5";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+ csdpPatch = if csdp != null then ''
+ substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+ substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+ '' else "";
in
stdenv.mkDerivation {
@@ -31,6 +38,7 @@ stdenv.mkDerivation {
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+ ${csdpPatch}
'';
setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 5a8fa9ff4dc1..38ba14e83cf8 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -1,12 +1,19 @@
# - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+# However, coq can build without csdp by setting it to null.
+# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-{stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
let
version = "8.4pl6";
coq-version = "8.4";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+ csdpPatch = if csdp != null then ''
+ substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+ substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+ '' else "";
in
stdenv.mkDerivation {
@@ -29,6 +36,7 @@ stdenv.mkDerivation {
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+ ${csdpPatch}
'';
preConfigure = ''
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index b50501a6d34c..7653e137e260 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5 }:
+{ stdenv, fetchsvn, writeScript, ocaml, camlp5 }:
let
start_script = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq";
};
- buildInputs = [ ocaml findlib camlp5 ];
+ buildInputs = [ ocaml camlp5 ];
installPhase = ''
mkdir -p "$out/lib/hol_light" "$out/bin"
diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
new file mode 100644
index 000000000000..7620aa3e3e03
--- /dev/null
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -0,0 +1,34 @@
+{ fetchgit, stdenv, smlnj, which }:
+
+stdenv.mkDerivation rec {
+ name = "jonprl-${version}";
+ version = "0.1.0";
+
+ src = fetchgit {
+ url = "https://github.com/jonsterling/JonPRL.git";
+ deepClone = true;
+ rev = "refs/tags/v${version}";
+ sha256 = "1z0d8dq1nb4dycic58nnk617hbfgafz0vmwr8gkl0i6405gfg1zy";
+ };
+
+ buildInputs = [ smlnj which ];
+
+ installPhase = ''
+ mkdir -p "$out/bin"
+ cp bin/.heapimg.* "$out/bin/"
+ build/mkexec.sh "${smlnj}/bin/sml" "$out" jonprl
+ '';
+
+ meta = {
+ description = "Proof Refinement Logic - Computational Type Theory";
+ longDescription = ''
+ An proof refinement logic for computational type theory
+ based on Brouwer-realizability & meaning explanations.
+ Inspired by Nuprl
+ '';
+ homepage = http://www.jonprl.org/;
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix
index 653c5dad03f7..398f6c9a3e22 100644
--- a/pkgs/applications/science/logic/otter/default.nix
+++ b/pkgs/applications/science/logic/otter/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation {
buildPhase = ''
find . -name Makefile | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g"
find . -name Makefile | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g"
- find . -perm +111 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g"
- find . -perm +111 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g"
- find . -perm +111 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g"
+ find . -perm -0100 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g"
+ find . -perm -0100 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g"
+ find . -perm -0100 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g"
sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile
diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix
index 177efd667a39..48e20d427d15 100644
--- a/pkgs/applications/science/math/content/default.nix
+++ b/pkgs/applications/science/math/content/default.nix
@@ -1,10 +1,10 @@
-a :
-let
+a @ { mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, libXcursor, ... } :
+let
fetchurl = a.fetchurl;
- version = "1.5";
+ version = "1.5";
buildInputs = with a; [
- mesa lesstif libX11 libXaw xproto libXt libSM libICE
+ mesa lesstif libX11 libXaw xproto libXt libSM libICE
libXmu libXext libXcursor
];
in
@@ -28,9 +28,9 @@ rec {
configureFlags = [];
/* doConfigure should be removed if not needed */
- phaseNames = ["unpackTarballs"
+ phaseNames = ["unpackTarballs"
"setPlatform" "extraVars"
- "buildVibrant" "buildContent"
+ "buildVibrant" "buildContent"
"install"];
unpackTarballs = a.fullDepEntry (''
@@ -42,10 +42,10 @@ rec {
sed -e s/SGI=/SGI=no/ -i content/makefile_v
'') ["minInit"];
- platformTLAContent = if a.stdenv.isLinux then "LIN" else
+ platformTLAContent = if a.stdenv.isLinux then "LIN" else
throw "Three-letter code for the platform is not known";
- platformTLAVibrant = if a.stdenv.isLinux then "lnx" else
+ platformTLAVibrant = if a.stdenv.isLinux then "lnx" else
throw "Three-letter code for the platform is not known";
setPlatform = a.fullDepEntry (''
@@ -82,7 +82,7 @@ rec {
find . -name '*.so' -exec cp '{}' $out/lib ';'
find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';'
find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';'
- find . -perm +111 -a ! -name '*.*' -exec cp '{}' $out/bin ';'
+ find . -perm -0100 -a ! -name '*.*' -exec cp '{}' $out/bin ';'
cp -r . $out/share/${name}/build-snapshot
'') ["buildContent" "defEnsureDir" "minInit"];
diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix
new file mode 100644
index 000000000000..64fa4579949d
--- /dev/null
+++ b/pkgs/applications/science/math/csdp/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchurl, blas, gfortran, liblapack }:
+
+stdenv.mkDerivation {
+ name = "csdp-6.1.1";
+
+ src = fetchurl {
+ url = "http://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz";
+ sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05";
+ };
+
+ buildInputs = [ blas gfortran liblapack ];
+
+ postPatch = ''
+ substituteInPlace Makefile --replace /usr/local/bin $out/bin
+ '';
+
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+
+ meta = {
+ homepage = https://projects.coin-or.org/Csdp;
+ license = lib.licenses.cpl10;
+ maintainers = [ lib.maintainers.roconnor ];
+ description = "A C Library for Semidefinite Programming";
+ };
+}
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index c9357d7352f0..3c7f758d91bc 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
preFixup = ''
echo "=== PatchElfing away ==="
- find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do
+ find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do
type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
if [ -z "$type" ]; then
:
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 5fc704178836..39f2409a987c 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
preFixup = ''
echo "=== PatchElfing away ==="
- find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do
+ find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do
type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
if [ -z "$type" ]; then
:
diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix
new file mode 100644
index 000000000000..94029a043492
--- /dev/null
+++ b/pkgs/applications/science/math/perseus/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, unzip, gcc48 }:
+
+stdenv.mkDerivation {
+ name = "perseus-4-beta";
+ version = "4-beta";
+ buildInputs = [unzip gcc48];
+
+ src = fetchurl {
+ url = "http://www.sas.upenn.edu/~vnanda/source/perseus_4_beta.zip";
+ sha256 = "09brijnqabhgfjlj5wny0bqm5dwqcfkp1x5wif6yzdmqh080jybj";
+ };
+
+ sourceRoot = ".";
+
+ buildPhase = ''
+ g++ Pers.cpp -O3 -o perseus
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp perseus $out/bin
+ '';
+
+ meta = {
+ description = "The Persistent Homology Software";
+ longDescription = ''
+ Persistent homology - or simply, persistence - is an algebraic
+ topological invariant of a filtered cell complex. Perseus
+ computes this invariant for a wide class of filtrations built
+ around datasets arising from point samples, images, distance
+ matrices and so forth.
+ '';
+ homepage = "www.sas.upenn.edu/~vnanda/perseus/index.html";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [erikryb];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index c068847c331b..382a5cb5532a 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
homepage = https://github.com/spyder-ide/spyder/;
license = licenses.mit;
platforms = platforms.linux;
- maintainers = [ maintainers.bjornfor ];
+ maintainers = with maintainers; [ bjornfor fridh ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index b8bce1c9eb56..12ca1434466b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -1,7 +1,7 @@
-/* moving all git tools into one attribute set because git is unlikely to be
- * referenced by other packages and you can get a fast overview.
-*/
-args: with args; with pkgs;
+/* All git-relates tools live here, in a separate attribute set so that users
+ * can get a fast overview over what's available.
+ */
+args @ {pkgs}: with args; with pkgs;
let
inherit (pkgs) stdenv fetchgit fetchurl subversion;
@@ -46,7 +46,7 @@ rec {
sendEmailSupport = !stdenv.isDarwin;
};
- inherit (pkgs.haskellPackages) git-annex;
+ git-annex = pkgs.haskellPackages.git-annex-with-assistant;
gitAnnex = git-annex;
qgit = import ./qgit {
@@ -96,6 +96,8 @@ rec {
gitflow = callPackage ./gitflow { };
+ git-radar = callPackage ./git-radar { };
+
git-remote-hg = callPackage ./git-remote-hg { };
gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
new file mode 100644
index 000000000000..5cca8ebef3c7
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchFromGitHub}:
+
+stdenv.mkDerivation rec {
+ name = "git-radar-${version}";
+ version = "0.3.2";
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ dontInstallSrc = true;
+
+ src = fetchFromGitHub {
+ owner = "michaeldfallen";
+ repo = "git-radar";
+ rev = "v${version}";
+ sha256 = "1028462b4kqxx66vjv7r8nnr6bi3kw11fixpqyg2srqriha6447p";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out
+ ln -s $out/git-radar $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/michaeldfallen/git-radar;
+ license = licenses.mit;
+ description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo.";
+ platforms = with platforms; linux ++ darwin;
+ maintainers = with maintainers; [ kamilchm ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index fce2d07c9eea..2c29ce82de56 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
}:
let
- version = "2.5.1";
+ version = "2.5.2";
svn = subversionClient.override { perlBindings = true; };
in
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "03r2shbya0g3adya336jpc6kcn2s0fmn5p5bs1s8q6r232qvgkmk";
+ sha256 = "16qcli3cip1ixbrxrb3hhvvgx6ppy4anig83wz7aqlfy1sln0isb";
};
patches = [
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index a697aaa08a1a..dc5c2231a7a1 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation {
- name = "git-repo-1.21";
+ name = "git-repo-1.22";
src = fetchurl {
# I could not find a versioned url for the 1.21 version. In case
# the sha mismatches, check the homepage for new version and sha.
url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo";
- sha1 = "b8bd1804f432ecf1bab730949c82b93b0fc5fede";
+ sha1 = "da0514e484f74648a890c0467d61ca415379f791";
};
unpackPhase = "true";
@@ -20,4 +20,4 @@ stdenv.mkDerivation {
homepage = "http://source.android.com/source/downloading.html";
description = "Android's repo management tool";
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
index b9a2daade5b5..eb75b45128e3 100644
--- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix
+++ b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
@@ -1,4 +1,4 @@
-args : with args;
+args @ { graphviz, pkgconfig, autoconf, automake, libtool, glib, gtk, ... }: with args;
rec {
srcDrv = fetchmtn {
name = "monotone-viz-mtn-checkout";
@@ -9,7 +9,7 @@ rec {
};
src = srcDrv + "/";
- buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
+ buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
pkgconfig autoconf automake libtool];
configureFlags = ["--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"];
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
new file mode 100644
index 000000000000..100e854f29b8
--- /dev/null
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -0,0 +1,40 @@
+{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }:
+python2Packages.buildPythonPackage rec {
+ name = "rabbitvcs-${version}";
+ version = "0.16";
+ namePrefix = "";
+
+ src = fetchFromGitHub {
+ owner = "rabbitvcs";
+ repo = "rabbitvcs";
+ rev = "v${version}";
+ sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly";
+ };
+
+ pythonPath = with python2Packages; [ configobj dbus pygobject pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ];
+
+ prePatch = ''
+ sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py
+ sed -ie "s|PREFIX = sys.prefix|PREFIX = \"$out\"|" ./setup.py
+ sed -ie 's|/usr/bin/meld|${meld}/bin/meld|' ./rabbitvcs/util/configspec/configspec.ini
+ sed -ie 's|/usr/bin/svnadmin|${subversion}/bin/svnadmin|' ./rabbitvcs/ui/create.py
+ sed -ie "s|/usr/share/doc|$out/share/doc|" ./rabbitvcs/ui/about.py
+ sed -ie "s|gnome-open|xdg-open|" ./rabbitvcs/util/helper.py
+ '';
+
+ outputs = [ "out" "cli" ];
+
+ postInstall = ''
+ mkdir -p $cli/bin
+ cp clients/cli/rabbitvcs $cli/bin
+ wrapPythonProgramsIn $cli "$out $pythonPath"
+ '';
+
+ meta = {
+ description = "Graphical tools for working with version control systems";
+ homepage = http://rabbitvcs.org/;
+ license = lib.licenses.gpl2Plus;
+ platforms = lib.platforms.linux;
+ maintainers = [ lib.maintainers.mathnerd314 ];
+ };
+}
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index ffe68839851a..9e0a093c958f 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
stdenv.mkDerivation (rec {
- version = "1.8.14";
+ version = "1.9.1";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2";
- sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497";
+ sha1 = "1244a741dbcf24f2b1d165225f0159a0c994e37a";
};
buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index f8937f39e769..5164ed6a9b44 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,4 +1,4 @@
-args : with args;
+args @ { makeWrapper, python, ... }: with args;
let version = if args ? version then args.version else "0.9.35"; in
rec {
src = fetchurl {
@@ -14,10 +14,10 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-
+
name = "tailor-" + version;
meta = {
description = "Version control tools integration tool";
};
}
-
+
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
index d5e7d1e7c83a..be8cc83c3008 100644
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ b/pkgs/applications/version-management/viewmtn/0.10.nix
@@ -1,5 +1,4 @@
-
-args : with args;
+args @ { monotone, cheetahTemplate, highlight, ctags, makeWrapper, graphviz, which, python, ... }: with args;
rec {
src = fetchurl {
url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index fc773211f69b..5a170047e8fc 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -117,5 +117,6 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu;
+ broken = true;
};
} // {mozillaPlugin = "/plugins";}
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 743df2647f1a..9515e1186446 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper
-, pythonPackages, gst, clutter-gst, clutter-gtk, hicolor_icon_theme
-, gobjectIntrospection, clutter, gtk3, librsvg, gnome3, libnotify
+, python3Packages, gst, clutter-gtk, hicolor_icon_theme
+, gobjectIntrospection, librsvg, gnome3, libnotify
}:
let
- version = "0.93";
+ version = "0.94";
in stdenv.mkDerivation rec {
name = "pitivi-${version}";
src = fetchurl {
url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz";
- sha256 = "0z89dwrd7akhkap270i372yszqib8yqcymv78lhdmn3a8bsa7jhp";
+ sha256 = "1v7s0qsibwykkmknspjhpdrj80s987pvbl01kh34k4aspi1hcapm";
};
meta = with stdenv.lib; {
@@ -29,15 +29,15 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ];
buildInputs = [
- gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop
+ gobjectIntrospection clutter-gtk librsvg gnome3.gnome_desktop
gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas libnotify
] ++ (with gst; [
- gstreamer gst-python gst-editing-services
+ gstreamer gst-editing-services
gst-plugins-base gst-plugins-good
gst-plugins-bad gst-plugins-ugly gst-libav
- ]) ++ (with pythonPackages; [
- python pygobject3 pyxdg numpy pycairo sqlite3
+ ]) ++ (with python3Packages; [
+ python pygobject3 gst-python pyxdg numpy pycairo sqlite3
]);
preFixup = ''
diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 45d8c452111f..41d8b5a577db 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,48 +1,39 @@
-{ lib, stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9,
- fromCi ? true,
- build ? "652",
- version ? if fromCi then "0.3.7-2-0ac62b848" else "0.3.7.2"
-}:
+{ lib, stdenv, fetchurl, runCommand, makeWrapper, nwjs, zip }:
let
- config =
- if stdenv.system == "x86_64-linux" then
- {sys = "Linux32";
- sha256 =
- if fromCi then "06av40b68xy2mv2fp9qg8npqmnvkl00p2jvbm2fdfnpc9jj746iy"
- else "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
- }
- else if stdenv.system == "i686-linux" then
- {sys = "Linux64";
- sha256 =
- if fromCi then "1nr2zaixdr5vqynga7jig3fw9dckcnzcbdmbr8haq4a486x2nq0f"
- else "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
- }
- else throw "Unsupported system ${stdenv.system}";
-
- fetchurlConf =
- let
- ciBase = "https://ci.popcorntime.io/job/Popcorn-Experimental/652/artifact/build/releases/Popcorn-Time";
- relBase = "https://get.popcorntime.io/build";
- in {
- url =
- if fromCi then "${ciBase}/${lib.toLower config.sys}/Popcorn-Time-${version}-${config.sys}.tar.xz"
- else "${relBase}/Popcorn-Time-${version}-Linux64.tar.xz";
- sha256 = config.sha256;
- };
+ version = "0.3.8-3";
popcorntimePackage = stdenv.mkDerivation rec {
- name =
- if fromCi then "popcorntime-git-2015-07-07"
- else "popcorntime-${version}";
- src = fetchurl fetchurlConf;
+ name = "popcorntime-${version}";
+ src = if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "http://get.popcorntime.io/build/Popcorn-Time-${version}-Linux-64.tar.xz";
+ sha256 = "0q8c6m9majgv5a6hjl1b2ndmq4xx05zbarsydhqkivhh9aymvxgm";
+ }
+ else if stdenv.system == "i686-linux" then
+ fetchurl {
+ url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux-32.tar.xz";
+ sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr92";
+ }
+ else throw "Unsupported system ${stdenv.system}";
+
sourceRoot = ".";
+
+ buildInputs = [ zip ];
+
+ buildPhase = ''
+ rm Popcorn-Time install
+ zip -r package.nw package.json src node_modules
+ cat ${nwjs}/bin/nw package.nw > Popcorn-Time
+ chmod 555 Popcorn-Time
+ '';
+
installPhase = ''
mkdir -p $out
- cp -r *.so *.pak $out/
- cat ${node_webkit_0_9}/bin/nw package.nw > $out/Popcorn-Time
- chmod 555 $out/Popcorn-Time
+ cp -r * $out/
'';
+
+ dontPatchELF = true;
};
in
runCommand "popcorntime-${version}" {
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index ae7f71e607e3..80aa1b3c5c33 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -6,7 +6,7 @@
, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
-, libvdpau
+, libvdpau, libsamplerate
, onlyLibVLC ? false
, qt4 ? null, qt5 ? null, withQt5 ? false
, jackSupport ? false
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
- libdc1394 libraw1394 libopus libebml libmatroska libvdpau
+ libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
]
++ (if withQt5 then with qt5; [ base ] else [qt4])
++ optional jackSupport libjack2;
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
"--enable-ncurses"
"--enable-vdpau"
"--enable-dvdnav"
+ "--enable-samplerate"
]
++ optional onlyLibVLC "--disable-vlc";
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 465819949108..1bedb404a2a9 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -11,17 +11,17 @@
with stdenv.lib;
let
- n = "qemu-2.4.0";
+ version = "2.4.0";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
in
stdenv.mkDerivation rec {
- name = n + (if x86Only then "-x86-only" else "");
+ name = "qemu-" + stdenv.lib.optionalString x86Only "x86-only-" + version;
src = fetchurl {
- url = "http://wiki.qemu.org/download/${n}.tar.bz2";
+ url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j";
};
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 9112337d0a46..9136bba02155 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
-, which, alsaLib, curl, libvpx, gawk, nettools
+, which, alsaLib, curl, libvpx, gawk, nettools, dbus
, xorriso, makeself, perl, pkgconfig, nukeReferences
, javaBindings ? false, jdk ? null
, pythonBindings ? false, python ? null
@@ -14,7 +14,11 @@ with stdenv.lib;
let
buildType = "release";
- version = "5.0.0"; # changes ./guest-additions as well
+ # When changing this, update ./guest-additions and the extpack
+ # revision/hash as well. See
+ # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
+ # for hashes.
+ version = "5.0.4";
forEachModule = action: ''
for mod in \
@@ -35,13 +39,12 @@ let
'';
# See https://github.com/NixOS/nixpkgs/issues/672 for details
- extpackRevision = "101573";
+ extpackRevision = "102546";
extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
# IMPORTANT: Hash must be base16 encoded because it's used as an input to
# VBoxExtPackHelperApp!
- # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
- sha256 = "c357e36368883df821ed092d261890a95c75e50422b75848c40ad20984086a7a";
+ sha256 = "e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa";
message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
and Evaluation License (PUEL) by downloading the related binaries from:
@@ -60,7 +63,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
- sha256 = "bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7";
+ sha256 = "b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf";
};
buildInputs =
@@ -82,11 +85,14 @@ in stdenv.mkDerivation {
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
sed -i -e '
- s@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g
+ s@"libdbus-1\.so\.3"@"${dbus}/lib/libdbus-1.so.3"@g
+ s@"libasound\.so\.2"@"${alsaLib}/lib/libasound.so.2"@g
${optionalString pulseSupport ''
- s@"libpulse.so.0"@"${libpulseaudio}/lib/libpulse.so.0"@g
+ s@"libpulse\.so\.0"@"${libpulseaudio}/lib/libpulse.so.0"@g
''}
- ' src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/{alsa,pulse}_stubs.c
+ ' src/VBox/Main/xml/Settings.cpp \
+ src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \
+ include/VBox/dbus-calls.h
export USER=nix
set +x
'';
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6bf0ef2e8258..76cc8c080caa 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "7b61f523db7ba75aebc4c7bb0cae2da92674fa72299e4a006c5c67517f7d786b";
+ sha256 = "de4abc28832d4e96b826efef3e7e69e69d6b941babfdc6317185f1fd6e22ffcf";
};
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index 9941d34bc896..b7205ac000e2 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -2,14 +2,17 @@
stdenv.mkDerivation rec {
name = "xhyve-${version}";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchurl {
url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz";
- sha256 = "0nbb9zy4iqmdz2dpyvcl1ynimrrpyd6f6cq8y2p78n1lmgqhrgkm";
+ sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj";
};
- buildFlags = "CFLAGS=-Wno-pedantic -Wno-shift-sign-overflow";
+ # Don't use git to determine version
+ buildFlags = ''
+ CFLAGS=-DVERSION=\"${version}\"
+ '';
installPhase = ''
mkdir -p $out/bin
@@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Lightweight Virtualization on OS X Based on bhyve";
homepage = "https://github.com/mist64/xhyve";
- maintainers = lib.maintainers.lnl7;
+ maintainers = [ lib.maintainers.lnl7 ];
platforms = lib.platforms.darwin;
};
}
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index c4b265f4b41a..8b6422df8284 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
};
patchPhase = ''
- sed -i -e "s:/usr/local:$\{out}:" \
- -e "s:/etc:$\{out}/etc:" \
- config.mk
+ substituteInPlace config.mk \
+ --replace "/usr/local" "$out" \
+ --replace "/etc" "$out/etc" \
+ --replace "/zsh/functions/Completion/X" "/zsh/site-functions"
'';
buildInputs = [ pkgconfig glib libX11 libXext libXinerama ];
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b5029d3c1416..9ac17566b948 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "i3-${version}";
- version = "4.10.2";
+ version = "4.10.4";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "1n6grkpv5rsn9zgg8if76mmg85w1asbm3rpplxyn6fzr8wds7587";
+ sha256 = "0pk580jkv7cxmsrr276q25fgdbrkzldiiz4ny61szzmqqnjsfkyx";
};
buildInputs = [
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 91fff3335ec2..099a2523fb4d 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -2,11 +2,11 @@
pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
stdenv.mkDerivation rec {
- name = "i3lock-2.6";
+ name = "i3lock-2.7";
src = fetchurl {
url = "http://i3wm.org/i3lock/${name}.tar.bz2";
- sha256 = "0aj0an8fwv66jhda499r3xa00546cc9ja1dk8xpc6sy6xygqjbf0";
+ sha256 = "1qlgafbyqjpqdfs50f2y0xphn2jdigafkqqsmpikk97cs0z1i0k8";
};
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple screen locker like slock";
homepage = http://i3wm.org/i3lock/;
- maintainers = with maintainers; [ garbas malyn ];
+ maintainers = with maintainers; [ garbas malyn iElectric ];
license = licenses.bsd3;
platforms = platforms.all;
};
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index a272a84261e4..fd8098caf13c 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -142,10 +142,11 @@ while (scalar(keys %postponed) > 0) {
# Create the symlinks.
+my $extraPrefix = $ENV{"extraPrefix"};
my $nrLinks = 0;
foreach my $relName (sort keys %symlinks) {
my ($target, $priority) = @{$symlinks{$relName}};
- my $abs = "$out/$relName";
+ my $abs = "$out" . "$extraPrefix" . "/$relName";
next unless isInPathsToLink $relName;
if ($target eq "") {
#print "creating directory $relName\n";
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 2ae8123faca4..8cbf0dc6c8e4 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -21,14 +21,20 @@
# directories in the list is not symlinked.
pathsToLink ? ["/"]
-, # Shell command to run after building the symlink tree.
+, # Root the result in directory "$out${extraPrefix}", e.g. "/share".
+ extraPrefix ? ""
+
+, # Shell commands to run after building the symlink tree.
postBuild ? ""
+, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`.
+ buildInputs ? []
+
, passthru ? {}
}:
runCommand name
- { inherit manifest ignoreCollisions passthru pathsToLink postBuild;
+ { inherit manifest ignoreCollisions passthru pathsToLink extraPrefix postBuild buildInputs;
pkgs = builtins.toJSON (map (drv: {
paths = [ drv ]; # FIXME: handle multiple outputs
priority = drv.meta.priority or 5;
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index e7c64501614c..551ed9ea57e8 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -1,26 +1,26 @@
-args: with args; with stringsWithDeps; with lib;
+args @ {stringsWithDeps, lib, stdenv, writeScript, fetchurl, fetchmtn, fetchgit, ...}: with args; with stringsWithDeps; with lib;
let inherit (builtins) head tail trace; in
(rec
{
- inherit writeScript;
+ inherit writeScript;
src = attrByPath ["src"] "" args;
addSbinPath = attrByPath ["addSbinPath"] false args;
forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"];
- forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL"
- "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++
- (optional (attrByPath ["forceCopyDoc"] true args) "doc");
+ forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL"
+ "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++
+ (optional (attrByPath ["forceCopyDoc"] true args) "doc");
hasSuffixHack = a: b: hasSuffix (a+(substring 0 0 b)) ((substring 0 0 a)+b);
-
- archiveType = s:
+
+ archiveType = s:
(if hasSuffixHack ".tar" s then "tar"
- else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
- else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
+ else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
+ else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
(hasSuffixHack ".tbz" s) then "tbz2"
- else if hasSuffixHack ".tar.Z" s then "tZ"
+ else if hasSuffixHack ".tar.Z" s then "tZ"
else if hasSuffixHack ".tar.lzma" s then "tar.lzma"
else if hasSuffixHack ".tar.xz" s then "tar.xz"
else if hasSuffixHack ".rar" s then "rar"
@@ -569,7 +569,7 @@ let inherit (builtins) head tail trace; in
# Interpreters that are already in the store are left untouched.
echo "patching script interpreter paths"
local f
- for f in $(find "${dir}" -xtype f -perm /0100); do
+ for f in $(find "${dir}" -xtype f -perm -0100); do
local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then
local newPath=$(type -P $(basename $oldPath) || true)
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 8965fc6bef0c..9822b1a026a1 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -244,7 +244,7 @@ stdenv.mkDerivation {
if stdenv.isArm then "ld-linux*.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else
- if stdenv.system == "x86_64-darwin" then "${dyld}/lib/dyld" else
+ if stdenv.system == "x86_64-darwin" then "/usr/lib/dyld" else
abort "Don't know the name of the dynamic linker for this platform.")
else "";
diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix
index 9c97e8bf9514..98463c56ba96 100644
--- a/pkgs/build-support/emacs/trivial.nix
+++ b/pkgs/build-support/emacs/trivial.nix
@@ -1,6 +1,6 @@
# trivial builder for Emacs packages
-{ lib, ... }@envargs:
+{ lib, stdenv, texinfo, ... }@envargs:
with lib;
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index ceedf313f28e..22d46257075e 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -109,7 +109,7 @@ checkout_hash(){
hash=$(hash_from_ref $ref)
fi
- git fetch ${builder:+--progress} origin || return 1
+ git fetch -t ${builder:+--progress} origin || return 1
git checkout -b $branchName $hash || return 1
}
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index cf986a064d9d..14b4d6fc9a27 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -173,6 +173,7 @@ rec {
# Debian.
debian = [
+ http://httpredir.debian.org/debian/
ftp://ftp.au.debian.org/debian/
ftp://ftp.de.debian.org/debian/
ftp://ftp.es.debian.org/debian/
diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 44ebad0d593b..152755992f68 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -18,7 +18,7 @@ patchShebangs() {
local oldInterpreterLine
local newInterpreterLine
- find "$dir" -type f -perm /0100 | while read f; do
+ find "$dir" -type f -perm -0100 | while read f; do
if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then
# missing shebang => not a script
continue
diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh
new file mode 100644
index 000000000000..636918992090
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -0,0 +1,37 @@
+export NIX_LDFLAGS+=" --build-id"
+export NIX_CFLAGS_COMPILE+=" -ggdb"
+dontStrip=1
+
+fixupOutputHooks+=(_separateDebugInfo)
+
+_separateDebugInfo() {
+ local dst="${debug:-$out}"
+ if [ "$prefix" = "$dst" ]; then return; fi
+
+ dst="$dst/lib/debug/.build-id"
+
+ # Find executables and dynamic libraries.
+ local -a files=($(find "$prefix" -type f -a \( -perm /0100 -o -name "*.so" -o -name "*.so.*" \)))
+
+ local i magic
+ for i in "${files[@]}"; do
+ # Skip non-ELF files.
+ exec 10< "$i"
+ read -n 4 -u 10 magic
+ if [[ "$magic" =~ ELF ]]; then echo FOO; fi
+ exec 10<&-
+
+ # Extract the Build ID. FIXME: there's probably a cleaner way.
+ local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
+ if [ "${#id}" != 40 ]; then
+ echo "could not find build ID of $i, skipping" >&2
+ continue
+ fi
+
+ # Extract the debug info.
+ header "separating debug info from $i (build ID $id)"
+ mkdir -p "$dst/${id:0:2}"
+ objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug"
+ strip --strip-debug "$i"
+ done
+}
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index a7bf1ce0ce90..9a65c0cde302 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -1,4 +1,5 @@
-args : with args;
+args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }:
+with args;
let localDefs = builderDefs.passthru.function {
src =""; /* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale];
diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
new file mode 100644
index 000000000000..522847a52418
--- /dev/null
+++ b/pkgs/data/fonts/hack/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, unzip }:
+
+let version = "2.013"; in
+stdenv.mkDerivation {
+ name = "hack-font-${version}";
+
+ src = let
+ version_ = with stdenv.lib;
+ concatStringsSep "_" (splitString "." version);
+ in fetchurl {
+ sha256 = "16lap1796baiyn50fag3gszv7l1c5v62pvlr57ww501ka024gnnk";
+ url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
+ };
+
+ sourceRoot = ".";
+
+ nativeBuildInputs = [ unzip ];
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/hack
+ cp *.ttf $out/share/fonts/hack
+ '';
+
+ meta = with stdenv.lib; {
+ inherit version;
+ description = "A typeface designed for source code";
+ longDescription = ''
+ Hack is hand groomed and optically balanced to be a workhorse face for
+ code. It has deep roots in the libre, open source typeface community and
+ expands upon the contributions of the Bitstream Vera & DejaVu projects.
+ The face has been re-designed with a larger glyph set, modifications of
+ the original glyph shapes, and meticulous attention to metrics.
+ '';
+ homepage = http://sourcefoundry.org/hack/;
+
+ /*
+ "The font binaries are released under a license that permits unlimited
+ print, desktop, and web use for commercial and non-commercial
+ applications. It may be embedded and distributed in documents and
+ applications. The source is released in the widely supported UFO format
+ and may be modified to derive new typeface branches. The full text of
+ the license is available in LICENSE.md" (From the GitHub page)
+ */
+ license = licenses.free;
+
+ platforms = platforms.all;
+ maintainers = with maintainers; [ nckx ];
+ };
+}
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index b8c0db222d5f..eb28521a2b8a 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -1,4 +1,4 @@
-args: with args; rec {
+args @ { fetchurl, fontforge, lib, ... }: with args; rec {
name = "linux-libertine-5.3.0";
src = fetchurl {
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
new file mode 100644
index 000000000000..bb07596ab974
--- /dev/null
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -0,0 +1,128 @@
+{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, fontforge, pythonPackages, pkgconfig }:
+rec {
+ # 18MB
+ noto-fonts = let version = "git-2015-09-08"; in stdenv.mkDerivation {
+ name = "noto-fonts-${version}";
+ src = fetchFromGitHub {
+ owner = "googlei18n";
+ repo = "noto-fonts";
+ rev = "9d677e7e47a13f6e88052833277783fe4f27671f";
+ sha256 = "1dw1142znlk19a4mzhfi9pg3jzmz8pl1ivix7sd2grg70vxscxqc";
+ };
+ phases = "unpackPhase installPhase";
+ installPhase = ''
+ mkdir -p $out/share/fonts/noto
+ cp hinted/*.ttf $out/share/fonts/noto
+ # Also copy unhinted & alpha fonts for better glyph coverage,
+ # if they don't have a hinted version
+ # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
+ cp -n unhinted/*.ttf $out/share/fonts/noto
+ cp -n alpha/*.ttf $out/share/fonts/noto
+ '';
+ meta = with stdenv.lib; {
+ inherit version;
+ description = "Beautiful and free fonts for many languages";
+ homepage = https://www.google.com/get/noto/;
+ longDescription =
+ ''
+ When text is rendered by a computer, sometimes characters are displayed as
+ “tofu”. They are little boxes to indicate your device doesn’t have a font to
+ display the text.
+
+ Google has been developing a font family called Noto, which aims to support all
+ languages with a harmonious look and feel. Noto is Google’s answer to tofu. The
+ name noto is to convey the idea that Google’s goal is to see “no more tofu”.
+ Noto has multiple styles and weights, and freely available to all.
+
+ This package also includes the Arimo, Cousine, and Tinos fonts.
+ '';
+ license = licenses.asl20;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ mathnerd314 ];
+ };
+ };
+ # 89MB
+ noto-fonts-cjk = let version = "1.004"; in stdenv.mkDerivation {
+ name = "noto-fonts-cjk-${version}";
+
+ src = fetchurl {
+ # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file
+ url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip";
+ sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6";
+ };
+
+ buildInputs = [ unzip ];
+
+ phases = "unpackPhase installPhase";
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/noto
+ cp *.ttc $out/share/fonts/noto
+ '';
+
+ preferLocalBuild = true;
+
+ meta = with stdenv.lib; {
+ inherit version;
+ description = "Beautiful and free fonts for CJK languages";
+ homepage = https://www.google.com/get/noto/help/cjk/;
+ longDescription =
+ ''
+ Noto Sans CJK is a sans serif typeface designed as an intermediate style
+ between the modern and traditional. It is intended to be a multi-purpose
+ digital font for user interface designs, digital content, reading on laptops,
+ mobile devices, and electronic books. Noto Sans CJK comprehensively covers
+ Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font
+ family. It supports regional variants of ideographic characters for each of the
+ four languages. In addition, it supports Japanese kana, vertical forms, and
+ variant characters (itaiji); it supports Korean hangeul — both contemporary and
+ archaic.
+ '';
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ mathnerd314 ];
+ };
+ };
+ # 12MB
+ noto-fonts-emoji = let version = "git-2015-08-17"; in stdenv.mkDerivation {
+ name = "noto-fonts-emoji-${version}";
+
+ src = fetchFromGitHub {
+ owner = "googlei18n";
+ repo = "noto-emoji";
+ rev = "ffd7cfd0c84b7bf37210d0908ac94adfe3259ff2";
+ sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2";
+ };
+
+ buildInputs = with pythonPackages; [
+ optipng cairo fontforge python nototools fonttools pkgconfig
+ ];
+
+ #FIXME: perhaps use our pngquant instead
+ preConfigure = ''
+ for f in ./*.py ./third_party/pngquant/configure; do
+ patchShebangs "$f"
+ done
+ '';
+
+ preBuild = ''
+ export PYTHONPATH=$PYTHONPATH:$PWD
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/noto
+ cp NotoColorEmoji.ttf NotoEmoji-Regular.ttf $out/share/fonts/noto
+ '';
+
+ meta = with stdenv.lib; {
+ inherit version;
+ description = "Color and Black-and-White emoji fonts";
+ homepage = https://github.com/googlei18n/noto-emoji;
+ license = licenses.asl20;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ mathnerd314 ];
+ };
+ };
+}
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index 4156fb69069f..d38cb89c9281 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
name = "pecita-${version}";
- version = "5.1";
+ version = "5.2";
src = fetchurl {
- url = "http://pecita.eu/b/Pecita.otf";
- sha256 = "0v2k6vvzl1f809h3lfld6zy5m56w1dn27xmdy3hjniv6j9xbhbs4";
+ url = "http://archive.rycee.net/pecita/${name}.tar.xz";
+ sha256 = "0ryfvxdla5iinwwin4dc1k89hk1bjq2mfdrrv67q6fdgz41l0qf0";
};
- phases = ["installPhase"];
+ phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out/share/fonts/opentype
- cp -v ${src} $out/share/fonts/opentype/Pecita.otf
+ cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
index 9e0bf7505718..2fb4787774f4 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/pkgs/data/fonts/source-han-sans/default.nix
@@ -1,23 +1,29 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, unzip}:
let
- makePackage = {language, region, description}: stdenv.mkDerivation rec {
- version = "1.001R";
- name = "source-han-sans-${language}-${version}";
+ makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec {
+ version = "1.004R";
+ name = "source-han-sans-${variant}-${version}";
+ revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa";
+
+ buildInputs = [ unzip ];
src = fetchurl {
- url = "https://github.com/adobe-fonts/source-han-sans/archive/${version}.tar.gz";
- sha256 = "0cwz3d8jancl0a7vbjxhnh1vgwsjba62lahfjya9yrjkp1ndxlap";
+ url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip";
+ inherit sha256;
};
+ setSourceRoot = ''
+ sourceRoot=$( echo SourceHanSans* )
+ '';
+
installPhase = ''
mkdir -p $out/share/fonts/opentype
- cp $( find SubsetOTF/${region} -name '*.otf' ) $out/share/fonts/opentype
+ cp $( find . -name '*.otf' ) $out/share/fonts/opentype
'';
meta = {
- inherit description;
-
+ description = "${language} subset of an open source Pan-CJK typeface";
homepage = https://github.com/adobe-fonts/source-han-sans;
license = stdenv.lib.licenses.asl20;
};
@@ -25,23 +31,27 @@ let
in
{
japanese = makePackage {
- language = "japanese";
+ variant = "japanese";
+ language = "Japanese";
region = "JP";
- description = "Japanese subset of an open source Pan-CJK typeface";
+ sha256 = "0m1zprwqnqp3za42firg53hyzir6p0q73fl8mh5j4px3zgivlvfw";
};
korean = makePackage {
- language = "korean";
+ variant = "korean";
+ language = "Korean";
region = "KR";
- description = "Korean subset of an open source Pan-CJK typeface";
+ sha256 = "1bz6n2sd842vgnqky0i7a3j3i2ixhzzkkbx1m8plk04r1z41bz9q";
};
simplified-chinese = makePackage {
- language = "simplified-chinese";
+ variant = "simplified-chinese";
+ language = "Simplified Chinese";
region = "CN";
- description = "Simplified Chinese subset of an open source Pan-CJK typeface";
+ sha256 = "0ksafcwmnpj3yxkgn8qkqkpw10ivl0nj9n2lsi9c6fw3aa71s3ha";
};
traditional-chinese = makePackage {
- language = "traditional-chinese";
+ variant = "traditional-chinese";
+ language = "Traditional Chinese";
region = "TW";
- description = "Traditional Chinese subset of an open source Pan-CJK typeface";
+ sha256 = "1l4zymd5n4nl9gmja707xq6bar88dxki2mwdixdfrkf544cidflj";
};
}
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index b3413dc4738d..2fad83d9ec3e 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchFromGitHub, unzip }:
stdenv.mkDerivation rec {
- version = "d7e8c4cdcf";
+ version = "4727aa5";
package-name = "numix-icon-theme-circle";
- name = "${package-name}-20150304";
+ name = "${package-name}-20151005";
buildInputs = [ unzip ];
- src = fetchurl {
- url = "https://github.com/numixproject/${package-name}/archive/${version}.zip";
- sha256 = "672d6f4d000c4c75a64e0297f9609afab1035d082d7ab4f7abe3e2173cba9324";
+ src = fetchFromGitHub {
+ owner = "numixproject";
+ repo = package-name;
+ rev = version;
+ sha256 = "0khps3il0wyjizzzv8rxznhywp3nqd1hj1zhdvyqzgql3gffylqc";
};
dontBuild = true;
@@ -21,10 +23,11 @@ stdenv.mkDerivation rec {
cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Numix icon theme (circle version)";
homepage = https://numixproject.org;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.all;
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ jgeerds ];
};
}
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 54d4e06be282..6a04e38291a0 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "2c11fbfcee";
+ version = "ae57260";
package-name = "numix-icon-theme";
- name = "${package-name}-20150302";
+ name = "${package-name}-20150910";
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
rev = version;
- sha256 = "1bjh2j4vqk9s31syv7ig3hwpp5z0n6sx74iz332y0wdz6ngj5x08";
+ sha256 = "147a8d9wkhrq4f4154gb0l16rj849lsccxl8npicr6zixvsjgqlq";
};
dontBuild = true;
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Numix icon theme";
homepage = https://numixproject.org;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.all;
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ romildo jgeerds ];
};
}
diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix
index 57a6718669bd..b9dfeb76f993 100644
--- a/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/pkgs/data/icons/tango-icon-theme/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg }:
+{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg
+, gtk/*any version*/
+}:
stdenv.mkDerivation rec {
name = "tango-icon-theme-0.8.90";
@@ -14,6 +16,8 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-png-creation";
+ postInstall = '''${gtk}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
+
meta = {
description = "A basic set of icons";
homepage = http://tango.freedesktop.org/Tango_Icon_Library;
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index dc68b1ad2fd3..db1f88068913 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
# Annoyingly, these files are updated without a change in URL. This means that
# builds will start failing every month or so, until the hashes are updated.
- version = "2015-09-03";
+ version = "2015-09-14";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
"0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
- "0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc";
+ "1f3jrvh2ivwgvx52r2n62dhyr0gb418q3gzra2108ygdxcm0105h";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
- "1ajk18ydzhwflki25cp7fhzfphysgndig3h0f9p655qhsm0c3gzj";
+ "16kvbv63l7cn7032b3gvpzjcb5w9fliyrwirn8sxyad8gywkxznw";
meta = with stdenv.lib; {
inherit version;
diff --git a/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch b/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
new file mode 100644
index 000000000000..9e3e83b1262a
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
@@ -0,0 +1,67 @@
+Index: vte-0.26.0/src/vte.c
+===================================================================
+--- vte-0.26.0.orig/src/vte.c 2010-11-30 23:04:53.000000000 -0800
++++ vte-0.26.0/src/vte.c 2010-12-07 20:05:07.865548000 -0800
+@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
+ long wcount, start, delta;
+ gboolean leftovers, modified, bottom, again;
+ gboolean invalidated_text;
++ gboolean in_scroll_region;
+ GArray *unichars;
+ struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
+
+@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
+ cursor = screen->cursor_current;
+ cursor_visible = terminal->pvt->cursor_visible;
+
++ in_scroll_region = screen->scrolling_restricted
++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
+ /* We should only be called when there's data to process. */
+ g_assert(terminal->pvt->incoming ||
+ (terminal->pvt->pending->len > 0));
+@@ -3979,6 +3984,8 @@ skip_chunk:
+ * points to the first character which isn't part of this
+ * sequence. */
+ if ((match != NULL) && (match[0] != '\0')) {
++ gboolean new_in_scroll_region;
++
+ /* Call the right sequence handler for the requested
+ * behavior. */
+ _vte_terminal_handle_sequence(terminal,
+@@ -3989,12 +3996,20 @@ skip_chunk:
+ start = (next - wbuf);
+ modified = TRUE;
+
+- /* if we have moved during the sequence handler, restart the bbox */
++ new_in_scroll_region = screen->scrolling_restricted
++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
++ delta = screen->scroll_delta; /* delta may have changed from sequence. */
++
++ /* if we have moved greatly during the sequence handler, or moved into a scroll_region
++ * from outside it, restart the bbox */
+ if (invalidated_text &&
+- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
+- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
+- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
+- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
++ ((new_in_scroll_region && !in_scroll_region) ||
++ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
++ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
++ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
++ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
+ /* Clip off any part of the box which isn't already on-screen. */
+ bbox_topleft.x = MAX(bbox_topleft.x, 0);
+ bbox_topleft.y = MAX(bbox_topleft.y, delta);
+@@ -4014,6 +4029,8 @@ skip_chunk:
+ bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
+ bbox_topleft.x = bbox_topleft.y = G_MAXINT;
+ }
++
++ in_scroll_region = new_in_scroll_region;
+ } else
+ /* Second, we have a NULL match, and next points to the very
+ * next character in the buffer. Insert the character which
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 5932caf9e97d..b086c64abff8 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
patches = [
./alt.patch
+ ./change-scroll-region.patch
# CVE-2012-2738
./vte-0.28.2-limit-arguments.patch
];
diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
index c8d33c24156c..a2813e0581b3 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
- python3Packages.pygobject3 python3Packages.ipythonLight
+ python3Packages.pygobject3 python3Packages.ipython
at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
index 2126aa9ee4db..81a64e9e1757 100644
--- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3;
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
- gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite ]
+ gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
++ stdenv.lib.optional valaSupport vala;
propagatedBuildInputs = [ libsecret nss nspr libical db ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
index abd5074685ac..c7b4cdd0ab2f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
#doCheck = true;
- enableParallelBuilding = true;
+ #enableParallelBuilding = true; issues on hydra
preFixup = ''
wrapProgram "$out/bin/gcr-viewer" \
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
index ca50cf8218d8..899efc5443bb 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -8,12 +8,7 @@
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
stdenv.mkDerivation rec {
- name = "gnome-shell-${gnome3.version}.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-shell/${gnome3.version}/${name}.tar.xz";
- sha256 = "00gjdfaznpnspb4jmjc19axiz6snd9drvqmzpq4sw0xh1ysgpncv";
- };
+ inherit (import ./src.nix fetchurl) name src;
# Needed to find /etc/NetworkManager/VPN
configureFlags = [ "--sysconfdir=/etc" ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
new file mode 100644
index 000000000000..782e18e4a9dd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+ name = "gnome-shell-3.16.1";
+
+ src = fetchurl {
+ url = mirror://gnome/sources/gnome-shell/3.16/gnome-shell-3.16.1.tar.xz;
+ sha256 = "9bd9fbb40fb003ae09bebfe29d5b6a569b1fbb4a81c92ac9bada5efb956bf201";
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
index f3c751f458d9..dee9caf444c5 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
stdenv.mkDerivation rec {
- version = "${gnome3.version}";
+ version = "${gnome3.version}.3";
name = "gpaste-${version}";
src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
- sha256 = "1dj5pv87j9s32f778i5bdlmrg60i9cyh4411a66kxbqyfdrq7ys0";
+ sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a";
};
buildInputs = [ intltool autoreconfHook pkgconfig vala glib
diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index b0958d232fc7..7d5447ae52ab 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
majorVersion = "0.3";
- minorVersion = "0.1";
+ minorVersion = "1.3";
name = "pantheon-terminal-${majorVersion}.${minorVersion}";
src = fetchurl {
url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz";
- sha256 = "14wspqxp79myyyjngr1x7jg1kw15g3nm2pav2zffp8xs16s1i5za";
+ sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
};
preConfigure = ''
diff --git a/pkgs/desktops/plasma-5.3/packages.sh b/pkgs/desktops/plasma-5.3/packages.sh
index c43c47296d6e..68b20c49df97 100755
--- a/pkgs/desktops/plasma-5.3/packages.sh
+++ b/pkgs/desktops/plasma-5.3/packages.sh
@@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/plasma/5.3.2/" \
"$@" -A '*.tar.xz'
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
index f48a3e3808bd..83610a4e4a65 100644
--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/pkgs/desktops/xfce/core/exo.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
p_name = "exo";
ver_maj = "0.10";
- ver_min = "6";
+ ver_min = "7";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752";
+ sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c";
};
name = "${p_name}-${ver_maj}.${ver_min}";
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
- meta = {
+ meta = with stdenv.lib; {
homepage = "http://www.xfce.org/projects/${p_name}";
description = "Application library for the Xfce desktop environment";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 459158a136ac..f2a9f848342c 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -4,7 +4,7 @@ let
callPackage = newScope (deps // xfce_self);
-deps = rec { # xfce-global dependency overrides should be here
+deps = { # xfce-global dependency overrides should be here
inherit (pkgs.gnome) libglade libwnck vte gtksourceview;
inherit (pkgs.perlPackages) URI;
};
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 378a8fc8cad2..3522e234fa2a 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchsvn {
url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl;
rev = revision;
- sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb";
+ sha256 = "04p77n18cw0bc8i66mp2vfrhlliahrx66lm004a3nw3h0mdk0gd8";
};
buildInputs = [ gcc glibc m4 ];
diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix
index d7bc718ea60f..d4970b278bbe 100644
--- a/pkgs/development/compilers/cudatoolkit/generic.nix
+++ b/pkgs/development/compilers/cudatoolkit/generic.nix
@@ -59,7 +59,6 @@ in stdenv.mkDerivation rec {
perl ./install-linux.pl --prefix="$out"
rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
- mv $out/include $out/usr_include
# let's remove the 32-bit libraries, they confuse the lib64->lib mover
rm -rf $out/lib
@@ -70,8 +69,6 @@ in stdenv.mkDerivation rec {
fi
'';
- setupHook = ./setup-hook.sh;
-
meta = {
license = lib.licenses.unfree;
};
diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh
deleted file mode 100644
index 1b75a2e91ba2..000000000000
--- a/pkgs/development/compilers/cudatoolkit/setup-hook.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-addIncludePath () {
- if test -d "$1/usr_include"
- then
- export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include"
- fi
-}
-
-envHooks=(${envHooks[@]} addIncludePath)
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index fb4666de4c21..8b0f2509a911 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
substituteInPlace src/dmd/posix.mak --replace g++ clang++
'';
+ # Buid and install are based on http://wiki.dlang.org/Building_DMD
buildPhase = ''
cd src/dmd
make -f posix.mak INSTALL_DIR=$out
@@ -50,7 +51,7 @@ stdenv.mkDerivation {
cd $out/bin
tee dmd.conf << EOF
[Environment]
- DFLAGS=-I$out/include/d2 -L-L$out/lib -L--no-warn-search-mismatch -L--export-dynamic
+ DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--no-warn-search-mismatch -L--export-dynamic"}
EOF
'';
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index f1844a1a632b..1ea2894d88d7 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,11 +1,13 @@
-a :
-let
+a @ { mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+, texinfo, libX11, xproto, inputproto, libXi
+, libXext, xextproto, libXt, libXaw, libXmu, stdenv, ... } :
+let
buildInputs = with a; [
mpfr m4 binutils emacs gmp
- libX11 xproto inputproto libXi
+ libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu
- zlib which texinfo texLive
- ];
+ zlib which texinfo
+ ];
in
(
@@ -40,7 +42,7 @@ rec {
'') ["minInit" "doUnpack" "addInputs"];
/* doConfigure should be removed if not needed */
- phaseNames = ["setVars" "doUnpack" "preBuild"
+ phaseNames = ["setVars" "doUnpack" "preBuild"
"doConfigure" "doMakeInstall"];
}) // {
meta = {
@@ -48,7 +50,7 @@ rec {
maintainers = [
a.lib.maintainers.raskin
];
- platforms = with a.lib.platforms;
+ platforms = with a.lib.platforms;
linux;
};
}
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 4e660853f200..96ec4e6c114a 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
(if stdenv.isLinux then ''
- find . -type f -perm +100 \
+ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \;
for prog in ld ar gcc strip ranlib; do
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 7a6f1b78fa49..31df7f1fa355 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
stdenv.lib.optionalString stdenv.isLinux ''
- find . -type f -perm +100 \
+ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${ncurses}/lib:${gmp}/lib" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 3d781e9d558f..03dd4dcd35bb 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optionalString stdenv.isLinux ''
mkdir -p "$out/lib"
ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
- find . -type f -perm +100 \
+ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${gmp}/lib" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix
new file mode 100644
index 000000000000..2e0f5ba07e4d
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.8.3.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+
+stdenv.mkDerivation rec {
+ version = "7.8.3";
+ name = "ghc-${version}";
+
+ src = fetchurl {
+ url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.xz";
+ sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh";
+ };
+
+ buildInputs = [ ghc perl gmp ncurses ];
+
+ enableParallelBuilding = true;
+
+ buildMK = ''
+ libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+ libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+ libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
+ libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+ DYNAMIC_BY_DEFAULT = NO
+ ${stdenv.lib.optionalString stdenv.isDarwin ''
+ libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
+ libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
+ ''}
+ '';
+
+ preConfigure = ''
+ echo "${buildMK}" > mk/build.mk
+ sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export NIX_LDFLAGS+=" -no_dtrace_dof"
+ '';
+
+ # required, because otherwise all symbols from HSffi.o are stripped, and
+ # that in turn causes GHCi to abort
+ stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+ meta = {
+ homepage = "http://haskell.org/ghc";
+ description = "The Glasgow Haskell Compiler";
+ maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+ inherit (ghc.meta) license platforms;
+ };
+
+}
diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 4f9e8b25b755..3858d2566f44 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -15,11 +15,11 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
- version = "1.5";
+ version = "1.5.1";
src = fetchurl {
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
- sha256 = "03g3w6af74xggqlgwf5xriqzl9a0q17sp0qbyq8qs55qls07r81p";
+ sha256 = "1xd1nd1li7pdl72vq8zkh6m7ms3ajgyqz9a5d61gagm0cgj8zilz";
};
# perl is used for testing go vet
diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index f1a7b9078156..863c74bc4c1b 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash }:
+{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc }:
stdenv.mkDerivation rec {
name = "icedtea-web-${version}";
- version = "1.6";
+ version = "1.6.1";
src = fetchurl {
url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
-
- sha256 = "0z8iirvpciai55s4vhpfkhyx4h4hm6dqy4pg4c61pia3innqd4qn";
+ sha256 = "0869j9jn0z5b5pfspp4v5cj2ksmbqmmmjhqicn4kqc6wr6v6md59";
};
- buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ];
+ nativeBuildInputs = [ pkgconfig bc perl ];
+ buildInputs = [ gtk2 xulrunner zip npapi_sdk ];
preConfigure = ''
- substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
-
- configureFlags="BIN_BASH=${bash}/bin/bash $configureFlags"
+ #patchShebangs javac.in
+ configureFlagsArray+=("BIN_BASH=${bash}/bin/bash")
'';
configureFlags = [
"--with-jdk-home=${jdk.home}"
+ "--disable-docs"
];
mozillaPlugin = "/lib";
diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix
new file mode 100644
index 000000000000..f601dc254a43
--- /dev/null
+++ b/pkgs/development/compilers/intercal/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl
+, pkgconfig
+, bison, flex
+, makeWrapper }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+ name = "intercal-${version}";
+ version = "0.30";
+
+ src = fetchurl {
+ url = "http://catb.org/esr/intercal/${name}.tar.gz";
+ sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk";
+ };
+
+ buildInputs =
+ [ pkgconfig bison flex makeWrapper ];
+
+ # Intercal invokes gcc, so we need an explicit PATH
+ postInstall = ''
+ wrapProgram $out/bin/ick --suffix PATH ':' ${stdenv.cc}/bin
+ '';
+
+ meta = {
+ description = "The original esoteric programming language";
+ longDescription = ''
+ INTERCAL, an abbreviation for "Compiler Language With No
+ Pronounceable Acronym", is a famously esoterical programming
+ language. It was created in 1972, by Donald R. Woods and James
+ M. Lyon, with the unusual goal of creating a language with no
+ similarities whatsoever to any existing programming
+ languages. The language largely succeeds in this goal, apart
+ from its use of an assignment statement.
+ '';
+ homepage = http://www.catb.org/~esr/intercal/;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
+# TODO: investigate if LD_LIBRARY_PATH needs to be set
diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 76dc6aa1d30f..710ddec9c105 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -5,11 +5,22 @@
, libunwind, llvm, readline, utf8proc, zlib
# standard library dependencies
, double_conversion, fftwSinglePrec, fftw, glpk, gmp, mpfr, pcre
+# linear algebra
, openblas, arpack, suitesparse
}:
with stdenv.lib;
+# All dependencies should use the same OpenBLAS.
+let
+ arpack_ = arpack;
+ suitesparse_ = suitesparse;
+in
+let
+ arpack = arpack_.override { inherit openblas; };
+ suitesparse = suitesparse_.override { inherit openblas; };
+in
+
stdenv.mkDerivation rec {
pname = "julia";
version = "0.3.11";
@@ -34,7 +45,7 @@ stdenv.mkDerivation rec {
md5 = "cb61be3be7254eae39684612c524740d";
};
- in [ dsfmt_src llvm.src ];
+ in [ dsfmt_src ];
prePatch = ''
copy_kill_hash(){
@@ -59,22 +70,18 @@ stdenv.mkDerivation rec {
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
'';
- buildInputs =
- [ libunwind readline utf8proc zlib
- double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
- openblas arpack suitesparse
- ];
+ buildInputs = [
+ arpack double_conversion fftw fftwSinglePrec glpk gmp libunwind
+ llvm mpfr pcre openblas readline suitesparse utf8proc zlib
+ ];
- nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
+ nativeBuildInputs = [ gfortran git m4 patchelf perl python2 which ];
makeFlags =
let
arch = head (splitString "-" stdenv.system);
- march =
- { "x86_64-linux" = "x86-64";
- "x86_64-darwin" = "x86-64";
- "i686-linux" = "i686";
- }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+ march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
+ or (throw "unsupported architecture: ${arch}");
in [
"ARCH=${arch}"
"MARCH=${march}"
@@ -97,6 +104,7 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_GRISU=1"
"USE_SYSTEM_LIBUNWIND=1"
+ "USE_SYSTEM_LLVM=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1"
diff --git a/pkgs/development/compilers/llvm/3.3/llvm.nix b/pkgs/development/compilers/llvm/3.3/llvm.nix
index d0f8fcb3bf8f..8dca8b43bc2c 100644
--- a/pkgs/development/compilers/llvm/3.3/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.3/llvm.nix
@@ -12,6 +12,11 @@ in stdenv.mkDerivation rec {
patches = [
./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
./no-rule-aarch64.patch # http://llvm.org/bugs/show_bug.cgi?id=16625
+ # Patch needed for Julia, backports fixes from LLVM 3.5
+ (fetchurl {
+ url = "https://raw.githubusercontent.com/JuliaLang/julia/3bdda3750efc4ebf8ce7eda8a0888ffef3851605/deps/llvm-3.3.patch";
+ sha256 = "0j6chyx4k8zr1qha5dks8lqlcraqrj4q1hwnk2kj3qi6cajsd8k3";
+ })
];
buildInputs = [ perl groff cmake python libffi ];
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
new file mode 100644
index 000000000000..9fb212b9c054
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+
+let
+ gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+in stdenv.mkDerivation {
+ name = "clang-${version}";
+
+ unpackPhase = ''
+ unpackFile ${fetch "cfe" "1k517b0jj74c4vgnnd4ikbrpb96na541bi8q845ckw8xm72l1msf"}
+ mv cfe-${version}.src clang
+ sourceRoot=$PWD/clang
+ unpackFile ${clang-tools-extra_src}
+ mv clang-tools-extra-* $sourceRoot/tools/extra
+ '';
+
+ buildInputs = [ cmake libedit libxml2 llvm ];
+
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DCMAKE_CXX_FLAGS=-std=c++11"
+ ] ++
+ # Maybe with compiler-rt this won't be needed?
+ (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
+ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
+
+ patches = [ ./purity.patch ];
+
+ postPatch = ''
+ sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
+ sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+ '';
+
+ # Clang expects to find LLVMgold in its own prefix
+ # Clang expects to find sanitizer libraries in its own prefix
+ postInstall = ''
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
+ ln -sv $out/bin/clang $out/bin/cpp
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ isClang = true;
+ } // stdenv.lib.optionalAttrs stdenv.isLinux {
+ inherit gcc;
+ };
+
+ meta = {
+ description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/clang/purity.patch b/pkgs/development/compilers/llvm/3.7/clang/purity.patch
new file mode 100644
index 000000000000..ee73b26eb5ce
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/clang/purity.patch
@@ -0,0 +1,17 @@
+--- a/lib/Driver/Tools.cpp 2015-07-31 00:47:41.000000000 +0200
++++ b/lib/Driver/Tools.cpp 2015-09-11 21:30:50.057895565 +0200
+@@ -8150,15 +8150,6 @@
+ CmdArgs.push_back("-shared");
+ }
+
+- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
+- Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
+- (!Args.hasArg(options::OPT_static) &&
+- !Args.hasArg(options::OPT_shared))) {
+- CmdArgs.push_back("-dynamic-linker");
+- CmdArgs.push_back(Args.MakeArgString(
+- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
+- }
+-
+ CmdArgs.push_back("-o");
+ CmdArgs.push_back(Output.getFilename());
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
new file mode 100644
index 000000000000..cbd0f89ae086
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -0,0 +1,35 @@
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+let
+ callPackage = newScope (self // { inherit stdenv isl version fetch; });
+
+ version = "3.7.0";
+
+ fetch = fetch_v version;
+ fetch_v = ver: name: sha256: fetchurl {
+ url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+ inherit sha256;
+ };
+
+ compiler-rt_src = fetch "compiler-rt" "02rbsqdnj1dw9q3d8w5wwmvz5gfraiv8xp18lis4kj8baacajzr2";
+ clang-tools-extra_src = fetch "clang-tools-extra" "1k894zkx4w8grigmgv5y4q9zrcic2ypz0zfn28270ykbm6is1s4a";
+
+ self = {
+ llvm = callPackage ./llvm.nix {
+ inherit compiler-rt_src stdenv;
+ };
+
+ clang-unwrapped = callPackage ./clang {
+ inherit clang-tools-extra_src stdenv;
+ };
+
+ clang = wrapCC self.clang-unwrapped;
+
+ stdenv = overrideCC stdenv self.clang;
+
+ lldb = callPackage ./lldb.nix {};
+
+ libcxx = callPackage ./libc++ {};
+
+ libcxxabi = callPackage ./libc++abi.nix {};
+ };
+in self
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
new file mode 100644
index 000000000000..bf83f169cfc3
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
@@ -0,0 +1,30 @@
+diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt
+--- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100
++++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200
+@@ -56,7 +56,7 @@
+ "-compatibility_version 1"
+ "-current_version ${LIBCXX_VERSION}"
+ "-install_name /usr/lib/libc++.1.dylib"
+- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
++ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
+ "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
+ "/usr/lib/libSystem.B.dylib")
+ else()
+@@ -64,14 +64,14 @@
+ list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
+ if (OSX_HAS_ARMV7)
+ set(OSX_RE_EXPORT_LINE
+- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
++ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
+ "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
+ else()
+ set(OSX_RE_EXPORT_LINE
+- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
++ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
+ endif()
+ else()
+- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
++ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
+ endif()
+
+ list(APPEND link_flags
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
new file mode 100644
index 000000000000..cd985d89098d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
@@ -0,0 +1,49 @@
+{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
+
+stdenv.mkDerivation rec {
+ name = "libc++-${version}";
+
+ src = fetch "libcxx" "13nh78zp5d2jf732mxnalw679zjywbjpz9942j66fznd6f1kr3y1";
+
+ postUnpack = ''
+ unpackFile ${libcxxabi.src}
+ '';
+
+ preConfigure = ''
+ # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+ cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
+ '' +
+ stdenv.lib.optionalString stdenv.isDarwin ''
+ # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
+ # force it to link with our copy
+ substituteInPlace lib/CMakeLists.txt \
+ --replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \
+ 'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \
+ --replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \
+ '"${libcxxabi}/lib/libc++abi.dylib"'
+ '';
+
+ patches = [ ./darwin.patch ];
+
+ buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ cmakeFlags =
+ [ "-DCMAKE_BUILD_TYPE=Release"
+ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+ "-DLIBCXX_LIBCPPABI_VERSION=2"
+ "-DLIBCXX_CXX_ABI=libcxxabi"
+ ];
+
+ enableParallelBuilding = true;
+
+ linkCxxAbi = stdenv.isLinux;
+
+ setupHook = ./setup-hook.sh;
+
+ meta = {
+ homepage = http://libcxx.llvm.org/;
+ description = "A new implementation of the C++ standard library, targeting C++11";
+ license = "BSD";
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
new file mode 100644
index 000000000000..9022fced6ecf
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
@@ -0,0 +1,3 @@
+linkCxxAbi="@linkCxxAbi@"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
new file mode 100644
index 000000000000..a1b300ffa04f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -0,0 +1,47 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+
+stdenv.mkDerivation {
+ name = "libc++abi-${version}";
+
+ src = fetch "libcxxabi" "1swvnhrf9g67579c5picg0l869f8l2bwi4xqpbcb4n296gyp9c28";
+
+ buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
+
+ postUnpack = ''
+ unpackFile ${libcxx.src}
+ unpackFile ${llvm.src}
+ export NIX_CFLAGS_COMPILE+=" -I$PWD/include"
+ export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export TRIPLE=x86_64-apple-darwin
+ '';
+
+ installPhase = if stdenv.isDarwin
+ then ''
+ for file in lib/*.dylib; do
+ # this should be done in CMake, but having trouble figuring out
+ # the magic combination of necessary CMake variables
+ # if you fancy a try, take a look at
+ # http://www.cmake.org/Wiki/CMake_RPATH_handling
+ install_name_tool -id $out/$file $file
+ done
+ make install
+ install -d 755 $out/include
+ install -m 644 ../include/cxxabi.h $out/include
+ ''
+ else ''
+ install -d -m 755 $out/include $out/lib
+ install -m 644 lib/libc++abi.so.1.0 $out/lib
+ install -m 644 ../include/cxxabi.h $out/include
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+ '';
+
+ meta = {
+ homepage = http://libcxxabi.llvm.org/;
+ description = "A new implementation of low level support for a standard C++ library";
+ license = "BSD";
+ maintainers = with stdenv.lib.maintainers; [ vlstill ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
new file mode 100644
index 000000000000..60f1550dd447
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/lldb.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, llvm
+, clang-unwrapped
+, python
+, version
+}:
+
+stdenv.mkDerivation {
+ name = "lldb-${version}";
+
+ src = fetch "lldb" "1sbi9c6c4m73wfw249dn0n2974p444i03brk82m4w10iq5dm1mzl";
+
+ patchPhase = ''
+ sed -i 's|/usr/bin/env||' \
+ scripts/Python/finish-swig-Python-LLDB.sh \
+ scripts/Python/build-swig-Python.sh
+ '';
+
+ buildInputs = [ cmake python which swig ncurses zlib libedit ];
+
+ preConfigure = ''
+ export CXXFLAGS="-pthread"
+ export LDFLAGS="-ldl"
+ '';
+
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
+ "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
+ "-DPYTHON_VERSION_MAJOR=2"
+ "-DPYTHON_VERSION_MINOR=7"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A next-generation high-performance debugger";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
new file mode 100644
index 000000000000..eb1f6f668b15
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, fetch
+, perl
+, groff
+, cmake
+, python
+, libffi
+, binutils
+, libxml2
+, valgrind
+, ncurses
+, version
+, zlib
+, compiler-rt_src
+}:
+
+let
+ src = fetch "llvm" "0lrirklh4nrcb078qc2f6vbmmc34kxqgsy9s18a1xbfdkmgqjidb";
+in stdenv.mkDerivation rec {
+ name = "llvm-${version}";
+
+ unpackPhase = ''
+ unpackFile ${src}
+ mv llvm-${version}.src llvm
+ sourceRoot=$PWD/llvm
+ unpackFile ${compiler-rt_src}
+ mv compiler-rt-* $sourceRoot/projects/compiler-rt
+ '';
+
+ buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */;
+
+ propagatedBuildInputs = [ ncurses zlib ];
+
+ # hacky fix: created binaries need to be run before installation
+ preBuild = ''
+ mkdir -p $out/
+ ln -sv $PWD/lib $out
+ '';
+
+ cmakeFlags = with stdenv; [
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DLLVM_BUILD_TESTS=ON"
+ "-DLLVM_ENABLE_FFI=ON"
+ "-DLLVM_ENABLE_RTTI=ON"
+ ] ++ stdenv.lib.optionals (!isDarwin) [
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
+ ] ++ stdenv.lib.optionals ( isDarwin) [
+ "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
+ "-DCAN_TARGET_i386=false"
+ ];
+
+ postBuild = ''
+ rm -fR $out
+
+ paxmark m bin/{lli,llvm-rtdyld}
+
+ paxmark m unittests/ExecutionEngine/JIT/JITTests
+ paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
+ paxmark m unittests/Support/SupportTests
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru.src = src;
+
+ meta = {
+ description = "Collection of modular and reusable compiler and toolchain technologies";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 0321ae1f60ab..32c1bbbe9414 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre }:
+{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre }:
stdenv.mkDerivation rec {
name = "neko-${version}";
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927";
};
+ patches = stdenv.lib.singleton (fetchpatch {
+ url = "https://github.com/HaxeFoundation/neko/commit/"
+ + "ccc78c29deab7971e1369f4fe3dedd14cf9f3128.patch";
+ sha256 = "1nya50rzai15hmpq2azganjxzgrfydf30glfwirgw6q8z7z3wpkq";
+ });
+
prePatch = with stdenv.lib; let
libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs);
in ''
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/7.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/default.nix
rename to pkgs/development/compilers/openjdk/7.nix
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/8.nix
similarity index 81%
rename from pkgs/development/compilers/openjdk/openjdk8.nix
rename to pkgs/development/compilers/openjdk/8.nix
index 8afa770cdb27..0e9184e1c628 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,8 +1,22 @@
{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype
, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
+, setJavaClassPath
+, minimal ? false
+}:
-, minimal ? false } :
let
+
+ /**
+ * The JRE libraries are in directories that depend on the CPU.
+ */
+ architecture =
+ if stdenv.system == "i686-linux" then
+ "i386"
+ else if stdenv.system == "x86_64-linux" then
+ "amd64"
+ else
+ throw "openjdk requires i686-linux or x86_64 linux";
+
update = "60";
build = "24";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
@@ -98,14 +112,14 @@ let
installPhase = ''
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
- cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk
+ cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
# Move some stuff to top-level.
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/
+ ln -s $out/include/linux/*_md.h $out/include/
# Remove some broken manpages.
rm -rf $out/share/man/ja*
@@ -124,7 +138,7 @@ let
ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
# Set PaX markings
- exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+ exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
echo "to mark: *$exes*"
for file in $exes; do
echo "marking *$file*"
@@ -149,6 +163,25 @@ let
ln -s $jre/lib/openjdk/jre/bin $jre/bin
'';
+ # FIXME: this is unnecessary once the multiple-outputs branch is merged.
+ preFixup = ''
+ prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
+ patchELF $jre
+ propagatedNativeBuildInputs+=" $jre"
+
+ # Propagate the setJavaClassPath setup hook from the JRE so that
+ # any package that depends on the JRE has $CLASSPATH set up
+ # properly.
+ mkdir -p $jre/nix-support
+ echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
+
+ # Set JAVA_HOME automatically.
+ mkdir -p $out/nix-support
+ cat < $out/nix-support/setup-hook
+ if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+ EOF
+ '';
+
postFixup = ''
# Build the set of output library directories to rpath against
LIBDIRS=""
@@ -183,6 +216,9 @@ let
platforms = platforms.linux;
};
- passthru.home = "${openjdk8}/lib/openjdk";
+ passthru = {
+ inherit architecture;
+ home = "${openjdk8}/lib/openjdk";
+ };
};
in openjdk8
diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
index 56669ae0f2f6..459bfce50988 100644
--- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
+++ b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
@@ -45,7 +45,7 @@ fi
rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
# set all the dynamic linkers
-find $out -type f -perm +100 \
+find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 35ee1a04a268..f4944e45c0e8 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -142,7 +142,7 @@ let result = stdenv.mkDerivation rec {
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
# set all the dynamic linkers
- find $out -type f -perm +100 \
+ find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
@@ -182,6 +182,9 @@ let result = stdenv.mkDerivation rec {
passthru.home = result;
- meta.license = stdenv.lib.licenses.unfree;
+ meta = with stdenv.lib; {
+ license = licenses.unfree;
+ platforms = [ "i686-linux" "x86_64-linux" ]; # some inherit jre.meta.platforms
+ };
}; in result
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 6bb60c6dc69e..ee7d0c7749d9 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -118,15 +118,13 @@ stdenv.mkDerivation {
configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
+ # TODO always include starting from 1.3.0, superseeding patch and substituteInPlace below
+ ++ stdenv.lib.optional (!isRelease) [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ]
++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang";
inherit patches;
postPatch = ''
- substituteInPlace src/librustc_back/target/mod.rs \
- --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
- --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
-
substituteInPlace src/rust-installer/gen-install-script.sh \
--replace /bin/echo "${coreutils}/bin/echo"
substituteInPlace src/rust-installer/gen-installer.sh \
@@ -135,7 +133,11 @@ stdenv.mkDerivation {
# Workaround for NixOS/nixpkgs#8676
substituteInPlace mk/rustllvm.mk \
--replace "\$\$(subst /,//," "\$\$(subst /,/,"
- '';
+ '' + stdenv.lib.optionalString (isRelease) ''
+ substituteInPlace src/librustc_back/target/mod.rs \
+ --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
+ --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
+ ''; # TODO remove in 1.3.0, superseeded by configure flags
buildInputs = [ which file perl curl python27 makeWrapper git ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ procps valgrind ];
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index d65258a3a08d..3b1cccee9413 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,18 +1,18 @@
+# Please make sure to check if rustfmt still builds when updating nightly
+
{ stdenv, callPackage }:
callPackage ./generic.nix {
- shortVersion = "2015-08-09";
+ shortVersion = "2015-09-05";
isRelease = false;
- # src rev for 2015-08-09's nightly channel
- srcRev = "a5d33d891";
- srcSha = "1iivzk9ggjh7y89rbw275apw4rfmzh4jk50kf0milljhvf72660n";
- snapshotHashLinux686 = "3459275cdf3896f678e225843fa56f0d9fdbabe8";
- snapshotHashLinux64 = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c";
- snapshotHashDarwin686 = "428944a7984c0988e77909d82ca2ef77d96a1fbd";
- snapshotHashDarwin64 = "b0515bb7d2892b9a58282fc865fee11a885406d6";
- snapshotDate = "2015-07-26";
- snapshotRev = "a5c12f4";
- patches = [
- ./patches/head.patch
- ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+ # src rev for 2015-09-05's nightly channel
+ srcRev = "779b2a9847319106647dcad12fc6dc472bc0cf4d";
+ srcSha = "0m22lxpcjnwa68bpxhfvp07k52gyds8ykif2pf5r2x22lw28vbg3";
+ snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216";
+ snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f";
+ snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d";
+ snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2";
+ snapshotDate = "2015-08-11";
+ snapshotRev = "1af31d4";
+ patches = stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
}
diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch
index ace22c825f9e..2425fff04a15 100644
--- a/pkgs/development/compilers/rustc/patches/head.patch
+++ b/pkgs/development/compilers/rustc/patches/head.patch
@@ -1,18 +1,3 @@
-diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
-index 39e4291..b352bd1 100644
---- a/src/librustc_back/target/mod.rs
-+++ b/src/librustc_back/target/mod.rs
-@@ -179,8 +179,8 @@ impl Default for TargetOptions {
- fn default() -> TargetOptions {
- TargetOptions {
- data_layout: String::new(),
-- linker: "cc".to_string(),
-- ar: "ar".to_string(),
-+ linker: "@ccPath@".to_string(), // ignore-tidy-linelength
-+ ar: "@arPath@".to_string(), // ignore-tidy-linelength
- pre_link_args: Vec::new(),
- post_link_args: Vec::new(),
- cpu: "generic".to_string(),
diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
index 2772fc8..3d37b08 100644
--- a/src/test/run-pass/issue-20797.rs
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 861a12f1f09f..dc862940edf2 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,77 +1,43 @@
-{ stdenv, fetchurl, file, openssl, mlton, mysql, postgresql, sqlite }:
+{ stdenv, fetchurl, file, openssl, mlton
+, mysql, postgresql, sqlite
+}:
stdenv.mkDerivation rec {
- pname = "urweb";
+ name = "urweb-${version}";
version = "20150819";
- name = "${pname}-${version}";
src = fetchurl {
url = "http://www.impredicative.com/ur/${name}.tgz";
sha256 = "0gpdlq3aazx121k3ia94qfa4dyv04q7478x2p6hvcjamn18vk56n";
};
- buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];
+ buildInputs = [ openssl mlton mysql postgresql sqlite ];
prePatch = ''
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
- '';
+ '';
- preConfigure =
- ''
- export CC="${stdenv.cc}/bin/gcc";
- export CCARGS="-I$out/include \
- -L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
+ configureFlags = "--with-openssl=${openssl}";
- export PGHEADER="${postgresql}/include/libpq-fe.h";
- export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
- export SQHEADER="${sqlite}/include/sqlite3.h";
- '';
+ preConfigure = ''
+ export PGHEADER="${postgresql}/include/libpq-fe.h";
+ export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
+ export SQHEADER="${sqlite}/include/sqlite3.h";
- configureFlags = "--with-openssl=${openssl}";
+ export CCARGS="-I$out/include \
+ -L${mysql.lib}/lib/mysql \
+ -L${postgresql}/lib \
+ -L${sqlite}/lib";
+ '';
+ # Be sure to keep the statically linked libraries
dontDisableStatic = true;
meta = {
- description = "Construct dynamic web applications backed by SQL databases";
- longDescription = ''
- Ur is a programming language in the tradition of ML and Haskell, but
- featuring a significantly richer type system. Ur is functional, pure,
- statically-typed, and strict. Ur supports a powerful kind of
- metaprogramming based on row types.
-
- Ur/Web is Ur plus a special standard library and associated rules for
- parsing and optimization. Ur/Web supports construction of dynamic web
- applications backed by SQL databases. The signature of the standard
- library is such that well-typed Ur/Web programs "don't go wrong" in a
- very broad sense. Not only do they not crash during particular page
- generations, but they also may not:
-
- * Suffer from any kinds of code-injection attacks
- * Return invalid HTML
- * Contain dead intra-application links
- * Have mismatches between HTML forms and the fields expected by their handlers
- * Include client-side code that makes incorrect assumptions about the "AJAX"-style services that the remote web server provides
- * Attempt invalid SQL queries
- * Use improper marshaling or unmarshaling in communication with SQL databases or between browsers and web servers
-
- This type safety is just the foundation of the Ur/Web methodology. It is
- also possible to use metaprogramming to build significant application pieces
- by analysis of type structure. For instance, the demo includes an ML-style
- functor for building an admin interface for an arbitrary SQL table. The
- type system guarantees that the admin interface sub-application that comes
- out will always be free of the above-listed bugs, no matter which well-typed
- table description is given as input.
-
- The Ur/Web compiler also produces very efficient object code that does not use
- garbage collection. These compiled programs will often be even more efficient
- than what most programmers would bother to write in C. For example, the
- standalone web server generated for the demo uses less RAM than the bash shell.
- The compiler also generates JavaScript versions of client-side code, with no need
- to write those parts of applications in a different language.
- '';
-
- homepage = http://www.impredicative.com/ur/;
- license = stdenv.lib.licenses.bsd3;
- platforms = [ "i686-linux" "x86_64-linux" ];
+ description = "Advanced purely-functional web programming language";
+ homepage = "http://www.impredicative.com/ur/";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1545e49130a1..9f7a18fa2dac 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -8,11 +8,11 @@ self: super: {
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
- cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
- cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
+ cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
+ cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
# Link statically to avoid runtime dependency on GHC.
- jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
+ jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
# Apply NixOS-specific patches.
ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
@@ -20,28 +20,59 @@ self: super: {
# Break infinite recursions.
Dust-crypto = dontCheck super.Dust-crypto;
hasql-postgres = dontCheck super.hasql-postgres;
+ hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
+ hspec_2_1_2 = super.hspec_2_1_2.override { stringbuilder = dontCheck super.stringbuilder; };
+ hspec_2_1_3 = super.hspec_2_1_3.override { stringbuilder = dontCheck super.stringbuilder; };
+ hspec_2_1_4 = super.hspec_2_1_4.override { stringbuilder = dontCheck super.stringbuilder; };
+ hspec_2_1_5 = super.hspec_2_1_5.override { stringbuilder = dontCheck super.stringbuilder; };
+ hspec_2_1_6 = super.hspec_2_1_6.override { stringbuilder = dontCheck super.stringbuilder; };
+ hspec_2_1_7 = super.hspec_2_1_7.override { stringbuilder = dontCheck super.stringbuilder; };
+ hspec-expectations_0_6_1_1 = dontCheck super.hspec-expectations_0_6_1_1;
+ hspec-expectations_0_6_1 = dontCheck super.hspec-expectations_0_6_1;
+ hspec-expectations_0_7_1 = dontCheck super.hspec-expectations_0_7_1;
+ hspec-expectations = dontCheck super.hspec-expectations;
hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
HTTP = dontCheck super.HTTP;
+ mwc-random_0_13_2_2 = dontCheck super.mwc-random_0_13_2_2;
+ mwc-random_0_13_3_0 = dontCheck super.mwc-random_0_13_3_0;
mwc-random = dontCheck super.mwc-random;
+ nanospec_0_2_0 = dontCheck super.nanospec_0_2_0;
nanospec = dontCheck super.nanospec;
+ options_1_2_1 = dontCheck super.options_1_2_1;
+ options_1_2 = dontCheck super.options_1_2;
options = dontCheck super.options;
statistics = dontCheck super.statistics;
+ text_1_1_1_3 = dontCheck super.text_1_1_1_3;
+ text_1_2_0_3 = dontCheck super.text_1_2_0_3;
+ text_1_2_0_4 = dontCheck super.text_1_2_0_4;
+ text_1_2_0_6 = dontCheck super.text_1_2_0_6;
text = dontCheck super.text;
# The package doesn't compile with ruby 1.9, which is our default at the moment.
hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
- # Doesn't compile with lua 5.2.
- hslua = super.hslua.override { lua = pkgs.lua5_1; };
-
# Use the default version of mysql to build this package (which is actually mariadb).
mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
# Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
- # These changes are required to support Darwin.
- git-annex = (disableSharedExecutables super.git-annex).override {
+ # This package needs a little help compiling properly on Darwin. Furthermore,
+ # Stackage compiles git-annex without the Assistant, supposedly because not
+ # all required dependencies are part of Stackage. To comply with Stackage, we
+ # make 'git-annex-without-assistant' our default version, but offer another
+ # build which has the assistant to be used in the top-level.
+ git-annex_5_20150916 = (disableCabalFlag super.git-annex_5_20150916 "assistant").override {
+ dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+ fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
+ hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+ };
+ git-annex = (disableCabalFlag super.git-annex "assistant").override {
+ dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+ fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
+ hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+ };
+ git-annex-with-assistant = super.git-annex.override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
@@ -53,7 +84,7 @@ self: super: {
configureFlags = (drv.configureFlags or []) ++
pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [
"--extra-lib-dirs=${pkgs.cudatoolkit}/lib"
- "--extra-include-dirs=${pkgs.cudatoolkit}/usr_include"
+ "--extra-include-dirs=${pkgs.cudatoolkit}/include"
];
preConfigure = ''
unset CC # unconfuse the haskell-cuda configure script
@@ -65,33 +96,6 @@ self: super: {
# https://github.com/phaazon/al/issues/1
al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";
- # Depends on code distributed under a non-free license.
- accelerate-cublas = dontDistribute super.accelerate-cublas;
- accelerate-cuda = dontDistribute super.accelerate-cuda;
- accelerate-cufft = dontDistribute super.accelerate-cufft;
- accelerate-examples = dontDistribute super.accelerate-examples;
- accelerate-fft = dontDistribute super.accelerate-fft;
- accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark;
- AttoJson = markBroken super.AttoJson;
- bindings-yices = dontDistribute super.bindings-yices;
- cublas = dontDistribute super.cublas;
- cufft = dontDistribute super.cufft;
- gloss-accelerate = dontDistribute super.gloss-accelerate;
- gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate;
- GoogleTranslate = dontDistribute super.GoogleTranslate;
- GoogleDirections = dontDistribute super.GoogleDirections;
- libnvvm = dontDistribute super.libnvvm;
- manatee-all = dontDistribute super.manatee-all;
- manatee-ircclient = dontDistribute super.manatee-ircclient;
- Obsidian = dontDistribute super.Obsidian;
- patch-image = dontDistribute super.patch-image;
- yices = dontDistribute super.yices;
- yices-easy = dontDistribute super.yices-easy;
- yices-painless = dontDistribute super.yices-painless;
-
- # https://github.com/GaloisInc/RSA/issues/9
- RSA = dontCheck super.RSA;
-
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
@@ -116,17 +120,7 @@ self: super: {
# https://github.com/haskell/time/issues/23
time_1_5_0_1 = dontCheck super.time_1_5_0_1;
- # Help libconfig find it's C language counterpart.
- libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
-
- hmatrix = overrideCabal super.hmatrix (drv: {
- configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ];
- extraLibraries = [ pkgs.openblasCompat ];
- preConfigure = ''
- sed -i hmatrix.cabal -e 's@/usr/lib/openblas/lib@${pkgs.openblasCompat}/lib@'
- '';
- });
-
+ # Switch levmar build to openblas.
bindings-levmar = overrideCabal super.bindings-levmar (drv: {
preConfigure = ''
sed -i bindings-levmar.cabal \
@@ -156,6 +150,13 @@ self: super: {
HDBC-odbc = dontHaddock super.HDBC-odbc;
hoodle-core = dontHaddock super.hoodle-core;
hsc3-db = dontHaddock super.hsc3-db;
+ hspec-discover_2_1_10 = dontHaddock super.hspec-discover_2_1_10;
+ hspec-discover_2_1_2 = dontHaddock super.hspec-discover_2_1_2;
+ hspec-discover_2_1_3 = dontHaddock super.hspec-discover_2_1_3;
+ hspec-discover_2_1_4 = dontHaddock super.hspec-discover_2_1_4;
+ hspec-discover_2_1_5 = dontHaddock super.hspec-discover_2_1_5;
+ hspec-discover_2_1_6 = dontHaddock super.hspec-discover_2_1_6;
+ hspec-discover_2_1_7 = dontHaddock super.hspec-discover_2_1_7;
hspec-discover = dontHaddock super.hspec-discover;
http-client-conduit = dontHaddock super.http-client-conduit;
http-client-multipart = dontHaddock super.http-client-multipart;
@@ -170,7 +171,7 @@ self: super: {
darcs = (overrideCabal super.darcs (drv: {
doCheck = false; # The test suite won't even start.
postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
- })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
+ }));
# https://github.com/massysett/rainbox/issues/1
rainbox = dontCheck super.rainbox;
@@ -178,13 +179,6 @@ self: super: {
# https://github.com/techtangents/ablist/issues/1
ABList = dontCheck super.ABList;
- # These packages have broken dependencies.
- ASN1 = dontDistribute super.ASN1; # NewBinary
- frame-markdown = dontDistribute super.frame-markdown; # frame
- hails-bin = dontDistribute super.hails-bin; # Hails
- lss = markBrokenVersion "0.1.0.0" super.lss; # https://github.com/dbp/lss/issues/2
- snaplet-lss = markBrokenVersion "0.1.0.0" super.snaplet-lss; # https://github.com/dbp/lss/issues/2
-
# https://github.com/haskell/vector/issues/47
vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;
@@ -225,21 +219,6 @@ self: super: {
'';
});
- # Does not compile: "fatal error: ieee-flpt.h: No such file or directory"
- base_4_8_1_0 = markBroken super.base_4_8_1_0;
-
- # Obsolete: https://github.com/massysett/prednote/issues/1.
- prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test;
-
- # Doesn't compile: "Setup: can't find include file ghc-gmp.h"
- integer-gmp_1_0_0_0 = markBroken super.integer-gmp_1_0_0_0;
-
- # Obsolete.
- lushtags = markBrokenVersion "0.0.1" super.lushtags;
-
- # https://github.com/haskell/bytestring/issues/41
- bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0;
-
# tests don't compile for some odd reason
jwt = dontCheck super.jwt;
@@ -303,6 +282,7 @@ self: super: {
pocket-dns = dontCheck super.pocket-dns;
postgresql-simple = dontCheck super.postgresql-simple;
postgrest = dontCheck super.postgrest;
+ setenv_0_1_1_1 = dontCheck super.setenv_0_1_1_1;
snowball = dontCheck super.snowball;
sophia = dontCheck super.sophia;
test-sandbox = dontCheck super.test-sandbox;
@@ -313,8 +293,8 @@ self: super: {
xmlgen = dontCheck super.xmlgen;
# These packages try to access the network.
- amqp = dontCheck super.amqp;
amqp-conduit = dontCheck super.amqp-conduit;
+ amqp = dontCheck super.amqp;
bitcoin-api = dontCheck super.bitcoin-api;
bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw
@@ -326,9 +306,38 @@ self: super: {
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
holy-project = dontCheck super.holy-project; # http://hydra.cryp.to/build/502002/nixlog/1/raw
+ holy-project_0_1_1_1 = dontCheck super.holy-project_0_1_1_1;
+ holy-project_0_2_0_0 = dontCheck super.holy-project_0_2_0_0 ;
hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
+ http-client_0_4_11_1 = dontCheck super.http-client_0_4_11_1;
+ http-client_0_4_11_2 = dontCheck super.http-client_0_4_11_2;
+ http-client_0_4_11_3 = dontCheck super.http-client_0_4_11_3;
+ http-client_0_4_11 = dontCheck super.http-client_0_4_11;
+ http-client_0_4_12 = dontCheck super.http-client_0_4_12;
+ http-client_0_4_13 = dontCheck super.http-client_0_4_13;
+ http-client_0_4_15 = dontCheck super.http-client_0_4_15;
+ http-client_0_4_16 = dontCheck super.http-client_0_4_16;
+ http-client_0_4_18_1 = dontCheck super.http-client_0_4_18_1;
+ http-client_0_4_19 = dontCheck super.http-client_0_4_19;
+ http-client_0_4_20 = dontCheck super.http-client_0_4_20;
+ http-client_0_4_21 = dontCheck super.http-client_0_4_21;
+ http-client_0_4_22 = dontCheck super.http-client_0_4_22;
+ http-client_0_4_6_1 = dontCheck super.http-client_0_4_6_1;
+ http-client_0_4_6_2 = dontCheck super.http-client_0_4_6_2;
+ http-client_0_4_6 = dontCheck super.http-client_0_4_6;
+ http-client_0_4_7_1 = dontCheck super.http-client_0_4_7_1;
+ http-client_0_4_7 = dontCheck super.http-client_0_4_7;
+ http-client_0_4_8_1 = dontCheck super.http-client_0_4_8_1;
+ http-client_0_4_8 = dontCheck super.http-client_0_4_8;
+ http-client_0_4_9 = dontCheck super.http-client_0_4_9;
http-client = dontCheck super.http-client; # http://hydra.cryp.to/build/501430/nixlog/1/raw
+ http-conduit_2_1_5_1 = dontCheck super.http-conduit_2_1_5_1;
+ http-conduit_2_1_5 = dontCheck super.http-conduit_2_1_5;
+ http-conduit_2_1_7_1 = dontCheck super.http-conduit_2_1_7_1;
+ http-conduit_2_1_7_2 = dontCheck super.http-conduit_2_1_7_2;
http-conduit = dontCheck super.http-conduit; # http://hydra.cryp.to/build/501966/nixlog/1/raw
+ js-jquery_1_11_1 = dontCheck super.js-jquery_1_11_1;
+ js-jquery_1_11_2 = dontCheck super.js-jquery_1_11_2;
js-jquery = dontCheck super.js-jquery;
marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw
network-transport-tcp = dontCheck super.network-transport-tcp;
@@ -425,6 +434,9 @@ self: super: {
hsexif = dontCheck super.hsexif;
hspec-server = dontCheck super.hspec-server;
HTF = dontCheck super.HTF;
+ HTF_0_12_2_3 = dontCheck super.HTF_0_12_2_3;
+ HTF_0_12_2_4 = dontCheck super.HTF_0_12_2_4;
+ HTF_0_13_0_0 = dontCheck super.HTF_0_13_0_0;
htsn = dontCheck super.htsn;
htsn-import = dontCheck super.htsn-import;
http2 = dontCheck super.http2;
@@ -452,6 +464,9 @@ self: super: {
optional = dontCheck super.optional;
os-release = dontCheck super.os-release;
pandoc-citeproc = dontCheck super.pandoc-citeproc;
+ pandoc-citeproc_0_6 = dontCheck super.pandoc-citeproc_0_6;
+ pandoc-citeproc_0_6_0_1 = dontCheck super.pandoc-citeproc_0_6_0_1;
+ pandoc-citeproc_0_7_3 = dontCheck super.pandoc-citeproc_0_7_3;
persistent-redis = dontCheck super.persistent-redis;
pipes-extra = dontCheck super.pipes-extra;
pipes-websockets = dontCheck super.pipes-websockets;
@@ -470,6 +485,9 @@ self: super: {
separated = dontCheck super.separated;
shadowsocks = dontCheck super.shadowsocks;
shake-language-c = dontCheck super.shake-language-c;
+ shake-language-c_0_6_3 = dontCheck super.shake-language-c_0_6_3;
+ shake-language-c_0_6_4 = dontCheck super.shake-language-c_0_6_4;
+ shake-language-c_0_8_0 = dontCheck super.shake-language-c_0_8_0;
static-resources = dontCheck super.static-resources;
strive = dontCheck super.strive; # fails its own hlint test with tons of warnings
svndump = dontCheck super.svndump;
@@ -487,9 +505,6 @@ self: super: {
webdriver = dontCheck super.webdriver;
xsd = dontCheck super.xsd;
- # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test
- hspec-webdriver = markBroken super.hspec-webdriver;
-
# Needs access to locale data, but looks for it in the wrong place.
scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
@@ -509,30 +524,12 @@ self: super: {
# Help the test suite find system timezone data.
tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; });
- # Deprecated upstream and doesn't compile.
- BASIC = dontDistribute super.BASIC;
- bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm);
- llvm = dontDistribute super.llvm;
- llvm-base = markBroken super.llvm-base;
- llvm-base-util = dontDistribute super.llvm-base-util;
- llvm-extra = dontDistribute super.llvm-extra;
- llvm-tf = dontDistribute super.llvm-tf;
- objectid = dontDistribute super.objectid;
- saltine-quickcheck = dontDistribute super.saltine-quickcheck;
- stable-tree = dontDistribute super.stable-tree;
- synthesizer-llvm = dontDistribute super.synthesizer-llvm;
- optimal-blocks = dontDistribute super.optimal-blocks;
- hs-blake2 = dontDistribute super.hs-blake2;
-
# https://ghc.haskell.org/trac/ghc/ticket/9625
vty = dontCheck super.vty;
# https://github.com/vincenthz/hs-crypto-pubkey/issues/20
crypto-pubkey = dontCheck super.crypto-pubkey;
- # https://github.com/zouppen/stratum-tool/issues/14
- stratum-tool = markBrokenVersion "0.0.4" super.stratum-tool;
-
# https://github.com/Gabriel439/Haskell-Turtle-Library/issues/1
turtle = dontCheck super.turtle;
@@ -545,15 +542,6 @@ self: super: {
# https://github.com/cgaebel/stm-conduit/issues/33
stm-conduit = dontCheck super.stm-conduit;
- # The install target tries to run lots of commands as "root". WTF???
- hannahci = markBroken super.hannahci;
-
- # https://github.com/jkarni/th-alpha/issues/1
- th-alpha = markBrokenVersion "0.2.0.0" super.th-alpha;
-
- # https://github.com/haskell-hub/hub-src/issues/24
- hub = markBrokenVersion "1.4.0" super.hub;
-
# https://github.com/pixbi/duplo/issues/25
duplo = dontCheck super.duplo;
@@ -573,9 +561,6 @@ self: super: {
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
- # Upstream notified by e-mail.
- MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose;
-
# no haddock since this is an umbrella package.
cloud-haskell = dontHaddock super.cloud-haskell;
@@ -585,12 +570,6 @@ self: super: {
# https://github.com/NixOS/nixpkgs/issues/6350
paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
- # https://github.com/jwiegley/simple-conduit/issues/2
- simple-conduit = markBroken super.simple-conduit;
-
- # https://code.google.com/p/linux-music-player/issues/detail?id=1
- mp = markBroken super.mp;
-
# https://github.com/afcowie/http-streams/issues/80
http-streams = dontCheck super.http-streams;
@@ -622,42 +601,15 @@ self: super: {
apiary-session = dontCheck super.apiary-session;
apiary-websockets = dontCheck super.apiary-websockets;
- # https://github.com/mikeizbicki/hmm/issues/12
- hmm = markBroken super.hmm;
-
# https://github.com/alephcloud/hs-configuration-tools/issues/40
configuration-tools = dontCheck super.configuration-tools;
- # https://github.com/fumieval/karakuri/issues/1
- karakuri = markBroken super.karakuri;
-
- # Upstream notified by e-mail.
- gearbox = markBroken super.gearbox;
-
- # https://github.com/deech/fltkhs/issues/7
- fltkhs = markBroken super.fltkhs;
-
- # Build fails, but there seems to be no issue tracker available. :-(
- hmidi = markBrokenVersion "0.2.1.0" super.hmidi;
- padKONTROL = markBroken super.padKONTROL;
- Bang = dontDistribute super.Bang;
- launchpad-control = dontDistribute super.launchpad-control;
-
- # Upstream provides no issue tracker and no contact details.
- vivid = markBroken super.vivid;
-
# Test suite wants to connect to $DISPLAY.
- hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; });
-
- # https://github.com/lookunder/RedmineHs/issues/4
- Redmine = markBroken super.Redmine;
+ hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa);
# HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
unlambda = dontHyperlinkSource super.unlambda;
- # https://github.com/megantti/rtorrent-rpc/issues/2
- rtorrent-rpc = markBroken super.rtorrent-rpc;
-
# https://github.com/PaulJohnson/geodetics/issues/1
geodetics = dontCheck super.geodetics;
@@ -680,42 +632,12 @@ self: super: {
# /homeless-shelter. Disabled.
purescript = dontCheck super.purescript;
- # Broken by GLUT update.
- Monadius = markBroken super.Monadius;
-
- # We don't have the groonga package these libraries bind to.
- haroonga = markBroken super.haroonga;
- haroonga-httpd = markBroken super.haroonga-httpd;
-
- # Build is broken and no contact info available.
- hopenpgp-tools = markBroken super.hopenpgp-tools;
-
- # https://github.com/hunt-framework/hunt/issues/99
- hunt-server = markBrokenVersion "0.3.0.2" super.hunt-server;
-
- # https://github.com/bjpop/blip/issues/16
- blip = markBroken super.blip;
-
# https://github.com/tych0/xcffib/issues/37
xcffib = dontCheck super.xcffib;
# https://github.com/afcowie/locators/issues/1
locators = dontCheck super.locators;
- # https://github.com/scravy/hydrogen-syntax/issues/1
- hydrogen-syntax = markBroken super.hydrogen-syntax;
- hydrogen-cli = dontDistribute super.hydrogen-cli;
-
- # https://github.com/meteficha/Hipmunk/issues/8
- Hipmunk = markBroken super.Hipmunk;
- HipmunkPlayground = dontDistribute super.HipmunkPlayground;
- click-clack = dontDistribute super.click-clack;
-
- # https://github.com/fumieval/audiovisual/issues/1
- audiovisual = markBroken super.audiovisual;
- call = dontDistribute super.call;
- rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
-
# https://github.com/haskell/haddock/issues/378
haddock-library = dontCheck super.haddock-library;
@@ -757,14 +679,8 @@ self: super: {
# Override the obsolete version from Hackage with our more up-to-date copy.
cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
- language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};
- # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
- HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
- HGamer3D-Common = dontDistribute super.HGamer3D-Common;
- HGamer3D-Data = markBroken super.HGamer3D-Data;
-
# https://github.com/ndmitchell/shake/issues/206
# https://github.com/ndmitchell/shake/issues/267
shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
@@ -772,28 +688,6 @@ self: super: {
# https://github.com/nushio3/doctest-prop/issues/1
doctest-prop = dontCheck super.doctest-prop;
- # https://github.com/goldfirere/singletons/issues/117
- clash-lib = dontDistribute super.clash-lib;
- clash-verilog = dontDistribute super.clash-verilog;
- Frames = dontDistribute super.Frames;
- hgeometry = dontDistribute super.hgeometry;
- hipe = dontDistribute super.hipe;
- hsqml-datamodel-vinyl = dontDistribute super.hsqml-datamodel-vinyl;
- singleton-nats = dontDistribute super.singleton-nats;
- singletons = markBroken super.singletons;
- units-attoparsec = dontDistribute super.units-attoparsec;
- ihaskell-widgets = dontDistribute super.ihaskell-widgets;
- exinst-bytes = dontDistribute super.exinst-bytes;
- exinst-deepseq = dontDistribute super.exinst-deepseq;
- exinst-aeson = dontDistribute super.exinst-aeson;
- exinst = dontDistribute super.exinst;
- exinst-hashable = dontDistribute super.exinst-hashable;
-
- # https://github.com/anton-k/temporal-music-notation/issues/1
- temporal-music-notation = markBroken super.temporal-music-notation;
- temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
- temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
-
# https://github.com/adamwalker/sdr/issues/1
sdr = dontCheck super.sdr;
@@ -801,13 +695,9 @@ self: super: {
aeson = dontCheck super.aeson;
# Won't compile with recent versions of QuickCheck.
- testpack = markBroken super.testpack;
inilist = dontCheck super.inilist;
MissingH = dontCheck super.MissingH;
- # Obsolete for GHC versions after GHC 6.10.x.
- utf8-prelude = markBroken super.utf8-prelude;
-
# https://github.com/yaccz/saturnin/issues/3
Saturnin = dontCheck super.Saturnin;
@@ -837,9 +727,6 @@ self: super: {
inline-c-win32 = dontDistribute super.inline-c-win32;
Southpaw = dontDistribute super.Southpaw;
- # Doesn't work with recent versions of mtl.
- cron-compat = markBroken super.cron-compat;
-
# https://github.com/yesodweb/serversession/issues/1
serversession = dontCheck super.serversession;
@@ -851,10 +738,6 @@ self: super: {
# https://github.com/commercialhaskell/stack/issues/409
stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
- # Missing dependency on some hid-usb library.
- hid = markBroken super.hid;
- msi-kb-backlit = dontDistribute super.msi-kb-backlit;
-
# Hydra no longer allows building texlive packages.
lhs2tex = dontDistribute super.lhs2tex;
@@ -874,18 +757,12 @@ self: super: {
# https://github.com/edwinb/EpiVM/issues/14
epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
- # Upstream has no issue tracker.
- dpkg = markBroken super.dpkg;
-
# https://github.com/ekmett/wl-pprint-terminfo/issues/7
wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
# https://github.com/bos/pcap/issues/5
pcap = addExtraLibrary super.pcap pkgs.libpcap;
- # https://github.com/skogsbaer/hscurses/issues/24
- hscurses = markBroken super.hscurses;
-
# https://github.com/qnikst/imagemagick/issues/34
imagemagick = dontCheck super.imagemagick;
@@ -895,9 +772,6 @@ self: super: {
# https://github.com/k0ral/hbro-contrib/issues/1
hbro-contrib = dontDistribute super.hbro-contrib;
- # https://github.com/aka-bash0r/multi-cabal/issues/4
- multi-cabal = markBroken super.multi-cabal;
-
# Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
Elm = markBroken super.Elm;
elm-build-lib = markBroken super.elm-build-lib;
@@ -974,12 +848,6 @@ self: super: {
# https://github.com/bos/configurator/issues/22
configurator = dontCheck super.configurator;
- # https://github.com/thoughtpolice/hs-ed25519/issues/9
- ed25519 = markBroken super.ed25519;
- hackage-repo-tool = dontDistribute super.hackage-repo-tool;
- hackage-security = dontDistribute super.hackage-security;
- hackage-security-HTTP = dontDistribute super.hackage-security-HTTP;
-
# The cabal files for these libraries do not list the required system dependencies.
SDL-image = overrideCabal super.SDL-image (drv: {
librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
@@ -1000,11 +868,8 @@ self: super: {
];
});
- # https://github.com/chrisdone/freenect/pull/11
- freenect = overrideCabal super.freenect (drv: {
- libraryPkgconfigDepends = [ pkgs.freenect ];
- prePatch = '' echo " Pkgconfig-Depends: libfreenect" >> freenect.cabal '';
- });
+ # Old versions don't detect this library reliably.
+ freenect = appendConfigureFlag super.freenect "--extra-include-dirs=${pkgs.freenect}/include/libfreenect --extra-lib-dirs=${pkgs.freenect}/lib";
# https://github.com/ivanperez-keera/hcwiid/pull/4
hcwiid = overrideCabal super.hcwiid (drv: {
@@ -1020,13 +885,52 @@ self: super: {
# https://github.com/basvandijk/concurrent-extra/issues/12
concurrent-extra = dontCheck super.concurrent-extra;
- # https://github.com/GaloisInc/DSA/issues/1
- DSA = dontCheck super.DSA;
-
# https://github.com/bos/bloomfilter/issues/7
bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
# https://github.com/pxqr/base32-bytestring/issues/4
base32-bytestring = dontCheck super.base32-bytestring;
+ # https://github.com/JohnLato/listlike/pull/6#issuecomment-137986095
+ ListLike = dontCheck super.ListLike;
+
+ # https://github.com/goldfirere/singletons/issues/122
+ singletons = dontCheck super.singletons;
+
+ # cabal2nix doesn't pick up some of the dependencies.
+ ginsu = let
+ g = addBuildDepend super.ginsu pkgs.perl;
+ g' = overrideCabal g (drv: {
+ executableSystemDepends = (drv.executableSystemDepends or []) ++ [
+ pkgs.ncurses
+ ];
+ });
+ in g';
+
+ # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
+ hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
+ hpc-coveralls_0_9_0 = disableSharedExecutables super.hpc-coveralls_0_9_0;
+
+ # Test suite won't compile.
+ semigroupoids_5_0_0_3 = dontCheck super.semigroupoids_5_0_0_3;
+
+ # This is fixed in newer versions.
+ zip-archive_0_2_3_5 = addBuildTool super.zip-archive_0_2_3_5 pkgs.zip;
+
+ # https://github.com/fpco/stackage/issues/838
+ cryptonite = dontCheck super.cryptonite;
+ cryptonite_0_6 = dontCheck super.cryptonite_0_6 ;
+
+ # https://github.com/fpco/stackage/issues/843
+ hmatrix-gsl-stats_0_4_1 = overrideCabal super.hmatrix-gsl-stats_0_4_1 (drv: {
+ postUnpack = "rm */Setup.lhs";
+ });
+
+ # We cannot build this package w/o the C library from .
+ phash = markBroken super.phash;
+
+ # https://github.com/yesodweb/serversession/issues/2
+ # https://github.com/haskell/cabal/issues/2661
+ serversession-backend-acid-state_1_0_1 = dontCheck super.serversession-backend-acid-state_1_0_1;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 28092f8d886f..c685f3103931 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -41,7 +41,7 @@ self: super: {
# Cabal_1_22_1_1 requires filepath >=1 && <1.4
cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
- # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
+ # Don't compile jailbreak-cabal with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
version = "1.23.0.0";
src = pkgs.fetchFromGitHub {
@@ -54,24 +54,21 @@ self: super: {
doHaddock = false;
postUnpack = "sourceRoot+=/Cabal";
});
- jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
- executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
- preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
- });
+ jailbreak-cabal = super.jailbreak-cabal.override {
+ Cabal = self.Cabal_1_23_0_0;
+ mkDerivation = drv: self.mkDerivation (drv // {
+ preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
+ });
+ };
- idris =
- let idris' = overrideCabal super.idris (drv: {
- # "idris" binary cannot find Idris library otherwise while building.
- # After installing it's completely fine though. Seems like Nix-specific
- # issue so not reported.
- preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
- # https://github.com/idris-lang/Idris-dev/issues/2499
- librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
- });
- in idris'.overrideScope (self: super: {
- # https://github.com/idris-lang/Idris-dev/issues/2500
- zlib = self.zlib_0_5_4_2;
- });
+ idris = overrideCabal super.idris (drv: {
+ # "idris" binary cannot find Idris library otherwise while building.
+ # After installing it's completely fine though. Seems like Nix-specific
+ # issue so not reported.
+ preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
+ # https://github.com/idris-lang/Idris-dev/issues/2499
+ librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+ });
Extra = appendPatch super.Extra (pkgs.fetchpatch {
url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
@@ -80,7 +77,7 @@ self: super: {
# haddock: No input file(s).
nats = dontHaddock super.nats;
- bytestring-builder = dontHaddock super.bytestring-builder;
+ bytestring-builder = dontHaddock (triggerRebuild super.bytestring-builder 1);
# We have time 1.5
aeson = disableCabalFlag super.aeson "old-locale";
@@ -178,22 +175,6 @@ self: super: {
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
self.webkitgtk3-javascriptcore ];
- # https://github.com/cartazio/arithmoi/issues/1
- arithmoi = markBroken super.arithmoi;
- NTRU = dontDistribute super.NTRU;
- arith-encode = dontDistribute super.arith-encode;
- barchart = dontDistribute super.barchart;
- constructible = dontDistribute super.constructible;
- cyclotomic = dontDistribute super.cyclotomic;
- diagrams = dontDistribute super.diagrams;
- diagrams-contrib = dontDistribute super.diagrams-contrib;
- enumeration = dontDistribute super.enumeration;
- ghci-diagrams = dontDistribute super.ghci-diagrams;
- ihaskell-diagrams = dontDistribute super.ihaskell-diagrams;
- nimber = dontDistribute super.nimber;
- pell = dontDistribute super.pell;
- quadratic-irrational = dontDistribute super.quadratic-irrational;
-
# https://github.com/lymar/hastache/issues/47
hastache = dontCheck super.hastache;
@@ -209,52 +190,12 @@ self: super: {
# http://hub.darcs.net/ivanm/graphviz/issue/5
graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch));
- # Broken with GHC 7.10.x.
- aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
- Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
- cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
- containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
- control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
- haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
- QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;
- seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
- vector_0_10_9_2 = markBroken super.vector_0_10_9_2;
- hoopl_3_10_2_0 = markBroken super.hoopl_3_10_2_0;
-
# https://github.com/HugoDaniel/RFC3339/issues/14
timerep = dontCheck super.timerep;
- # Upstream has no issue tracker.
- llvm-base-types = markBroken super.llvm-base-types;
- llvm-analysis = dontDistribute super.llvm-analysis;
- llvm-data-interop = dontDistribute super.llvm-data-interop;
- llvm-tools = dontDistribute super.llvm-tools;
-
- # Upstream has no issue tracker.
- MaybeT = markBroken super.MaybeT;
- grammar-combinators = dontDistribute super.grammar-combinators;
-
# Required to fix version 0.91.0.0.
wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");
- # Upstream has no issue tracker.
- Graphalyze = markBroken super.Graphalyze;
- gbu = dontDistribute super.gbu;
- SourceGraph = dontDistribute super.SourceGraph;
-
- # Upstream has no issue tracker.
- markBroken = super.protocol-buffers;
- caffegraph = dontDistribute super.caffegraph;
-
- # Deprecated: https://github.com/mikeizbicki/ConstraintKinds/issues/8
- ConstraintKinds = markBroken super.ConstraintKinds;
- HLearn-approximation = dontDistribute super.HLearn-approximation;
- HLearn-distributions = dontDistribute super.HLearn-distributions;
- HLearn-classification = dontDistribute super.HLearn-classification;
-
- # Doesn't work with LLVM 3.5.
- llvm-general = markBroken super.llvm-general;
-
# Inexplicable haddock failure
# https://github.com/gregwebs/aeson-applicative/issues/2
aeson-applicative = dontHaddock super.aeson-applicative;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 3579c697adac..e5f5d3c953a9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -121,10 +121,6 @@ self: super: {
# needs mtl-compat to build with mtl 2.1.x
cgi = addBuildDepend super.cgi self.mtl-compat;
- # Newer versions always trigger the non-deterministic library ID bug
- # and are virtually impossible to compile on Hydra.
- conduit = super.conduit_1_2_4_1;
-
# https://github.com/magthe/sandi/issues/7
sandi = overrideCabal super.sandi (drv: {
postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
@@ -133,4 +129,13 @@ self: super: {
# Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable.
ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; };
+ # The network library is required in configurations that don't have network-uri.
+ hxt = addBuildDepend super.hxt self.network;
+ hxt_9_3_1_7 = addBuildDepend super.hxt_9_3_1_7 self.network;
+ hxt_9_3_1_10 = addBuildDepend super.hxt_9_3_1_10 self.network;
+ hxt_9_3_1_12 = addBuildDepend super.hxt_9_3_1_12 self.network;
+ xss-sanitize = addBuildDepend super.xss-sanitize self.network;
+ xss-sanitize_0_3_5_4 = addBuildDepend super.xss-sanitize_0_3_5_4 self.network;
+ xss-sanitize_0_3_5_5 = addBuildDepend super.xss-sanitize_0_3_5_5 self.network;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index bec8fabae201..3a689105c1c1 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -7,7 +7,7 @@ self: super: {
# LLVM is not supported on this GHC; use the latest one.
inherit (pkgs) llvmPackages;
- inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy;
+ inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools;
# Many packages fail with:
# haddock: internal error: expectJust getPackageDetails
@@ -70,12 +70,6 @@ self: super: {
configureFlags = [];
});
- dependent-map = overrideCabal super.dependent-map (drv: {
- preConfigure = ''
- sed -i 's/^.*trust base.*$//' *.cabal
- '';
- });
-
profunctors = overrideCabal super.profunctors (drv: {
preConfigure = ''
sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
new file mode 100644
index 000000000000..1c9ec4997172
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -0,0 +1,3626 @@
+# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+
+compiler: ghc-7.10
+
+core-packages:
+ - array-0.5.1.0
+ - base-4.8.1.0
+ - binary-0.7.5.0
+ - bin-package-db-0.0.0.0
+ - bytestring-0.10.6.0
+ - Cabal-1.22.4.0
+ - containers-0.5.6.2
+ - deepseq-1.4.1.1
+ - directory-1.2.2.0
+ - filepath-1.4.0.0
+ - ghc-7.10.2
+ - ghc-prim-0.4.0.0
+ - haskeline-0.7.2.1
+ - hoopl-3.10.0.2
+ - hpc-0.6.0.2
+ - integer-gmp-1.0.0.0
+ - pretty-1.1.2.0
+ - process-1.2.3.0
+ - rts-1.0
+ - template-haskell-2.10.0.0
+ - terminfo-0.4.0.1
+ - time-1.5.0.1
+ - transformers-0.4.2.0
+ - unix-2.7.1.0
+ - xhtml-3000.2.1
+
+default-package-overrides:
+
+extra-packages:
+ - aeson < 0.8 # newer versions don't work with GHC 6.12.3
+ - Cabal == 1.18.* # required for cabal-install et al on old GHC versions
+ - Cabal == 1.20.* # required for cabal-install et al on old GHC versions
+ - containers < 0.5 # required to build alex with GHC 6.12.3
+ - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x
+ - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
+ - descriptive < 0.1 # required for structured-haskell-mode-1.0.8
+ - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
+ - haddock-api < 2.16 # required on GHC 7.8.x
+ - haskell-src-exts < 1.16 # required for structured-haskell-mode-1.0.8
+ - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
+ - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
+ - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
+ - primitive == 0.5.1.* # required to build alex with GHC 6.12.3
+ - QuickCheck < 2 # required by test-framework-quickcheck and its users
+ - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
+ - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
+ - split < 0.2 # newer versions don't work with GHC 6.12.3
+ - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x
+ - vector < 0.10.10 # newer versions don't work with GHC 6.12.3
+ - zlib <