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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson 2018-01-18 14:17:58 -05:00
commit a18053bdfe
85 changed files with 476 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -21,7 +21,7 @@ let
daemon reads in addition to the the user's authorized_keys file.
You can combine the <literal>keys</literal> and
<literal>keyFiles</literal> options.
Warning: If you are using <literal>NixOps</literal> then don't use this
Warning: If you are using <literal>NixOps</literal> then don't use this
option since it will replace the key required for deployment via ssh.
'';
};
@ -137,6 +137,14 @@ in
'';
};
openFirewall = mkOption {
type = types.bool;
default = true;
description = ''
Whether to automatically open the specified ports in the firewall.
'';
};
listenAddresses = mkOption {
type = with types; listOf (submodule {
options = {
@ -302,7 +310,7 @@ in
};
networking.firewall.allowedTCPPorts = cfg.ports;
networking.firewall.allowedTCPPorts = if cfg.openFirewall then cfg.ports else [];
security.pam.services.sshd =
{ startSession = true;

2
nixos/modules/virtualisation/google-compute-image.nix
View File

@ -212,7 +212,7 @@ in
echo "Obtaining SSH keys..."
mkdir -m 0700 -p /root/.ssh
AUTH_KEYS=$(${mktemp})
${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/project/attributes/sshKeys
${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
if [ -s $AUTH_KEYS ]; then
# Read in key one by one, split in case Google decided

2
pkgs/applications/audio/flac/default.nix
View File

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://xiph.org/flac/;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
platforms = platforms.all;
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
};
}

7
pkgs/applications/audio/gpodder/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3, python3Packages, intltool
, glibcLocales, gnome3, gtk3, wrapGAppsHook
, ipodSupport ? false, libgpod
, ipodSupport ? false, libgpod, gobjectIntrospection
}:
python3Packages.buildPythonApplication rec {
@ -22,14 +22,11 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
intltool
python3Packages.wrapPython
wrapGAppsHook
glibcLocales
];
buildInputs = [
python3
];
buildInputs = [ python3 gobjectIntrospection ];
checkInputs = with python3Packages; [
coverage minimock

2
pkgs/applications/audio/monkeys-audio/default.nix
View File

@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
};
}

2
pkgs/applications/audio/ncmpcpp/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "A featureful ncurses based MPD client inspired by ncmpc";
homepage = https://ncmpcpp.rybczak.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ];
maintainers = with maintainers; [ jfrankenau koral lovek323 ];
platforms = platforms.all;
};
}

34
pkgs/applications/audio/pd-plugins/cyclone/default.nix
View File

@ -1,32 +1,26 @@
{ stdenv, fetchurl, puredata }:
{ stdenv, fetchFromGitHub, puredata }:
stdenv.mkDerivation rec {
name = "cyclone-${version}";
version = "0.1-alpha55";
version = "0.3beta-2";
src = fetchurl {
url = "mirror://sourceforge/project/pure-data/libraries/cyclone/${name}.tar.gz";
sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i";
src = fetchFromGitHub {
owner = "porres";
repo = "pd-cyclone";
rev = "cyclone${version}";
sha256 = "192jrq3bdsv626js1ymq10gwp9wwcszjs63ys6ap9ig8xdkbhr3q";
};
buildInputs = [ puredata ];
hardeningDisable = [ "format" ];
makeFlags = [
"pdincludepath=${puredata}/include/pd"
"prefix=$(out)"
];
patchPhase = ''
for file in `grep -r -l g_canvas.h`
do
sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file
done
for file in `grep -r -l m_imp.h`
do
sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file
done
'';
installPhase = ''
mkdir -p $out/cyclone
cp -r bin/* $out/cyclone
postInstall = ''
mv "$out/lib/pd-externals/cyclone" "$out/"
rm -rf $out/lib
'';
meta = {

22
pkgs/applications/audio/pd-plugins/maxlib/default.nix
View File

@ -1,28 +1,26 @@
{ stdenv, fetchurl, puredata }:
{ stdenv, fetchFromGitHub, puredata }:
stdenv.mkDerivation rec {
name = "maxlib-${version}";
version = "1.5.5";
version = "1.5.7";
src = fetchurl {
url = "mirror://sourceforge/project/pure-data/libraries/maxlib/${name}.tar.gz";
sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w";
src = fetchFromGitHub {
owner = "electrickery";
repo = "pd-maxlib";
rev = "v${version}";
sha256 = "10w9qfgn26lj3zqjksf2r1wsjpf5xy4dx22jay9l6idy9q62mxsn";
};
buildInputs = [ puredata ];
hardeningDisable = [ "format" ];
patchPhase = ''
for i in ${puredata}/include/pd/*; do
ln -s $i .
done
sed -i "s@/usr@$out@g" Makefile
'';
makeFlags = [ "prefix=$(out)" ];
postInstall = ''
mv $out/local/lib/pd-externals/maxlib/ $out
mv $out/lib/pd-externals/maxlib/ $out
rm -rf $out/local/
rm -rf $out/lib/
'';
meta = {

26
pkgs/applications/audio/pd-plugins/timbreid/default.nix
View File

@ -1,30 +1,40 @@
{ stdenv, fetchurl, unzip, puredata }:
{ stdenv, fetchurl, unzip, puredata, fftw }:
stdenv.mkDerivation rec {
version = "0.6.0";
version = "0.7.0";
name = "timbreid-${version}";
src = fetchurl {
url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip";
sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p";
sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
};
buildInputs = [ unzip puredata ];
buildInputs = [ unzip puredata fftw ];
unpackPhase = ''
mkdir source
cd source
unzip $src
mv timbreID-0.6.0-src/tID/* .
rm -rf timbreID-0.6.0-src/tID/
rm -rf timbreID-0.6.0-src/INSTALL.txt
'';
buildPhase = ''
make tIDLib.o all
'';
installPhase = ''
mkdir -p $out/
cp -r *.pd $out/
cp -r *.pd_linux $out/
cp -r *.wav $out/
cp -r audio/ $out/
cp -r data/ $out/
cp -r doc/ $out/
'';
postFixup = ''
mv $out/share/doc/ $out/
rm -rf $out/share/
'';
meta = {
description = "A collection of audio feature analysis externals for puredata";
homepage = http://williambrent.conflations.com/pages/research.html;

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

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

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

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
};
}

2
pkgs/applications/misc/pstree/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Show the set of running processes as a tree";
license = "GPL";
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/applications/misc/redshift/default.nix
View File

@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
homepage = http://jonls.dk/redshift;
platforms = platforms.linux;
maintainers = with maintainers; [ mornfall yegortimoshenko ];
maintainers = with maintainers; [ yegortimoshenko ];
};
}

2
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -65,7 +65,7 @@ stdenv.mkDerivation (rec {
inherit description;
homepage = http://software.schmorp.de/pkg/rxvt-unicode.html;
downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
platforms = platforms.unix;
};
})

7
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -29,12 +29,13 @@ let
in python3Packages.buildPythonApplication rec {
name = "qutebrowser-${version}${versionPostfix}";
namePrefix = "";
version = "1.0.4";
version = "1.1.0";
versionPostfix = "";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
sha256 = "0z8zrgr914bfmimqk3l17dxyc7gzh42sw8lfp041zzvj6fxw3lkr";
sha256 = "1w02z5akr1v2517rbqrnv65vfsqvgw310g2nhanbwdg606crzr94";
};
# Needs tox
@ -79,6 +80,8 @@ in python3Packages.buildPythonApplication rec {
install -Dm644 icons/qutebrowser.svg \
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
install -Dm755 -t "$out/share/qutebrowser/scripts/" \
scripts/{importer.py,dictcli.py,keytester.py,open_url_in_instance.sh,utils.py}
'';
postFixup = lib.optionalString (! withWebEngineDefault) ''

4
pkgs/applications/networking/browsers/vimb/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "vimb-${version}";
version = "2.11";
version = "3.1.0";
src = fetchurl {
url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f";
sha256 = "1gws028c2v1zh6r142hmjvi2m447lwqqh65m6z3dzcar2yw35z3f";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://w3m.sourceforge.net/;
description = "A text-mode web browser";
maintainers = [ maintainers.mornfall maintainers.cstrahan ];
maintainers = [ maintainers.cstrahan ];
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/applications/science/logic/stp/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Simple Theorem Prover";
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.mit;
};

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "weka-${version}";
version = "3.8.1";
version = "3.8.2";
src = fetchurl {
url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
sha256 = "16n1a74d1cispp0a22zyiivi78izi354y67gmbyvv2lv9sc45wmk";
sha256 = "0p353lhhcv3swwn1bl64vkyjk480vv9ghhlyqjxiar4p3xifjayb";
};
buildInputs = [ unzip ];

2
pkgs/applications/video/quvi/library.nix
View File

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = http://quvi.sf.net;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
};
}

2
pkgs/applications/video/quvi/scripts.nix
View File

@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://quvi.sf.net;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
};
}

2
pkgs/applications/video/quvi/tool.nix
View File

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://quvi.sf.net;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
};
}

10
pkgs/build-support/fetchpatch/default.nix
View File

@ -5,7 +5,7 @@
# stripLen acts as the -p parameter when applying a patch.
{ lib, fetchurl, patchutils }:
{ stripLen ? 0, addPrefixes ? false, excludes ? [], ... }@args:
{ stripLen ? 0, extraPrefix ? null, excludes ? [], ... }@args:
fetchurl ({
postFetch = ''
@ -16,9 +16,9 @@ fetchurl ({
"${patchutils}/bin/filterdiff" \
--include={} \
--strip=${toString stripLen} \
${lib.optionalString addPrefixes ''
--addoldprefix=a/ \
--addnewprefix=b/ \
${lib.optionalString (extraPrefix != null) ''
--addoldprefix=a/${extraPrefix} \
--addnewprefix=b/${extraPrefix} \
''} \
--clean "$out" > "$tmpfile"
${patchutils}/bin/filterdiff \
@ -27,4 +27,4 @@ fetchurl ({
"$tmpfile" > "$out"
${args.postFetch or ""}
'';
} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes" "postFetch"])
} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "postFetch"])

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/5e87c40f2cd96bd5dd953758e82f302107c7895e.tar.gz";
sha256 = "0hjkddda9mdm21nb9bkhr9n5r9jllisif1qmzha91a9cps5w1mx5";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/00012ce23948b9547fe6609d595109741e0f58cf.tar.gz";
sha256 = "1swgfx7b41jxq0pyws2wipdiyvy8nn6cp54yj3ip3r9l3gdv3f7b";
}

4
pkgs/development/beam-modules/default.nix
View File

@ -42,9 +42,9 @@ let
buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages.
elixir = elixir_1_5;
elixir = elixir_1_6;
elixir_1_6_rc = lib.callElixir ../interpreters/elixir/1.6.nix {
elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
inherit rebar erlang;
debugInfo = true;
};

20
pkgs/development/compilers/openjdk/8.nix
View File

@ -21,42 +21,42 @@ let
else
throw "openjdk requires i686-linux or x86_64 linux";
update = "162";
build = "12";
update = "172";
build = "02";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "1c8miw4zw5l4mwjpi386knz91lzj3kv74jgpnm1znyxf9grmblbs";
sha256 = "0y28by4ifsaxhfrzq35654i8h9jjgvrw51hbxyg8pgfink0n30r2";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "1v19fsa3f84ng0inpi91iwnsn4zrhi9agh5gwzjnqg8ir7fy3nmh";
sha256 = "0rxp4920xpd9khdg2ia1v1djcw1nndsjfis68whawi7s95zwpxy5";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "1x4acvmyiq9shnnhzrzljd0x5c5x3iv2w9q6wagavqdpkqgfs54n";
sha256 = "0sdf6rww290wgfqhaix1vjac244drdgg7hapb67wgj733kkdl711";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "125z4kvw9i535zvcs22pqviw46a64vli06rr92gg1zvvxz9lfmyl";
sha256 = "0vl3aryw3nclqprc35b2iriwfyr9fch3x8snjry1z5ajbdyd5c8b";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "03g4mffd7bj50c2034885x69kbn6s29h9qwbmhbligfmz08zq28q";
sha256 = "1y5fnzxdll3q0jgqxsap3xb21bm1napdlqzs7h6c2l5qldyvw692";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "1pkd4mn3awjn0rdqdkwap96xl6ifz07ds14r1hd0fj7571h30xn5";
sha256 = "1yg1ik1klg8pl4b7izi2waqhs7vr6ln3fzc4k1siir4va5qhrhlm";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "1m0nivgnywmpq5xc3rcaihk0xd6p6fm5y6y8cs3dg4lra722np64";
sha256 = "03srcj6hhvbdg1iqw85mfm1pwd6yvpykyz5nn4ydf930g4dyxfkf";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "15l2xg8pv1m632gy57bhh2if2k9v32jag76y9dg0acn3f1w9va5q";
sha256 = "12nn02jiq3vqgwhqh5yvxq1k92fy3n0jpvfpj1npq9fvimywry2k";
};
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -875,6 +875,7 @@ self: super: {
cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
cryptohash-md5 = doJailbreak super.cryptohash-md5;
text-short = doJailbreak super.text-short;
gitHUD = dontCheck super.gitHUD;
# https://github.com/aisamanra/config-ini/issues/12
config-ini = dontCheck super.config-ini;
@ -941,4 +942,8 @@ self: super: {
# Sporadically OOMs even with 16G
ChasingBottoms = dontCheck super.ChasingBottoms;
# Add support for https://github.com/haskell-hvr/multi-ghc-travis.
multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; };
}

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2703,6 +2703,7 @@ extra-packages:
- 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
- ShellCheck == 0.4.6 # required by multi-ghc-travis
- 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
- transformers == 0.4.3.* # the latest version isn't supported by mtl yet

26
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -16327,6 +16327,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ShellCheck_0_4_6" = callPackage
({ mkDerivation, base, containers, directory, json, mtl, parsec
, process, QuickCheck, regex-tdfa
}:
mkDerivation {
pname = "ShellCheck";
version = "0.4.6";
sha256 = "1g5ihsma3zgb7q89n2j4772f504nnhfn065xdz6bqgrnjhkrpsqi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers directory json mtl parsec process QuickCheck
regex-tdfa
];
executableHaskellDepends = [
base containers directory json mtl parsec QuickCheck regex-tdfa
];
testHaskellDepends = [
base containers directory json mtl parsec QuickCheck regex-tdfa
];
homepage = "http://www.shellcheck.net/";
description = "Shell script analysis tool";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ShellCheck" = callPackage
({ mkDerivation, base, containers, directory, json, mtl, parsec
, process, QuickCheck, regex-tdfa

12
pkgs/development/haskell-modules/hie-packages.nix
View File

@ -219,7 +219,7 @@ in
, ghc-mod-core, gitrev, haskell-lsp, hie-apply-refact, hie-base
, hie-brittany, hie-build-plugin, hie-eg-plugin-async
, hie-example-plugin2, hie-ghc-mod, hie-ghc-tree, hie-haddock
, hie-hare, hie-hoogle, hie-plugin-api, hoogle, hslogger, hspec
, hie-hare, hie-hoogle, hie-plugin-api, hoogle, hoogleLocal, hslogger, hspec
, lens, mtl, optparse-simple, QuickCheck, quickcheck-instances
, sorted-list, stm, text, time, transformers
, unordered-containers, vector, vinyl, yaml, yi-rope
@ -253,14 +253,20 @@ in
quickcheck-instances stm text transformers unordered-containers
vector vinyl yaml
];
preCheck = "export HOME=$NIX_BUILD_TOP/home; mkdir $HOME";
preCheck =
''
export HOME=$NIX_BUILD_TOP/home
mkdir -p $HOME/.hoogle
ln -sv ${hoogleLocal}/share/doc/hoogle/default.hoo $HOME/.hoogle/default-haskell-${hoogle.version}.hoo
'';
# https://github.com/haskell/haskell-ide-engine/issues/425
# The disabled tests do work in a local nix-shell with cabal available.
patches = [ ./patches/hie-testsuite.patch ];
homepage = "http://github.com/githubuser/haskell-ide-engine#readme";
description = "Provide a common engine to power any Haskell IDE";
license = stdenv.lib.licenses.bsd3;
}) { inherit hoogle; };
}) { inherit hoogle; hoogleLocal = (self.hoogleLocal {}).override { inherit hoogle; }; };
hie-apply-refact = callPackage
({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod
, ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint

4
pkgs/development/interpreters/elixir/1.6.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.6.0-rc.1";
sha256 = "06g6n9qvv57xa07fyaqhki2y8zw24m3smcjiw1wiw9pzl5a76iby";
version = "1.6.0";
sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx";
minimumOTPVersion = "18";
}

2
pkgs/development/interpreters/lua-5/sockets.nix
View File

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://w3.impa.br/~diego/software/luasocket/;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
};
}

15
pkgs/development/interpreters/python/pypy/2.7/default.nix
View File

@ -10,7 +10,7 @@
assert zlibSupport -> zlib != null;
let
majorVersion = "5.9";
majorVersion = "5.10";
minorVersion = "0";
minorVersionSuffix = "";
pythonVersion = "2.7";
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
sha256 = "1q3kcnniyvnca1l7x10mbhp4xwjr03ajh2h8j6cbdllci38zdjy1";
sha256 = "10j1s6r6iv80nvpi6gv8w05v505h2ndj9xx31yz7d50ab04dfg23";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
@ -79,17 +79,6 @@ in stdenv.mkDerivation rec {
setupHook = python-setup-hook sitePackages;
postBuild = ''
pushd ./lib_pypy
../pypy-c ./_audioop_build.py
../pypy-c ./_curses_build.py
../pypy-c ./_pwdgrp_build.py
../pypy-c ./_sqlite3_build.py
../pypy-c ./_syslog_build.py
../pypy-c ./_tkinter/tklib_build.py
popd
'';
doCheck = true;
checkPhase = ''
export TERMINFO="${ncurses.out}/share/terminfo/";

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
name = "libmpc-${version}"; # to avoid clash with the MPD client
src = fetchurl {
url = "http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz";
url = "https://ftp.gnu.org/gnu/mpc/mpc-${version}.tar.gz";
sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1";
};

4
pkgs/development/libraries/libstdc++5/default.nix
View File

@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
name = "siginfo.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/siginfo.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa";
sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j";
addPrefixes = true;
extraPrefix = "";
})
(fetchpatch {
name = "gcc-3.4.3-no_multilib_amd64.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/gcc-3.4.3-no_multilib_amd64.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa";
sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm";
addPrefixes = true;
extraPrefix = "";
})
# Required because of glibc 2.26
./struct-ucontext.patch

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

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://www.openldap.org/;
description = "An open source implementation of the Lightweight Directory Access Protocol";
maintainers = with maintainers; [ lovek323 mornfall ];
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
}

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

@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
homepage = http://www.open-mpi.org/;
description = "Open source MPI-2 implementation";
longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
platforms = platforms.unix;
};
}

6
pkgs/development/libraries/pcre2/default.nix
View File

@ -20,21 +20,21 @@ stdenv.mkDerivation rec {
url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date";
sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr";
stripLen = 2;
addPrefixes = true;
extraPrefix = "";
})
(fetchpatch {
name = "CVE-2017-7186-part2.patch";
url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date";
sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn";
stripLen = 2;
addPrefixes = true;
extraPrefix = "";
})
(fetchpatch {
name = "CVE-2017-8786.patch";
url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch";
sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b";
stripLen = 2;
addPrefixes = true;
extraPrefix = "";
})
];

54
pkgs/development/libraries/physfs/default.nix
View File

@ -1,23 +1,41 @@
{stdenv, fetchurl, cmake}:
{ stdenv, fetchurl, cmake, doxygen
, zlib }:
stdenv.mkDerivation rec {
name = "physfs-2.0.3";
let
generic = version: sha256:
stdenv.mkDerivation rec {
name = "physfs-${version}";
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.bz2";
sha256 = "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.bz2";
inherit sha256;
};
nativeBuildInputs = [ cmake doxygen ];
buildInputs = [ zlib ];
enableParallelBuilding = true;
patchPhase = ''
sed s,-Werror,, -i CMakeLists.txt
'';
doInstallCheck = true;
installCheckPhase = ''
./test_physfs --version
'';
meta = with stdenv.lib; {
homepage = http://icculus.org/physfs/;
description = "Library to provide abstract access to various archives";
license = licenses.free;
platforms = platforms.linux;
};
};
nativeBuildInputs = [ cmake ];
patchPhase = ''
sed s,-Werror,, -i CMakeLists.txt
'';
meta = {
homepage = http://icculus.org/physfs/;
description = "Library to provide abstract access to various archives";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux;
};
in {
physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
physfs = generic "3.0.1" "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp";
}

4
pkgs/development/libraries/webkitgtk/2.18.nix
View File

@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.18.4";
version = "2.18.5";
meta = {
description = "Web content rendering engine, GTK+ port";
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "1f1j0r996l20cgkvbwpizn7d4yp58cy334b1pvn4kfb5c2dbpdl7";
sha256 = "1f1rsp14gkb2r1mrrxn2cnbs45vg38da27q4cf02zlxmgv680v8c";
};
# see if we can clean this up....

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

@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Subclass of the rpkg project for dealing with rpm packaging";
homepage = https://pagure.io/fedpkg;
license = licenses.gpl2;
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
};
}

25
pkgs/development/python-modules/fritzconnection/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi, lxml, requests, tkinter }:
buildPythonPackage rec {
pname = "fritzconnection";
version = "0.6.5";
src = fetchPypi {
inherit pname version;
sha256 = "14g3sxprq65lxbgkf3rjgb1bjqnj2jc5p1swlq9sk9gwnl6ca3ds";
};
prePatch = ''
substituteInPlace fritzconnection/test.py \
--replace "from fritzconnection import" "from .fritzconnection import"
'';
propagatedBuildInputs = [ lxml requests tkinter ];
meta = with stdenv.lib; {
description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol";
homepage = https://bitbucket.org/kbr/fritzconnection;
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

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

@ -12,6 +12,6 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Kitchen contains a cornucopia of useful code";
license = licenses.lgpl2;
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
};
}

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

@ -25,7 +25,7 @@ buildPythonPackage rec {
'';
meta = {
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/python-modules/netdisco/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "netdisco";
version = "1.2.3";
version = "1.2.4";
disabled = !isPy3k;
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "home-assistant";
repo = pname;
rev = version;
sha256 = "137p7qlv85mva96v6kav8xxca7i09k4giayag4cglrgjd7q3lk1r";
sha256 = "170s9py8rw07cfgwvv7mf69g8jjg32m2rgw8x3kbvjqlmrdijxmm";
};
propagatedBuildInputs = [ requests zeroconf netifaces ];

10
pkgs/development/python-modules/platformio/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
, arrow, bottle, click_5, colorama
, bottle, click_5, colorama
, lockfile, pyserial, requests
, semantic-version
, isPy3k, isPyPy
@ -8,17 +8,17 @@ buildPythonPackage rec {
disabled = isPy3k || isPyPy;
pname = "platformio";
version="3.5.0";
version="3.5.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "0gy13cwp0i97lgjd8hh8kh9cswxh53x4cx2sq5b7d7vv8kd7bh6c";
sha256 = "0cc15mzh7p1iykip0jpxldz81yz946vrgvhwmfl8w3z5kgjjgx3n";
};
propagatedBuildInputs = [
arrow bottle click_5 colorama
lockfile pyserial requests semantic-version
bottle click_5 colorama lockfile
pyserial requests semantic-version
];
patches = [ ./fix-searchpath.patch ];

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

@ -18,6 +18,6 @@ buildPythonPackage rec {
description = "Python Fedora Module";
homepage = https://github.com/fedora-infra/python-fedora;
license = licenses.lgpl2;
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
};
}

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

@ -22,7 +22,7 @@ buildPythonPackage rec {
description = "Python library for dealing with rpm packaging";
homepage = https://pagure.io/fedpkg;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/tools/analysis/lcov/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = http://ltp.sourceforge.net/coverage/lcov.php;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with maintainers; [ dezgeg mornfall ];
maintainers = with maintainers; [ dezgeg ];
platforms = platforms.all;
};
}

2
pkgs/development/tools/analysis/spin/default.nix
View File

@ -35,6 +35,6 @@ in stdenv.mkDerivation rec {
homepage = http://spinroot.com/;
license = licenses.free;
platforms = platforms.linux;
maintainers = with maintainers; [ mornfall pSub ];
maintainers = with maintainers; [ pSub ];
};
}

2
pkgs/development/tools/build-managers/bazel/0.4.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
sourceRoot = ".";
patches = lib.optional enableNixHacks ./nix-hacks.patch;
patches = lib.optional enableNixHacks ./nix-hacks-0.4.patch;
postPatch = ''
for f in $(grep -l -r '/bin/bash'); do

51
pkgs/development/tools/build-managers/bazel/nix-hacks-0.4.patch Normal file
View File

@ -0,0 +1,51 @@
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
index eafa09fb5..d2d5e40e8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
markerData.put(key, value);
}
}
- boolean result = false;
- if (markerRuleKey.equals(ruleKey)) {
- result = handler.verifyMarkerData(rule, markerData, env);
- if (env.valuesMissing()) {
- return null;
- }
- }
- if (result) {
- return new Fingerprint().addString(content).digestAndReset();
- } else {
- // So that we are in a consistent state if something happens while fetching the repository
- markerPath.delete();
- return null;
- }
+ return new Fingerprint().addString(content).digestAndReset();
} catch (IOException e) {
throw new RepositoryFunctionException(e, Transience.TRANSIENT);
diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
index a7ebc8f7a..40f2049fa 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
ProcessBuilder builder = new ProcessBuilder();
builder.command(params.getArgv());
if (params.getEnv() != null) {
- builder.environment().clear();
builder.environment().putAll(params.getEnv());
}
diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
index 0268d1b2b..637364657 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
@@ -77,7 +77,6 @@ class Worker {
new ProcessBuilder(command)
.directory(workDir.getPathFile())
.redirectError(Redirect.appendTo(logFile.getPathFile()));
- processBuilder.environment().clear();
processBuilder.environment().putAll(workerKey.getEnv());
this.process = processBuilder.start();

30
pkgs/development/tools/build-managers/bazel/nix-hacks.patch
View File

@ -1,8 +1,7 @@
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
index eafa09fb5..d2d5e40e8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
@@ -287,21 +287,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
diff -Naur a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 1980-01-01 00:00:00.000000000 -0500
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java 2018-01-18 08:17:22.420459162 -0500
@@ -287,21 +287,8 @@
markerData.put(key, value);
}
}
@ -25,11 +24,10 @@ index eafa09fb5..d2d5e40e8 100644
} catch (IOException e) {
throw new RepositoryFunctionException(e, Transience.TRANSIENT);
diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
index a7ebc8f7a..40f2049fa 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
@@ -129,7 +129,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
diff -Naur a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 1980-01-01 00:00:00.000000000 -0500
+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java 2018-01-18 08:17:53.274877980 -0500
@@ -129,7 +129,6 @@
ProcessBuilder builder = new ProcessBuilder();
builder.command(params.getArgv());
if (params.getEnv() != null) {
@ -37,15 +35,3 @@ index a7ebc8f7a..40f2049fa 100644
builder.environment().putAll(params.getEnv());
}
diff --git a/src/main/java/com/google/devtools/build/lib/worker/Worker.java b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
index 0268d1b2b..637364657 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/Worker.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/Worker.java
@@ -77,7 +77,6 @@ class Worker {
new ProcessBuilder(command)
.directory(workDir.getPathFile())
.redirectError(Redirect.appendTo(logFile.getPathFile()));
- processBuilder.environment().clear();
processBuilder.environment().putAll(workerKey.getEnv());
this.process = processBuilder.start();

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

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

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

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

6
pkgs/development/tools/build-managers/leiningen/default.nix
View File

@ -3,18 +3,18 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.7.1";
version = "2.8.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "0rmshl4xchf3blwvar4q9dpxm9xznn3yzas4vwxqiq3yhapgqkn0";
sha256 = "0wk4m7m66xxx7i3nis08mc8qna7acgcmpim562vdyyrpbxdhj24i";
};
jarsrc = fetchurl {
# NOTE: This is actually a .jar, Github has issues
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
sha256 = "0ivwb1qlxs1hyical0fjgavm9wfkw3f10sk67p5g2p5lpf4pxp1d";
sha256 = "0n3wkb0a9g25r1xq93lskay2lw210qymz2qakjnl5vr5zz3vnjgw";
};
JARNAME = "${name}-standalone.jar";

47
pkgs/development/tools/haskell/multi-ghc-travis/default.nix
View File

@ -1,29 +1,28 @@
{ stdenv, ghc, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "multi-ghc-travis-${version}";
version = "20170728-git";
buildInputs = [ ghc ];
{ mkDerivation, base, bytestring, Cabal, containers, deepseq, Diff
, directory, filepath, ShellCheck, stdenv, tasty, tasty-golden
, transformers, fetchFromGitHub
}:
mkDerivation {
pname = "make-travis-yml";
version = "0";
src = fetchFromGitHub {
owner = "hvr";
repo = "multi-ghc-travis";
rev = "437739986fc81ca8c010e5d889348ba74171e680";
sha256 = "05fbc7ab9c25k19xj0iax72gv62l89dw2m4bci7h76y9hcajs5v4";
};
installPhase = ''
mkdir -p $out/bin
ghc -O --make make_travis_yml.hs -o $out/bin/make-travis-yml
ghc -O --make make_travis_yml_2.hs -o $out/bin/make-travis-yml-2
'';
meta = with stdenv.lib; {
description = "Generate .travis.yml for multiple ghc versions";
homepage = https://github.com/hvr/multi-ghc-travis;
license = licenses.bsd3;
platforms = ghc.meta.platforms;
maintainers = with maintainers; [ jb55 peti ];
rev = "0d1b4089f6829659149747c9551712d24fd0b124";
sha256 = "00dbg8hbncv74c2baskyhg4h0yv8wrz0fnkvw2bzcn0cjrz7xqwr";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base Cabal containers deepseq directory filepath ShellCheck
transformers
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
base bytestring Diff directory filepath tasty tasty-golden
transformers
];
homepage = "https://github.com/hvr/multi-ghc-travis";
description = "Script generator for Travis-CI";
license = stdenv.lib.licenses.bsd3;
}

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

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
socket (IPv6/IPv4/UNIX local), or partition (by opening a file
from it).
'';
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}

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

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
description = "A system call tracer for Linux";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ mornfall jgeerds globin ];
maintainers = with maintainers; [ jgeerds globin ];
};
}

5
pkgs/development/tools/wp-cli/default.nix
View File

@ -26,7 +26,7 @@ let
ini = writeText "wp-cli.ini" ''
[PHP]
memory_limit = 512M ; composer can be a bit of a memory pig
memory_limit = -1 ; composer uses a lot of memory
[Phar]
phar.readonly = Off
@ -40,6 +40,9 @@ in stdenv.mkDerivation rec {
ln -s ${bin} $out/bin/wp
install -Dm644 ${completion} $out/share/bash-completion/completions/wp
# this is a very basic run test
$out/bin/wp --info
'';
meta = with stdenv.lib; {

24
pkgs/games/d1x-rebirth/default.nix
View File

@ -1,24 +0,0 @@
{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }:
stdenv.mkDerivation rec {
name = "d1x-rebirth-0.58.1";
src = fetchurl {
url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz";
sha256 = "13p3nfqaa78h6bl0k8mdsn90ai99wbqaj6qlsjsgsn8imficivsv";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ scons SDL mesa physfs SDL_mixer ];
installPhase = ''
scons prefix=$out install
'';
meta = {
homepage = http://www.dxx-rebirth.com/;
description = "Source Port of the Descent 1 engine";
license = stdenv.lib.licenses.unfree;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

24
pkgs/games/d2x-rebirth/default.nix
View File

@ -1,24 +0,0 @@
{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }:
stdenv.mkDerivation rec {
name = "d2x-rebirth-0.58.1";
src = fetchurl {
url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz";
sha256 = "08mg831afc1v068c0ds70lhmxk8a54494jls7s9hwf02ffhv3sx8";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ scons SDL mesa physfs SDL_mixer ];
installPhase = ''
scons prefix=$out install
'';
meta = {
homepage = http://www.dxx-rebirth.com/;
description = "Source Port of the Descent 2 engine";
license = stdenv.lib.licenses.unfree;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

43
pkgs/games/dxx-rebirth/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchurl, scons, pkgconfig
, SDL, SDL_mixer, mesa, physfs
}:
let
music = fetchurl {
url = "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa";
sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc";
};
in stdenv.mkDerivation rec {
name = "dxx-rebirth-${version}";
version = "0.59.100";
src = fetchurl {
url = "http://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz";
sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka";
};
nativeBuildInputs = [ pkgconfig scons ];
buildInputs = [ mesa physfs SDL SDL_mixer ];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
scons prefix=$out install
install -Dm644 ${music} $out/share/games/dxx-rebirth/d2xr-sc55-music.dxa
install -Dm644 -t $out/share/doc/dxx-rebirth *.txt
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Source Port of the Descent 1 and 2 engines";
homepage = http://www.dxx-rebirth.com/;
license = licenses.free;
maintainers = with maintainers; [ viric ];
platforms = with platforms; linux;
};
}

54
pkgs/games/lincity/ng.nix
View File

@ -1,41 +1,55 @@
{stdenv, fetchgit
, zlib, jam, pkgconfig, gettext, libxml2, libxslt, xproto, libX11, mesa, SDL
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs, autoconf, automake, libtool
{ stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig
, zlib, libxml2, libxslt, xproto, libX11, mesa, SDL
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
}:
stdenv.mkDerivation rec {
name = "lincity-ng-${version}";
version = "2.9beta.20170715";
src = fetchgit {
url = "https://github.com/lincity-ng/lincity-ng";
rev = "0c19714b811225238f310633e59f428934185e6b";
src = fetchFromGitHub {
owner = "lincity-ng";
repo = "lincity-ng";
rev = "0c19714b811225238f310633e59f428934185e6b";
sha256 = "1gaj9fq97zmb0jsdw4rzrw34pimkmkwbfqps0glpqij4w3srz5f3";
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [
jam autoconf automake libtool pkgconfig
autoreconfHook jam pkgconfig
];
buildInputs = [
zlib gettext libxml2 libxslt xproto libX11 mesa SDL SDL_mixer SDL_image
zlib libxml2 libxslt xproto libX11 mesa SDL SDL_mixer SDL_image
SDL_ttf SDL_gfx physfs
];
preConfigure = ''
./autogen.sh
'';
autoreconfPhase = ''
./autogen.sh
'';
installPhase = ''
touch CREDITS
AR='ar r' jam install
'';
buildPhase = ''
runHook preBuild
meta = {
description = ''City building game'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [stdenv.lib.maintainers.raskin];
AR='ar r' jam -j $NIX_BUILD_CORES
runHook postBuild
'';
installPhase = ''
runHook preInstall
touch CREDITS
AR='ar r' jam install
runHook postInstall
'';
meta = with stdenv.lib; {
description = "City building game";
license = licenses.gpl2;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}

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

@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
description = "Free dance and rhythm game for Windows, Mac, and Linux";
platforms = platforms.linux;
license = licenses.mit; # expat version
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
};
}

2
pkgs/os-specific/linux/acpi/default.nix
View File

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = https://sourceforge.net/projects/acpiclient/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
};
}

2
pkgs/os-specific/linux/fuse/default.nix
View File

@ -9,7 +9,7 @@ in {
fuse_2 = mkFuse {
version = "2.9.7";
sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
};
fuse_3 = mkFuse {

23
pkgs/os-specific/linux/kernel/linux-beagleboard.nix
View File

@ -1,10 +1,10 @@
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ubootTools, dtc, ... } @ args:
let
modDirVersion = "4.9.61";
tag = "r76";
modDirVersion = "4.14.12";
tag = "r23";
in
import ./generic.nix (args // rec {
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
version = "${modDirVersion}-ti-${tag}";
inherit modDirVersion;
@ -12,7 +12,7 @@ import ./generic.nix (args // rec {
owner = "beagleboard";
repo = "linux";
rev = "${version}";
sha256 = "0hcz4fwjyic42mrn8qsvzm4jq1g5k51awjj3d2das7k8frjalaby";
sha256 = "07hdv2h12gsgafxsqqr7b0fir10rv9k66riklpjba2cg6x0p2nr4";
};
kernelPatches = args.kernelPatches;
@ -21,5 +21,14 @@ import ./generic.nix (args // rec {
efiBootStub = false;
} // (args.features or {});
extraMeta.hydraPlatforms = [];
} // (args.argsOverride or {}))
extraMeta.hydraPlatforms = [ "armv7l-linux" ];
} // (args.argsOverride or {}))) (oldAttrs: {
# This kernel will run mkuboot.sh.
postPatch = ''
patchShebangs scripts/
'';
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ dtc ubootTools ];
})

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

@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.linux;
license = licenses.bsd3;
maintainers = with maintainers; [ wkennington mornfall ];
maintainers = with maintainers; [ wkennington ];
};
}

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

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
description = "Dict protocol server and client";
homepage = http://www.dict.org;
license = licenses.gpl2;
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

2
pkgs/servers/dict/dictd-wiktionary.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = {
description = "DICT version of English Wiktionary";
homepage = http://en.wiktionary.org/;
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/servers/dict/dictd-wordnet.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = http://wordnet.princeton.edu/;
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/servers/dict/libmaa.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Dict protocol server and client";
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
platforms = platforms.linux;
};
}

2
pkgs/servers/mpd/clientlib.nix
View File

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://www.musicpd.org/libs/libmpdclient/;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ mornfall ehmry ];
maintainers = with maintainers; [ ehmry ];
};
}

4
pkgs/tools/misc/profile-cleaner/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc }:
{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }:
stdenv.mkDerivation rec {
version = "2.36";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = ''
PREFIX=\"\" DESTDIR=$out make install
wrapProgram $out/bin/profile-cleaner \
--prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc ]}"
--prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc file ]}"
'';
meta = {

2
pkgs/tools/networking/iftop/default.nix
View File

@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = http://ex-parrot.com/pdw/iftop/;
platforms = platforms.unix;
maintainers = [ maintainers.mornfall ];
maintainers = [ ];
};
}

17
pkgs/tools/networking/netcat-openbsd/default.nix
View File

@ -1,18 +1,18 @@
{stdenv, fetchurl, pkgconfig, libbsd}:
stdenv.mkDerivation rec {
version = "1.130";
deb-version = "${version}-3";
version = "1.187";
deb-version = "${version}-1";
name = "netcat-openbsd-${version}";
srcs = [
(fetchurl {
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz";
sha256 = "0nqy14yvclgzs98gv0fwp6jlfpfy2kk367zka648jiqbbl30awpx";
sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw";
})
(fetchurl {
url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz";
sha256 = "0f9409vjm6v8a7m1zf5sr7wj6v5v8414i5vvxx1r45c11h69hh9a";
sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q";
})
];
@ -20,11 +20,18 @@ stdenv.mkDerivation rec {
buildInputs = [ libbsd ];
sourceRoot = name;
patches = [ "../debian/patches/*.patch" ];
prePatch = ''
for i in $(cat ../debian/patches/series); do
patch -p1 < "../debian/patches/$i"
done
'';
installPhase = ''
runHook preInstall
install -Dm0755 nc $out/bin/nc
install -Dm0644 nc.1 $out/share/man/man1/nc.1
runHook postInstall
'';
meta = with stdenv.lib; {

2
pkgs/tools/networking/tcpdump/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Network sniffer";
homepage = http://www.tcpdump.org/;
license = "BSD-style";
maintainers = with stdenv.lib.maintainers; [ mornfall jgeerds ];
maintainers = with stdenv.lib.maintainers; [ jgeerds ];
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/tools/package-management/dpkg/default.nix
View File

@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
homepage = https://wiki.debian.org/Teams/Dpkg;
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/tools/package-management/rpm/default.nix
View File

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
homepage = http://www.rpm.org/;
license = licenses.gpl2;
description = "The RPM Package Manager";
maintainers = with maintainers; [ mornfall copumpkin ];
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.linux;
};
}

2
pkgs/tools/security/nmap/default.nix
View File

@ -58,6 +58,6 @@ in stdenv.mkDerivation rec {
homepage = http://www.nmap.org;
license = licenses.gpl2;
platforms = platforms.all;
maintainers = with maintainers; [ mornfall thoughtpolice fpletz ];
maintainers = with maintainers; [ thoughtpolice fpletz ];
};
}

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

@ -2481,10 +2481,7 @@ with pkgs;
callPackage ../tools/misc/graylog/plugins.nix { }
);
gprof2dot = callPackage ../development/tools/profiling/gprof2dot {
# Using pypy provides significant performance improvements (~2x)
pythonPackages = pypyPackages;
};
gprof2dot = callPackage ../development/tools/profiling/gprof2dot { };
graphviz = callPackage ../tools/graphics/graphviz {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
@ -6677,7 +6674,7 @@ with pkgs;
inherit (beam.interpreters)
erlang erlangR18 erlangR19 erlangR20
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3
elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
lfe lfe_1_2;
inherit (beam.packages.erlang)
@ -7208,8 +7205,8 @@ with pkgs;
bam = callPackage ../development/tools/build-managers/bam {};
bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
bazel_0_5 = callPackage ../development/tools/build-managers/bazel { };
bazel = bazel_0_5;
bazel_0_9 = callPackage ../development/tools/build-managers/bazel { };
bazel = bazel_0_9;
bear = callPackage ../development/tools/build-managers/bear { };
@ -7686,7 +7683,7 @@ with pkgs;
msitools = callPackage ../development/tools/misc/msitools { };
multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { ghc = haskell.compiler.ghc802; };
multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis;
neoload = callPackage ../development/tools/neoload {
licenseAccepted = (config.neoload.accept_license or false);
@ -10504,7 +10501,9 @@ with pkgs;
phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {};
physfs = callPackage ../development/libraries/physfs { };
inherit (callPackage ../development/libraries/physfs { })
physfs_2
physfs;
pipelight = callPackage ../tools/misc/pipelight {
stdenv = stdenv_32bit;
@ -12795,8 +12794,7 @@ with pkgs;
linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
kernelPatches.cpu-cgroup-v2."4.9"
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
];
};
@ -17285,7 +17283,9 @@ with pkgs;
gtk = gtk3;
};
timbreid = callPackage ../applications/audio/pd-plugins/timbreid { };
timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
fftw = fftwSinglePrec;
};
timescaledb = callPackage ../servers/sql/postgresql/timescaledb {};
@ -18086,6 +18086,7 @@ with pkgs;
asc = callPackage ../games/asc {
lua = lua5_1;
libsigcxx = libsigcxx12;
physfs = physfs_2;
};
astromenace = callPackage ../games/astromenace { };
@ -18193,9 +18194,13 @@ with pkgs;
dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
d1x_rebirth = callPackage ../games/d1x-rebirth { };
dxx-rebirth = callPackage ../games/dxx-rebirth {
physfs = physfs_2;
};
d2x_rebirth = callPackage ../games/d2x-rebirth { };
d1x_rebirth = dxx-rebirth;
d2x_rebirth = dxx-rebirth;
easyrpg-player = callPackage ../games/easyrpg-player { };
@ -18331,7 +18336,10 @@ with pkgs;
lincity = callPackage ../games/lincity {};
lincity_ng = callPackage ../games/lincity/ng.nix {};
lincity_ng = callPackage ../games/lincity/ng.nix {
# https://github.com/lincity-ng/lincity-ng/issues/25
physfs = physfs_2;
};
liquidwar = callPackage ../games/liquidwar {
guile = guile_1_8;
@ -20042,7 +20050,7 @@ with pkgs;
vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
webkit = webkitgtk24x-gtk2;
webkit = webkitgtk218x;
};
vimb = wrapFirefox vimb-unwrapped { };

2
pkgs/top-level/beam-packages.nix
View File

@ -52,7 +52,7 @@ rec {
# Other Beam languages. These are built with `beam.interpreters.erlang`. To
# access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR19.elixir`.
inherit (packages.erlang) elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3;
inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
inherit (packages.erlang) lfe lfe_1_2;
};

2
pkgs/top-level/lua-packages.nix
View File

@ -402,7 +402,7 @@ let
description = "Network support for Lua";
homepage = "http://w3.impa.br/~diego/software/luasocket/";
license = licenses.mit;
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos;
};
};

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

@ -592,7 +592,7 @@ in {
async = buildPythonPackage rec {
name = "async-0.6.1";
disabled = isPy3k;
meta.maintainers = with maintainers; [ mornfall ];
meta.maintainers = with maintainers; [ ];
buildInputs = with self; [ pkgs.zlib ];
doCheck = false;
@ -2047,7 +2047,7 @@ in {
bunch = buildPythonPackage (rec {
name = "bunch-1.0.1";
meta.maintainers = with maintainers; [ mornfall ];
meta.maintainers = with maintainers; [ ];
src = pkgs.fetchurl {
url = "mirror://pypi/b/bunch/${name}.tar.gz";
@ -4704,6 +4704,8 @@ in {
};
};
fritzconnection = callPackage ../development/python-modules/fritzconnection { };
frozendict = buildPythonPackage rec {
name = "frozendict-0.5";
@ -5002,7 +5004,7 @@ in {
meta = {
description = "Git Object Database";
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
homepage = https://github.com/gitpython-developers/gitdb;
license = licenses.bsd3;
};
@ -5028,7 +5030,7 @@ in {
meta = {
description = "Python Git Library";
maintainers = with maintainers; [ mornfall ];
maintainers = with maintainers; [ ];
homepage = https://github.com/gitpython-developers/GitPython;
license = licenses.bsd3;
};
@ -11911,7 +11913,7 @@ in {
offtrac = buildPythonPackage rec {
name = "offtrac-0.1.0";
meta.maintainers = with maintainers; [ mornfall ];
meta.maintainers = with maintainers; [ ];
src = pkgs.fetchurl {
url = "mirror://pypi/o/offtrac/${name}.tar.gz";
@ -17810,7 +17812,7 @@ in {
smmap = buildPythonPackage rec {
name = "smmap-0.9.0";
disabled = isPyPy; # This fails the tests if built with pypy
meta.maintainers = with maintainers; [ mornfall ];
meta.maintainers = with maintainers; [ ];
buildInputs = with self; [ nosexcover ];