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

This commit is contained in:
Frederik Rietdijk 2017-05-07 21:36:49 +02:00
commit 7a61788bc1
102 changed files with 1420 additions and 881 deletions

View file

@ -580,7 +580,7 @@ running `nix-shell` with the following `shell.nix`
with import <nixpkgs> {};
(python3.buildEnv.override {
extraLibs = with python3Packages; [ numpy requests2 ];
extraLibs = with python3Packages; [ numpy requests ];
}).env
```
@ -622,7 +622,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt
```nix
with import <nixpkgs> {};
(python33.withPackages (ps: [ps.numpy ps.requests2])).env
(python33.withPackages (ps: [ps.numpy ps.requests])).env
```
In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options

View file

@ -152,6 +152,7 @@
e-user = "Alexander Kahl <nixos@sodosopa.io>";
ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
edanaher = "Evan Danaher <nixos@edanaher.net>";
edef = "edef <edef@edef.eu>";
ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
@ -297,6 +298,7 @@
luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
lukego = "Luke Gorrie <luke@snabb.co>";
lw = "Sergey Sofeychuk <lw@fmap.me>";
m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>";
ma27 = "Maximilian Bosch <maximilian@mbosch.me>";
madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
magnetophon = "Bart Brouns <bart@magnetophon.nl>";

View file

@ -187,6 +187,7 @@
./services/desktops/geoclue2.nix
./services/desktops/gnome3/at-spi2-core.nix
./services/desktops/gnome3/evolution-data-server.nix
./services/desktops/gnome3/gnome-disks.nix
./services/desktops/gnome3/gnome-documents.nix
./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix

View file

@ -0,0 +1,42 @@
# GNOME Disks daemon.
{ config, pkgs, lib, ... }:
with lib;
let
gnome3 = config.environment.gnome3.packageSet;
in
{
###### interface
options = {
services.gnome3.gnome-disks = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable GNOME Disks daemon, a service designed to
be a UDisks2 graphical front-end.
'';
};
};
};
###### implementation
config = mkIf config.services.gnome3.gnome-disks.enable {
environment.systemPackages = [ gnome3.gnome-disk-utility ];
services.dbus.packages = [ gnome3.gnome-disk-utility ];
};
}

View file

@ -128,7 +128,7 @@ let
certBits = cfg.pki.auto.bits;
clientExpiration = cfg.pki.auto.expiration.client;
crlExpiration = cfg.pki.auto.expiration.crl;
isAutoConfig = boolToString needToCreateCA;
isAutoConfig = if needToCreateCA then "True" else "False";
}}" > "$out/main.py"
cat > "$out/setup.py" <<EOF
from setuptools import setup

View file

@ -83,11 +83,11 @@ let
# Unpack Mediawiki and put the config file in its root directory.
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
name= "mediawiki-1.27.1";
name= "mediawiki-1.27.3";
src = pkgs.fetchurl {
url = "http://download.wikimedia.org/mediawiki/1.27/${name}.tar.gz";
sha256 = "0sm3ymz93qragbwhzzbwq7f127mbj29inv0afg2z6p32jb1pd9h8";
sha256 = "08x8mvc0y1gwq8rg0zm98wc6hc5j8imb6dcpx6s7392j5dc71m0i";
};
skins = config.skins;

View file

@ -104,6 +104,7 @@ in {
services.geoclue2.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true;
services.gnome3.evolution-data-server.enable = true;
services.gnome3.gnome-disks.enable = mkDefault true;
services.gnome3.gnome-documents.enable = mkDefault true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = mkDefault true;

View file

@ -370,7 +370,7 @@ in
in listToAttrs (map createImportService dataPools ++ map createSyncService allPools) // {
"zfs-mount" = { after = [ "systemd-modules-load.service" ]; };
"zfs-share" = { after = [ "systemd-modules-load.service" ]; };
"zed" = { after = [ "systemd-modules-load.service" ]; };
"zfs-zed" = { after = [ "systemd-modules-load.service" ]; };
};
systemd.targets."zfs-import" =

View file

@ -100,6 +100,16 @@ in
subnet.
'';
};
forwardDns = mkOption {
default = false;
description = ''
If set to <literal>true</literal>, the DNS queries from the
hosts connected to the bridge will be forwarded to the DNS
servers specified in /etc/resolv.conf .
'';
};
};
virtualisation.xen.stored =
@ -111,6 +121,19 @@ in
'';
};
virtualisation.xen.domains = {
extraConfig = mkOption {
type = types.string;
default = "";
description =
''
Options defined here will override the defaults for xendomains.
The default options can be seen in the file included from
/etc/default/xendomains.
'';
};
};
virtualisation.xen.trace =
mkOption {
default = false;
@ -216,7 +239,11 @@ in
{ source = "${cfg.package}/etc/xen/scripts";
target = "xen/scripts";
}
{ source = "${cfg.package}/etc/default/xendomains";
{ text = ''
source ${cfg.package}/etc/default/xendomains
${cfg.domains.extraConfig}
'';
target = "default/xendomains";
}
];
@ -331,6 +358,9 @@ in
IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address`
export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}"
IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ mask`
export XEN_BRIDGE_NETMASK="${"\${data[1]//[[:blank:]]/}"}"
echo "${cfg.bridge.address} host gw dns" > /var/run/xen/dnsmasq.hostsfile
cat <<EOF > /var/run/xen/dnsmasq.conf
@ -339,7 +369,6 @@ in
interface=${cfg.bridge.name}
except-interface=lo
bind-interfaces
auth-server=dns.xen.local,${cfg.bridge.name}
auth-zone=xen.local,$XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength}
domain=xen.local
addn-hosts=/var/run/xen/dnsmasq.hostsfile
@ -347,8 +376,11 @@ in
strict-order
no-hosts
bogus-priv
no-resolv
no-poll
${optionalString (!cfg.bridge.forwardDns) ''
no-resolv
no-poll
auth-server=dns.xen.local,${cfg.bridge.name}
''}
filterwin2k
clear-on-reload
domain-needed
@ -369,6 +401,7 @@ in
${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name}
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address}
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} netmask $XEN_BRIDGE_NETMASK
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} up
'';
serviceConfig.ExecStart = "${pkgs.dnsmasq}/bin/dnsmasq --conf-file=/var/run/xen/dnsmasq.conf";

View file

@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = [
mopidy
pythonPackages.requests2
pythonPackages.requests
pythonPackages.gmusicapi
pythonPackages.cachetools
];

View file

@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
gst-python pygobject3 pykka tornado requests2 dbus-python
gst-python pygobject3 pykka tornado requests dbus-python
];
# There are no tests

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
let
version = "4.8.0";
version = "4.8.2";
rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
in stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
crashPlanArchive = fetchurl {
url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
sha256 = "117k9yx10n4lc0hkx0j48f19km0jrdgfq6xmbmhv3v73zbx21axs";
sha256 = "0wh8lcm06ilcyncnp4ckg4yhyf9z3gb6v1kr111j4bpgmnd0v1yf";
};
srcs = [ crashPlanArchive ];

View file

@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
version = "2.8.1";
version = "2.8.2";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
sha256 = "02vdnv30ms2s53ch5j4ldch5sxwjsg3098zkvwrwhi9k6yxshdg9";
sha256 = "1q5rxkvsv974085xrd2k11ffazadabcb9cnpfra0shmj71xqlgh2";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
(stdenv.lib.optional withGrass grass) ++
(with python2Packages; [ numpy psycopg2 requests2 python2Packages.qscintilla sip ]);
(with python2Packages; [ numpy psycopg2 requests python2Packages.qscintilla sip ]);
nativeBuildInputs = [ cmake makeWrapper ];

View file

@ -1,38 +1,41 @@
{ stdenv, fetchgit, autoreconfHook, fltk13
, libjpeg, libpng, mesa, pkgconfig }:
stdenv.mkDerivation {
name = "solvespace-2.0";
{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
, json_c, fontconfig, gtkmm2, pangomm, glew, mesa_glu, xlibs, pcre
}:
stdenv.mkDerivation rec {
name = "solvespace-2.3-20170416";
rev = "b1d87bf284b32e875c8edba592113e691ea10bcd";
src = fetchgit {
url = "https://github.com/jwesthues/solvespace.git";
sha256 = "0m6zlx1kiqxkm6szdsnywwr6spnb7xjg6vqsq30nrr44cx37w861";
rev = "e587d0e";
url = https://github.com/solvespace/solvespace;
inherit rev;
sha256 = "160qam04pfrwkh9qskfmjkj01wrjwhl09xi6jjxi009yqg3cff9l";
fetchSubmodules = true;
};
# Fixup build after glibc-2.25.
postPatch = ''
sed 's/\<CHAR_WIDTH\>/CHARWIDTH/g' \
-i src/{fltk/fltkmain.cpp,glhelper.cpp,textwin.cpp,toolbar.cpp,ui.h}
'';
# e587d0e fails with undefined reference errors if make is called
# twice. Ugly workaround: Build while installing.
dontBuild = true;
enableParallelBuilding = false;
buildInputs = [
autoreconfHook
fltk13
libjpeg
libpng
mesa
pkgconfig
cmake pkgconfig zlib libpng cairo freetype
json_c fontconfig gtkmm2 pangomm glew mesa_glu
xlibs.libpthreadstubs xlibs.libXdmcp pcre
];
enableParallelBuilding = true;
preConfigure = ''
patch CMakeLists.txt <<EOF
@@ -20,9 +20,9 @@
# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
# can come from a variety of sources. If you are mirroring the sources or otherwise build when
# the .git directory is not present, please comment the following line:
-include(GetGitCommitHash)
+# include(GetGitCommitHash)
# and instead uncomment the following, adding the complete git hash of the checkout you are using:
-# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
+set(GIT_COMMIT_HASH $rev)
EOF
'';
meta = {
description = "A parametric 3d CAD program";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
maintainers = with stdenv.lib.maintainers; [ edef ];
platforms = stdenv.lib.platforms.linux;
homepage = http://solvespace.com;
};

View file

@ -15,7 +15,7 @@ with pythonPackages; buildPythonApplication rec {
propagatedBuildInputs = [
cryptography
beautifulsoup4
requests2
requests
urllib3
];

View file

@ -0,0 +1,54 @@
{ stdenv
, fetchurl
, python2Packages
}:
python2Packages.buildPythonApplication rec {
name = "electrum-ltc-${version}";
version = "2.6.4.2";
src = fetchurl {
url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
sha256 = "0sqcyk6n6kgaiinnwh6mzbbn4whk3ga59r5bw5rqmnnfqk1xdnb4";
};
propagatedBuildInputs = with python2Packages; [
pyqt4
slowaes
ecdsa
pbkdf2
requests
qrcode
ltc_scrypt
protobuf3_0
dns
jsonrpclib
];
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
pyrcc4 icons.qrc -o gui/qt/icons_rc.py
# Recording the creation timestamps introduces indeterminism to the build
sed -i '/Created: .*/d' gui/qt/icons_rc.py
'';
checkPhase = ''
$out/bin/electrum-ltc help >/dev/null
'';
meta = with stdenv.lib; {
description = "Litecoin thin client";
longDescription = ''
Electrum-LTC is a simple, but powerful Litecoin wallet. A twelve-word
security passphrase (or seed) leaves intruders stranded and your peace
of mind intact. Keep it on paper, or in your head... and never worry
about losing your litecoins to theft or hardware failure. No waiting, no
lengthy blockchain downloads and no syncing to the network.
'';
homepage = https://electrum-ltc.org/;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ asymmetric ];
};
}

View file

@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
click
colorama
requests2
requests
pygments
prompt_toolkit
six

View file

@ -65,7 +65,7 @@ in pythonPackages.buildPythonApplication rec {
# We need old Tornado
propagatedBuildInputs = with pythonPackages; [
awesome-slugify flask_assets rsa requests2 pkginfo watchdog
awesome-slugify flask_assets rsa requests pkginfo watchdog
semantic-version flask_principal werkzeug flaskbabel tornado
psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client

View file

@ -35,7 +35,7 @@ buildPythonApplication rec {
kitchen
mailcap-fix
mccabe
requests2
requests
six
tornado
pyyaml

View file

@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
};
propagatedBuildInputs = with pythonPackages;
[ requests2 beautifulsoup4 future ];
[ requests beautifulsoup4 future ];
meta = with stdenv.lib; {
description = "Mastodon CLI interface";

File diff suppressed because it is too large Load diff

View file

@ -6,10 +6,10 @@ rec {
firefox = common rec {
pname = "firefox";
version = "53.0";
version = "53.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886";
sha512 = "d56d563db7e1a0faa2de9315b71b479adb9109624d0958224ad2cee331dcbdb4f414380bd91f70ee0b3e543eca812c172eb2d6f6b5620f6dd6f61675f5ac69d8";
};
meta = {
@ -25,10 +25,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
version = "52.1.0esr";
version = "52.1.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "ba833904654eda347f83df77e04c8e81572772e8555f187b796ecc30e498b93fb729b6f60935731d9584169adc9d61329155364fddf635cbd11abebe4a600247";
sha512 = "23f88de0a084341d54aab107bbf71b965a3f5be192ec8681b8b824c7e13d47968a0e56f4acfd2d2c5487c2e4c963e75ea6aeed400add915b3fb6403ee8810374";
};
meta = firefox.meta // {

View file

@ -0,0 +1,35 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.11.1";
goPackagePath = "github.com/gruntwork-io/terragrunt";
src = fetchFromGitHub {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
};
goDeps = ./deps.nix;
buildInputs = [ makeWrapper ];
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
'';
postInstall = ''
wrapProgram $bin/bin/terragrunt \
--set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
'';
meta = with stdenv.lib; {
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
homepage = https://github.com/gruntwork-io/terragrunt/;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.11.1";
version = "0.12.15";
goPackagePath = "github.com/gruntwork-io/terragrunt";
@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
sha256 = "1khmxqzhhkr6km4zfn0q3zm55wgc92hrayvqkf9snzr816c1qzp3";
};
goDeps = ./deps.nix;

View file

@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
webtest bottle threadpool rocket-errbot requests2 jinja2
webtest bottle threadpool rocket-errbot requests jinja2
pyopenssl colorlog Yapsy markdown ansi pygments dns pep8
daemonize pygments-markdown-lexer telegram irc slackclient
pyside sleekxmpp hypchat pytest

View file

@ -41,7 +41,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
feedparser sqlalchemy pyyaml
beautifulsoup4 html5lib PyRSS2Gen pynzb
rpyc jinja2 requests2 dateutil jsonschema
rpyc jinja2 requests dateutil jsonschema
pathpy guessit APScheduler
terminaltables colorclass
cherrypy flask flask-restful flask-restplus_0_8

View file

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, which, autoconf, automake, ncurses, perl
{ stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl
, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }:
stdenv.mkDerivation rec {
version = "20170306";
version = "20170428";
name = "neomutt-${version}";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
sha256 = "0nlazabwj4czi30m84ppga275hkr51glyndizqzg540q9wp1acz4";
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
sha256 = "1p6214agfv9plskkzalh03r5naiiyg1habrnknnjgck3nypb78ik";
};
nativeBuildInputs = [ which autoconf automake ];
nativeBuildInputs = [ which autoreconfHook ];
buildInputs =
[ cyrus_sasl gdbm gpgme kerberos libidn ncurses
notmuch openssl perl lmdb ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, buildPythonApplication, fuse
, appdirs, colorama, dateutil, requests2, requests_toolbelt
, appdirs, colorama, dateutil, requests, requests_toolbelt
, fusepy, sqlalchemy }:
buildPythonApplication rec {
@ -16,7 +16,7 @@ buildPythonApplication rec {
sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp";
};
propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests2
propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests
requests_toolbelt sqlalchemy ];
makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ];

View file

@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
# It also seems not to mention libdl explicitly in some places.
NIX_LDFLAGS = "-lcups -ldl";
# For some reason librdf_redland sometimes refers to rasqal.h instead
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
@ -187,6 +187,7 @@ in stdenv.mkDerivation rec {
"--disable-report-builder"
"--enable-python=system"
"--enable-dbus"
"--enable-release-build"
(lib.enableFeature kdeIntegration "kde4")
"--with-package-format=installed"
"--enable-epm"

View file

@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
py.test -vs tests
'';
checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
propagatedBuildInputs = with pythonPackages; [ requests2 click arrow ];
propagatedBuildInputs = with pythonPackages; [ requests click arrow ];
meta = with stdenv.lib; {
homepage = https://tailordev.github.io/Watson/;

View file

@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce";
};
propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests2 pythonPackages.argparse pythonPackages.setuptools ];
propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests pythonPackages.argparse pythonPackages.setuptools ];
# Don't do tests because they require gerrit which is not packaged
doCheck = false;

View file

@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = with pythonPackages; [ pytest mock ];
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests2 iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ];
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ];
meta = with stdenv.lib; {
homepage = https://github.com/streamlink/streamlink;

View file

@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec {
];
buildInputs = with python2Packages; [
Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8
Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8
testresources testscenarios testtools psutil_1 oslotest psycopg2
sqlite which strace
];

View file

@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec {
buildInputs = with python2Packages; [
coverage fixtures mock subunit tempest-lib testtools testrepository
ldap ldappool webtest requests2 oslotest pep8 pymongo which
ldap ldappool webtest requests oslotest pep8 pymongo which
];
makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];

View file

@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
# https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with python2Packages; [
pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests
jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
stevedore pecan ryu networking-hyperv MySQL_python

View file

@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = with python2Packages; [
pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
netifaces paramiko Babel iso8601 jsonschema keystoneclient requests six
stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
keystonemiddleware MySQL_python

View file

@ -26,9 +26,9 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = with python2Packages;
[ eventlet greenlet gflags netaddr carrot routes PasteDeploy
m2crypto ipy twisted distutils_extra simplejson glanceclient
m2crypto ipy twisted distutils_extra simplejson
cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python
pygobject3 ipaddr mox libvirt libxml2
pygobject3 ipaddr mox libvirt libxml2 requests
];
patchPhase = ''

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
pythonPath = with python2Packages;
[ setuptools eventlet greenlet gflags netaddr carrot routes
PasteDeploy m2crypto ipy twisted
distutils_extra simplejson glanceclient cheetah lockfile httplib2
distutils_extra simplejson cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
libvirt libxml2Python urlgrabber

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2
python3Packages.pycairo python3Packages.dbus-python python3Packages.requests
python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
gnome3.gsettings_desktop_schemas makeWrapper tracker ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "asn1c-${version}";
version = "0.9.27";
version = "0.9.28";
src = fetchurl {
url = "http://lionet.info/soft/asn1c-${version}.tar.gz";
sha256 = "17nvn2kzvlryasr9dzqg6gs27b9lvqpval0k31pb64bjqbhn8pq2";
sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0";
};
outputs = [ "out" "doc" "man" ];

View file

@ -229,6 +229,7 @@ self: super: {
pocket-dns = dontCheck super.pocket-dns;
postgresql-simple = dontCheck super.postgresql-simple;
postgrest = dontCheck super.postgrest;
postgrest-ws = dontCheck super.postgrest-ws;
snowball = dontCheck super.snowball;
sophia = dontCheck super.sophia;
test-sandbox = dontCheck super.test-sandbox;

View file

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "libscrypt-${version}";
version = "1.21";
src = fetchFromGitHub {
owner = "technion";
repo = "libscrypt";
rev = "v${version}";
sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng";
};
buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
installFlags = [ "PREFIX=$(out)" ];
installTargets = if stdenv.isDarwin then "install-osx" else "install";
doCheck = true;
meta = with stdenv.lib; {
description = "Shared library that implements scrypt() functionality";
homepage = "https://lolware.net/2014/04/29/libscrypt.html";
license = licenses.bsd2;
maintainers = with maintainers; [ davidak ];
platforms = platforms.unix;
};
}

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "libtoxcore-${version}";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "TokTok";
repo = "c-toxcore";
rev = "v${version}";
sha256 = "11lqq825id174xdjxm0cy5dbyvmdy841hjy9q3l51yiya9f82d5b";
sha256 = "08vdq3j60wn62lj2z9f3f47hibns93rvaqx5xc5bm3nglk70q7kk";
};
cmakeFlags = [

View file

@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
name = "mapnik-${version}";
version = "3.0.12";
version = "3.0.13";
src = fetchzip {
# this one contains all git submodules and is cheaper than fetchgit
url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
sha256 = "02w360fxk0pfkk0zbwc134jq7rkkib58scs5k67j8np6fx6gag6i";
sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065";
};
# a distinct dev output makes python-mapnik fail

View file

@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3";
};
buildInputs = [ cmake ]
nativeBuildInputs = [ cmake ];
buildInputs = []
++ optional alsaSupport alsaLib
++ optional pulseSupport libpulseaudio
++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];

View file

@ -1,8 +1,10 @@
{ stdenv, fetchurl, libuuid, zlib }:
{ stdenv, fetchurl, autoreconfHook
, libuuid, zlib }:
let
generic = version: sha256: stdenv.mkDerivation rec {
name = "xapian-${version}";
passthru = { inherit version; };
src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
@ -12,17 +14,20 @@ let
outputs = [ "out" "doc" ];
buildInputs = [ libuuid zlib ];
nativeBuildInputs = [ autoreconfHook ];
meta = {
doCheck = true;
meta = with stdenv.lib; {
description = "Search engine library";
homepage = http://xapian.org/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.chaoflow ];
platforms = stdenv.lib.platforms.unix;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ chaoflow ];
platforms = platforms.unix;
};
};
in {
# used by xapian-ruby
# xapian-ruby needs 1.2.22 as of 2017-05-06
xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
xapian_1_4_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6";
}

View file

@ -2,14 +2,15 @@
stdenv.mkDerivation rec {
name = "xapian-omega-${version}";
version = (builtins.parseDrvName xapian.name).version;
inherit (xapian) version;
src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
sha256 = "07s341m1csk4v7mc44mqrzc1nxpnmdkji9k1cirbx6q0nlshdz0h";
sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l";
};
buildInputs = [ pkgconfig xapian perl pcre zlib libmagic ];
buildInputs = [ xapian perl pcre zlib libmagic ];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
description = "Indexer and CGI search front-end built on Xapian library";

View file

@ -6,7 +6,7 @@
, sh
, coverage
, docopt
, requests2
, requests
, git
}:
@ -38,7 +38,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
coverage
docopt
requests2
requests
];
meta = {

View file

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchurl
, six, requests2, websocket_client
, six, requests, websocket_client
, ipaddress, backports_ssl_match_hostname, docker_pycreds
}:
buildPythonPackage rec {
@ -13,7 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
six
requests2
requests
websocket_client
ipaddress
backports_ssl_match_hostname

View file

@ -1,7 +1,7 @@
{ stdenv, buildPythonApplication, fetchurl, pythonOlder
, mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests2
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
, enum34, functools32
}:
@ -19,7 +19,7 @@ buildPythonApplication rec {
buildInputs = [ mock pytest nose ];
propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker
ipaddress jsonschema requests2 six texttable websocket_client
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property
] ++
stdenv.lib.optional (pythonOlder "3.4") enum34 ++

View file

@ -17,7 +17,7 @@
, decorator
, pathlib2
, pickleshare
, requests2
, requests
, simplegeneric
, traitlets
, prompt_toolkit
@ -45,7 +45,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
simplegeneric traitlets requests2 pathlib2 pexpect
simplegeneric traitlets requests pathlib2 pexpect
] ++ lib.optionals stdenv.isDarwin [ appnope ];
LC_ALL="en_US.UTF-8";

View file

@ -0,0 +1,35 @@
{ buildPythonPackage
, fetchFromGitHub
, stdenv
, lib
, pythonOlder
, requests
, enum34
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "libsoundtouch";
version = "0.3.0";
src = fetchFromGitHub {
owner = "CharlesBlonde";
repo = "libsoundtouch";
rev = "7c8f943298bcae5f0c25ad7be7469de51373cdbd";
sha256 = "1a9mdy09n4bjx6nang7wfn2nq87dg2s18px4yqsj53mn5kjf44n0";
};
postPatch = lib.optionalString (! (pythonOlder "3.4")) ''
substituteInPlace setup.py --replace "'enum34>=1.1.6'" ""
'';
propagatedBuildInputs = [ requests enum34 ];
doCheck = false;
meta = with stdenv.lib; {
description = "Bose Soundtouch Python library";
homepage = https://github.com/CharlesBlonde/libsoundtouch;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,22 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "ltc_scrypt";
version = "1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1h90hh3iw4i7zs7jgskdjlk8gi97b3v2zqsxdfwdvhrrnhpvv856";
};
meta = with stdenv.lib; {
description = "Bindings for scrypt proof of work used by Litecoin";
homepage = https://pypi.python.org/pypi/ltc_scrypt;
maintainers = with maintainers; [ asymmetric ];
license = licenses.bsd2;
};
}

View file

@ -15,7 +15,7 @@
, nbconvert
, ipykernel
, terminado
, requests2
, requests
, pexpect
}:
@ -34,7 +34,7 @@ buildPythonPackage rec {
buildInputs = [nose glibcLocales] ++ lib.optionals isPy27 [mock];
propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core
jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect ];
jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ];
checkPhase = ''
nosetests -v

View file

@ -4,7 +4,7 @@
, decorator
, nbformat
, pytz
, requests2
, requests
, six
}:
@ -22,7 +22,7 @@ buildPythonPackage rec {
decorator
nbformat
pytz
requests2
requests
six
];

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring,
{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
buildPythonPackage rec {
name = "pyrax-1.9.8";
@ -15,7 +15,7 @@ buildPythonPackage rec {
'';
disabled = isPy3k;
propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ];
propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ];
LC_ALL = "en_US.UTF-8";
buildInputs = [ pytest glibcLocales ];

View file

@ -6,7 +6,7 @@
, decorator
, httpbin
, six
, requests2
, requests
}:
buildPythonPackage rec {
@ -25,7 +25,7 @@ buildPythonPackage rec {
'';
buildInputs = [ pytest ];
propagatedBuildInputs = [ flask decorator httpbin six requests2 ];
propagatedBuildInputs = [ flask decorator httpbin six requests ];
meta = {
description = "Easily test your HTTP library against a local copy of httpbin.org";

View file

@ -1,4 +1,4 @@
{ buildPythonPackage, fetchurl, isPy3k, requests2, novaclient, six, lib }:
{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }:
let
os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
name = "os_virtual_interfacesv2_python_novaclient_ext-0.20";
@ -129,7 +129,7 @@ buildPythonPackage rec {
disabled = isPy3k;
propagatedBuildInputs = [
requests2
requests
novaclient
six
# extensions

View file

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchurl
, oauthlib, requests2 }:
, oauthlib, requests }:
buildPythonPackage rec {
version = "0.7.0";
@ -11,7 +11,7 @@ buildPythonPackage rec {
};
doCheck = false; # Internet tests fail when building in chroot
propagatedBuildInputs = [ oauthlib requests2 ];
propagatedBuildInputs = [ oauthlib requests ];
meta = with stdenv.lib; {
description = "OAuthlib authentication support for Requests";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2,
{ stdenv, fetchurl, buildPythonPackage, service-identity, requests,
six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx,
openssl, pyopenssl }:
@ -19,7 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
service-identity
requests2
requests
twisted
incremental
sphinx

View file

@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1";
};
propagatedBuildInputs = with pythonPackages; [ futures requests2 six tqdm ];
propagatedBuildInputs = with pythonPackages; [ futures requests six tqdm ];
checkPhase = ''
python test_b2_command_line.py test

View file

@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
};
propagatedBuildInputs = with pythonPackages; [
requests2 fasteners pyyaml pyjwt colorama patch
requests fasteners pyyaml pyjwt colorama patch
bottle pluginbase six distro pylint node-semver
];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "coursier-${version}";
version = "1.0.0-RC1";
version = "1.0.0-RC2";
src = fetchurl {
url = "https://github.com/coursier/coursier/raw/v${version}/coursier";
sha256 = "0dxwhqp7m7nmal8wn4chlmyvhdh6v3ja0nfz9x952kacf2vpnqw3";
sha256 = "0w97s1dzfl3gyqa293k8n4hpsrqc10va1lc7jhb05208rsz1hf2m";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,7 +1,7 @@
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
let
version = "1.6.2";
version = "1.6.6";
name = "electron-${version}";
meta = with stdenv.lib; {
@ -17,7 +17,7 @@ let
src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "1dhyr8zkisnhjzk2v2zi8zp0jqg0v3g095xa430af6i1rm0qhs13";
sha256 = "1k6y1wcsb2z9h8wdj5f1z1fprvc3bvsj4rfx58if7q74qiq3q102";
name = "${name}.zip";
};
@ -45,7 +45,7 @@ let
src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
sha256 = "11jfh4xvdrpda5ni08kl6wcg67ww9viagszk8gi00z0rlczrsbkf";
sha256 = "1hp42iy32lymh9d5zp4vr51qjrr83wjxmbws0c16yw7zchq7fr64";
name = "${name}.zip";
};

View file

@ -1,5 +1,6 @@
{ mkDerivation, base, directory, filepath, optparse-applicative
, posix-escape, split, stdenv, unix, fetchFromGitHub
{ mkDerivation, base, cabal-install, directory, fetchFromGitHub
, filepath, intero, optparse-applicative, posix-escape, split
, stdenv, unix
}:
mkDerivation {
pname = "intero-nix-shim";
@ -16,6 +17,11 @@ mkDerivation {
base directory filepath optparse-applicative posix-escape split
unix
];
postInstall = ''
mkdir -p $out/libexec
ln -s ${cabal-install}/bin/cabal $out/libexec
ln -s ${intero }/bin/intero $out/libexec
'';
homepage = "https://github.com/michalrus/intero-nix-shim";
license = stdenv.lib.licenses.asl20;
}

View file

@ -0,0 +1,69 @@
{ stdenv
, fetchFromGitHub
, cmake
, mesa_glu
, x11
, xorg
, xinput_calibrator
, doxygen
, libpthreadstubs
, alsaLib
, alsaOss
, libao
, width ? 30
, mute ? false
, effects ? false
, sensitivity ? 5
, reverseY ? false
}:
stdenv.mkDerivation rec {
name = "MAR1D-${version}";
version = "0.2.0";
options = "-w${toString width}"
+ " -s${toString sensitivity}"
+ (if mute then " -m" else "")
+ (if effects then " -f" else "")
+ (if reverseY then " -r" else "");
src = fetchFromGitHub {
sha256 = "152w5dnlxzv60cl24r5cmrj2q5ar0jiimrmxnp87kf4d2dpbnaq7";
rev = "v${version}";
repo = "fp_mario";
owner = "olynch";
};
buildInputs =
[
alsaLib
alsaOss
cmake
doxygen
libao
libpthreadstubs
mesa_glu
x11
xinput_calibrator
xorg.libXrandr
xorg.libXi
xorg.xinput
];
preConfigure = ''
cd src
'';
meta = with stdenv.lib; {
description = "First person Super Mario Bros";
longDescription = ''
The original Super Mario Bros as you've never seen it. Step into Mario's
shoes in this first person clone of the classic Mario game. True to the
original, however, the game still takes place in a two dimensional world.
You must view the world as mario does, as a one dimensional line.
'';
homepage = https://github.com/olynch/fp_mario;
license = licenses.agpl3;
maintainers = with maintainers; [ taeer ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,40 @@
{ stdenv, SDL, fetchurl, gzip, libvorbis, libmad }:
stdenv.mkDerivation rec {
name = "quakespasm-${version}";
majorVersion = "0.92";
version = "${majorVersion}.1";
src = fetchurl {
url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tgz";
sha256 = "0vhycjg97sn4cd85ph6qz68rplzrm4apijdkrlj9mycnqjv5l100";
};
sourceRoot = "${name}/Quake";
buildInputs = [
gzip SDL libvorbis libmad
];
preInstall = ''
mkdir -p "$out/bin"
substituteInPlace Makefile --replace "/usr/local/games" "$out/bin"
'';
enableParallelBuilding = true;
meta = {
description = "An engine for iD software's Quake";
homepage = "http://quakespasm.sourceforge.net/";
longDescription = ''
QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake.
It includes support for 64 bit CPUs and custom music playback, a new sound driver,
some graphical niceities, and numerous bug-fixes and other improvements.
Quakespasm utilizes either the SDL or SDL2 frameworks, so choose which one
works best for you. SDL is probably less buggy, but SDL2 has nicer features
and smoother mouse input - though no CD support.
'';
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.m3tti ];
};
}

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
mkdir -p ${name}
cabextract $src --directory ${name}
'';
installPhase = ''
mkdir -p $out/lib/firmware/brcm
bt-fw-converter -f bcbtums.inf -o $out/lib/firmware/brcm
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Firmware for Broadcom WIDCOMM® Bluetooth devices";
homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth;
license = licenses.unfree;
license = licenses.unfreeRedistributableFirmware;
platforms = platforms.linux;
maintainers = with maintainers; [ zraexy ];
};
}
}

View file

@ -1,4 +1,6 @@
{ stdenv, runCommand, nettools, bc, perl, kmod, openssl, writeTextFile, ubootChooser }:
{ stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, writeTextFile, ubootChooser
}:
let
readConfig = configfile: import (runCommand "config.nix" {} ''
@ -219,7 +221,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
enableParallelBuilding = true;
nativeBuildInputs = [ perl bc nettools openssl ] ++ optional (stdenv.platform.uboot != null)
nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot);
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];

View file

@ -44,8 +44,8 @@ in {
tomcat85 = common {
versionMajor = "8";
versionMinor = "5.11";
sha256 = "0i1xvgpj4l4agc8vxrnfm127w4mc33pyl8963pwpklqpdk4shcjn";
versionMinor = "5.14";
sha256 = "0dls16lw7yak3s6cwwcccfg0qb5g8s36waxlg8wgjk8vc57h316w";
};
tomcatUnstable = common {

View file

@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication rec {
'';
propagatedBuildInputs = with pythonPackages; [
requests2
requests
cgroup-utils docker_1_7_2 docutils PyLTI mock pygments
pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
websocket_client watchdog webpy-custom flup

View file

@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
signedjson systemd twisted ujson unpaddedbase64 pyyaml
matrix-angular-sdk bleach netaddr jinja2 psycopg2
psutil msgpack lxml matrix-synapse-ldap3

View file

@ -1,16 +1,13 @@
{ stdenv, fetchFromGitHub }:
let
repo = "lambda-mod-zsh-theme";
rev = "eceee68cf46bba9f7f42887c2128b48e8861e31b";
in stdenv.mkDerivation {
name = "${repo}-${rev}";
stdenv.mkDerivation {
name = "lambda-mod-zsh-theme-unstable-2017-04-05";
src = fetchFromGitHub {
inherit rev repo;
owner = "halfo";
sha256 = "1410ryc22i20na5ypa1q6f106lkjj8n1qfjmb77q4rspi0ydaiy4";
repo = "lambda-mod-zsh-theme";
sha256 = "01c77s6fagycin6cpssif56ysbqaa8kiafjn9av12cacakldl84j";
rev = "c6445c79cbc73b85cc18871c216fb28ddc8b3d96";
};
buildPhases = [ "unpackPhase" "installPhase" ];

View file

@ -1,27 +1,29 @@
{ stdenv, fetchFromGitHub, xorg
, autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config
, fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext
, cmake, libjpeg_turbo, fltk, nettle, libiconv, libtasn1
}:
{ stdenv, fetchFromGitHub
, xorg, xkeyboard_config, zlib
, libjpeg_turbo, pixman, fltk
, fontDirectories
, cmake, gettext, libtool
, glproto, mesa_glu
, gnutls, pam, nettle
, xterm }:
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.8.0pre20170211";
version = "1.8.0pre20170419";
name = "tigervnc-${version}";
src = fetchFromGitHub {
owner = "TigerVNC";
repo = "tigervnc";
sha256 = "10bs6394ya953gmak8g2d3n133vyfrryq9zq6dc27g8s6lw0mrbh";
rev = "b6c46a1a99a402d5d17b1afafc4784ce0958d6ec";
sha256 = "1y3fn7dwlkm7ilqn8bwyqj3bw7s7clnv7d4jml4wyvfihzz9j90b";
rev = "v1.7.90";
};
inherit fontDirectories;
patchPhase = ''
sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver
fontPath=
for i in $fontDirectories; do
for j in $(find $i -name fonts.dir); do
@ -67,27 +69,23 @@ stdenv.mkDerivation rec {
make TIGERVNC_SRCDIR=`pwd`/../.. install
popd
rm -f $out/lib/xorg/protocol.txt
wrapProgram $out/bin/vncserver \
--prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot ]) }
'';
crossAttrs = {
buildInputs = (map (x : x.crossDrv) (buildInputs ++ [
xorg.fixesproto xorg.damageproto xorg.xcmiscproto xorg.bigreqsproto xorg.randrproto xorg.renderproto
xorg.fontsproto xorg.videoproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
xorg.libxkbfile xorg.libXfont xorg.libpciaccess xorg.xineramaproto
]));
};
buildInputs = with xorg; [
libjpeg_turbo fltk pixman
gnutls pam nettle
fixesproto damageproto compositeproto randrproto
xcmiscproto bigreqsproto randrproto renderproto
fontsproto videoproto scrnsaverproto resourceproto presentproto
utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft
libxkbfile libXfont2 libpciaccess xineramaproto
glproto mesa_glu
] ++ xorgserver.buildInputs;
buildInputs =
[ xorg.libX11 xorg.libXext gettext xorg.libICE xorg.libXtst xorg.libXi xorg.libSM xorg.libXft
nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xorg.xineramaproto
xorg.libXinerama xorg.libXcursor nettle libiconv libtasn1
];
nativeBuildInputs =
[ autoconf automake cvs xorg.utilmacros xorg.fontutil libtool flex bison
cmake gettext
]
++ xorg.xorgserver.nativeBuildInputs;
nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs;
propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs;

View file

@ -100,7 +100,7 @@ in pythonPackages.buildPythonApplication rec {
++ optional (enableFetchart
|| enableEmbyupdate
|| enableAcousticbrainz)
pythonPackages.requests2
pythonPackages.requests
++ optional enableConvert ffmpeg
++ optional enableDiscogs pythonPackages.discogs_client
++ optional enableKeyfinder keyfinder-cli

View file

@ -1,6 +1,32 @@
{ stdenv, fetchzip, python3Packages, openssl, acl }:
{ stdenv, fetchzip, python3Packages, openssl, acl, fetchurl, pkgconfig, fuse, attr, which }:
python3Packages.buildPythonApplication rec {
let
# Old version needed for attic (backup program) due to breaking change in
# llfuse >= 0.42.
llfuse-0-41 = python3Packages.buildPythonPackage rec {
name = "llfuse-0.41.1";
src = fetchurl {
url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
sha256 = "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa";
};
buildInputs = with python3Packages; [ pytest pkgconfig fuse attr which ];
propagatedBuildInputs = with python3Packages; [ contextlib2 ];
checkPhase = ''
py.test
'';
# FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin'
doCheck = false;
meta = {
description = "Python bindings for the low-level FUSE API";
homepage = https://code.google.com/p/python-llfuse/;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ bjornfor ];
};
};
in python3Packages.buildPythonApplication rec {
name = "attic-${version}";
version = "0.16";
namePrefix = "";

View file

@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [ which ]; # tests will fail without which
propagatedBuildInputs = with python3Packages; [
sqlite apsw pycrypto requests2 defusedxml dugong llfuse
sqlite apsw pycrypto requests defusedxml dugong llfuse
cython pytest pytest-catchlog
];

View file

@ -0,0 +1,57 @@
{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which }:
# Common attributes of irods packages
with stdenv;
{
enableParallelBuilding = true;
buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which ];
propagateBuildInputs = [ boost ];
cmakeFlags = [
"-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}"
"-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME=${stdenv.cc}"
"-DIRODS_EXTERNALS_FULLPATH_ARCHIVE=${libarchive.lib}"
"-DIRODS_EXTERNALS_FULLPATH_AVRO=${avro-cpp}"
"-DIRODS_EXTERNALS_FULLPATH_BOOST=${boost}"
"-DIRODS_EXTERNALS_FULLPATH_JANSSON=${jansson}"
"-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}"
"-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}"
"-DIRODS_LINUX_DISTRIBUTION_NAME=nix"
"-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}"
"-DCPACK_GENERATOR=TGZ"
"-DCMAKE_CXX_FLAGS=-I${libcxx}/include/c++/v1"
];
preConfigure = ''
patchShebangs ./packaging
patchShebangs ./scripts
substituteInPlace CMakeLists.txt --replace "DESTINATION usr/bin" "DESTINATION bin"
substituteInPlace CMakeLists.txt --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/"
substituteInPlace CMakeLists.txt --replace "DESTINATION usr/lib/" "DESTINATION lib/"
export cmakeFlags="$cmakeFlags
-DCMAKE_INSTALL_PREFIX=$out
"
'';
meta = {
description = "Integrated Rule-Oriented Data System (iRODS)";
longDescription = ''
The Integrated Rule-Oriented Data System (iRODS) is open source data management
software used by research organizations and government agencies worldwide.
iRODS is released as a production-level distribution aimed at deployment in mission
critical environments. It virtualizes data storage resources, so users can take
control of their data, regardless of where and on what device the data is stored.
As data volumes grow and data services become more complex, iRODS is increasingly
important in data management. The development infrastructure supports exhaustive
testing on supported platforms; plug-in support for microservices, storage resources,
drivers, and databases; and extensive documentation, training and support services.'';
homepage = http://irods.org;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.bzizou ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,84 @@
{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
with stdenv;
let
common = import ./common.nix {
inherit stdenv bzip2 zlib autoconf automake cmake gnumake
help2man texinfo libtool cppzmq libarchive jansson
zeromq openssl pam libiodbc kerberos gcc libcxx
boost avro-cpp which;
};
in rec {
# irods: libs and server package
irods = stdenv.mkDerivation (common // rec {
version = "4.2.0";
prefix = "irods";
name = "${prefix}-${version}";
src = fetchurl {
url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz";
sha256 = "b5c0d7209219629da139058ce462a237ecc22ad4dae613413a428961e4ff9d3e";
};
# Patches:
# irods_root_path.patch : the root path is obtained by stripping 3 items of the path,
# but we don't use /usr with nix, so remove only 2 items.
patches = [ ./irods_root_path.patch ];
preConfigure = common.preConfigure + ''
patchShebangs ./test
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
substituteInPlace cmake/server.cmake --replace "DESTINATION usr/sbin" "DESTINATION sbin"
substituteInPlace cmake/server.cmake --replace "IRODS_DOC_DIR usr/share" "IRODS_DOC_DIR share"
substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib"
substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib"
substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include"
export cmakeFlags="$cmakeFlags
-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib
-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib
-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib
"
'';
meta = common.meta // {
longDescription = common.meta.longDescription + ''
This package provides the servers and libraries.'';
};
});
# icommands (CLI) package, depends on the irods package
irods-icommands = stdenv.mkDerivation (common // rec {
version = "4.2.0";
name = "irods-icommands-${version}";
src = fetchurl {
url = "http://github.com/irods/irods_client_icommands/archive/${version}.tar.gz";
sha256 = "b581067c8139b5ef7897f15fc1fc79f69d2e784a0f36d96e8fa3cb260b6378ce";
};
buildInputs = common.buildInputs ++ [ irods ];
propagateBuildInputs = [ boost ];
preConfigure = common.preConfigure + ''
patchShebangs ./bin
'';
cmakeFlags = common.cmakeFlags ++ [
"-DCMAKE_INSTALL_PREFIX=${out}"
"-DIRODS_DIR=${irods}/lib/irods/cmake"
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
"-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
"-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
];
meta = common.meta // {
description = common.meta.description + " CLI clients";
longDescription = common.meta.longDescription + ''
This package provides the CLI clients, called 'icommands'.'';
};
});
}

View file

@ -0,0 +1,11 @@
--- a/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:02.955889536 +0200
+++ b/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:43.178722157 +0200
@@ -18,7 +18,7 @@
try {
boost::filesystem::path path{dl_info.dli_fname};
path = boost::filesystem::canonical(path);
- path.remove_filename().remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install
+ path.remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install
return path;
} catch(const boost::filesystem::filesystem_error& e) {
THROW(-1, e.what());

View file

@ -1,29 +1,23 @@
{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
{ stdenv, fetchgit, pkgconfig, libpng, zlib, lcms2 }:
stdenv.mkDerivation rec {
name = "pngquant-${version}";
version = "2.6.0";
version = "2.9.1";
src = fetchFromGitHub {
owner = "pornel";
repo = "pngquant";
rev = version;
sha256 = "0sdh9cz330rhj6xvqk3sdhy0393qwyl349klk9r55g88rjp774s5";
src = fetchgit {
url = "https://www.github.com/pornel/pngquant.git";
rev = "refs/tags/${version}";
sha256 = "0xhnrjsk55jy5q68f81y7l61c6x18i4fzkm3i4dgndrhri5g4n1q";
fetchSubmodules = true;
};
preConfigure = "patchShebangs .";
buildInputs = [ pkgconfig libpng zlib lcms2 ];
preInstall = ''
mkdir -p $out/bin
export PREFIX=$out
'';
meta = with stdenv.lib; {
homepage = https://pngquant.org/;
description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved";
platforms = platforms.linux;
license = licenses.bsd2; # Not exactly bsd2, but alike
license = licenses.gpl3;
maintainers = [ maintainers.volth ];
};
}

View file

@ -7,7 +7,7 @@ in pythonPackages.buildPythonApplication rec {
version = "1.4.0";
buildInputs = with pythonPackages; [ nose ];
propagatedBuildInputs = with pythonPackages; [ requests2 ];
propagatedBuildInputs = with pythonPackages; [ requests ];
src = fetchFromGitHub {
owner = "asciinema";

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "2.2.2";
version = "2.2.3";
name = "graylog-${version}";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "1d6fbyc9m2dkmlv03w3b1n8vq6sga888ag1k55mq3rgn4ba1kx26";
sha256 = "02x8brzlyx7qpxb1pgs74iv1gdykvs7cihff0rzjmh7bp1y1xq1x";
};
dontBuild = true;

View file

@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
markupsafe
netaddr
pyasn1
requests2
requests
setuptools
];

View file

@ -2,7 +2,7 @@
, rtmpdump, substituteAll }:
let
inherit (pythonPackages) python nose pycrypto requests2 mock;
inherit (pythonPackages) python nose pycrypto requests mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}";
version = "1.9.3";
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw";
};
pythonPaths = [ pycrypto requests2 ];
pythonPaths = [ pycrypto requests ];
buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths;
nativeBuildInputs = [ zip ];

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapGAppsHook ];
pythonPath = with pythonPackages;
[ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ];
[ pycups pycurl dbus-python pygobject3 requests pycairo pythonPackages.pycurl ];
configureFlags =
[ "--with-udev-rules"

View file

@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
click click-log click-threading
requests_toolbelt
requests2
requests
atomicwrites
];

View file

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, makeWrapper
, parted, grub2_light, p7zip
, wxGTK30, gksu }:
stdenv.mkDerivation rec {
name = "winusb-unstable-2017-01-30";
src = fetchFromGitHub {
owner = "slacka";
repo = "WinUSB";
rev = "599f00cdfd5c931056c576e4b2ae04d9285c4192";
sha256 = "1219425d1m4463jy85nrc5xz5qy5m8svidbiwnqicy7hp8pdwa7x";
};
buildInputs = [ wxGTK30 makeWrapper ];
postInstall = ''
# don't write data into /
substituteInPlace $out/bin/winusb \
--replace /media/ /tmp/winusb/
wrapProgram $out/bin/winusb \
--prefix PATH : ${stdenv.lib.makeBinPath [ parted grub2_light p7zip ]}
wrapProgram $out/bin/winusbgui \
--prefix PATH : ${stdenv.lib.makeBinPath [ gksu ]}
'';
meta = with stdenv.lib; {
description = "Create bootable USB disks from Windows ISO images";
homepage = https://github.com/slacka/WinUSB;
license = licenses.gpl3;
maintainers = with maintainers; [ bjornfor gnidorah ];
platforms = platforms.linux;
};
}

View file

@ -15,7 +15,7 @@ let
propagatedBuildInputs = with pythonPackages; [
six
requests2
requests
websocket_client
ipaddress
backports_ssl_match_hostname
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
python
unzip
makeWrapper
pythonPackages.requests2
pythonPackages.requests
pythonPackages.psycopg2
pythonPackages.psutil
pythonPackages.ntplib

View file

@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1jsgfkyzzizgfy1b0aicb4cp34d5pwskz9c4a8kf4rq3lrpjw87i";
};
propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
propagatedBuildInputs = with pythonPackages; [ pygments requests ];
doCheck = false;

View file

@ -5,7 +5,7 @@ python2Packages.buildPythonApplication rec {
version = "9.3";
buildInputs = with python2Packages ; [ pytest ];
propagatedBuildInputs = with python2Packages ; [ requests2 ] ++ [ gettext ];
propagatedBuildInputs = with python2Packages ; [ requests ] ++ [ gettext ];
src = fetchurl {
url = "mirror://pypi/L/LinkChecker/${name}.tar.gz";
@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec {
};
# 1. upstream refuses to support ignoring robots.txt
# 2. work around requests2 version detection - can be dropped >v9.3
# 2. work around requests version detection - can be dropped >v9.3
patches = [
./add-no-robots-flag.patch
./no-version-check.patch

View file

@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec {
blinker click certifi construct cryptography
cssutils editorconfig h2 html2text hyperframe
jsbeautifier kaitaistruct passlib pyasn1 pyopenssl
pyparsing pyperclip requests2 ruamel_yaml tornado
pyparsing pyperclip requests ruamel_yaml tornado
urwid watchdog brotlipy sortedcontainers
];

View file

@ -1,8 +1,9 @@
{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps }:
{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps, makeWrapper }:
stdenv.mkDerivation rec {
version = "1.5.2";
name = "reaver-wps-t6x-${version}";
confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
src = fetchFromGitHub {
owner = "t6x";
@ -11,17 +12,27 @@ stdenv.mkDerivation rec {
sha256 = "0zhlms89ncqz1f1hc22yw9x1s837yv76f1zcjizhgn5h7vp17j4b";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpcap sqlite pixiewps ];
prePatch = "cd src";
sourceRoot = "reaver-wps-fork-t6x-v${version}-src/src";
preInstall = "mkdir -p $out/bin";
configureFlags = "--sysconfdir=${confdir}";
meta = {
installPhase = ''
mkdir -p $out/{bin,etc}
cp reaver.db $out/etc/
cp reaver wash $out/bin/
wrapProgram $out/bin/reaver --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db"
wrapProgram $out/bin/wash --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db"
'';
meta = with stdenv.lib; {
description = "Online and offline brute force attack against WPS";
homepage = https://github.com/t6x/reaver-wps-fork-t6x;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainer = stdenv.lib.maintainers.nico202;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nico202 volth ];
};
}

View file

@ -1,27 +1,36 @@
{ stdenv, fetchurl, libpcap, sqlite }:
{ stdenv, fetchurl, libpcap, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
name = "reaver-wps-1.4";
version = "1.4";
name = "reaver-wps-${version}";
confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
src = fetchurl {
url = http://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz;
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/reaver-${version}.tar.gz";
sha256 = "0bdjai4p8xbsw8zdkkk43rgsif79x0nyx4djpyv0mzh59850blxd";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpcap sqlite ];
prePatch = ''
cd src
sourceRoot = "reaver-${version}/src";
configureFlags = "--sysconfdir=${confdir}";
installPhase = ''
mkdir -p $out/{bin,etc}
cp reaver.db $out/etc/
cp reaver wash $out/bin/
wrapProgram $out/bin/reaver --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db"
wrapProgram $out/bin/wash --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db"
'';
preInstall = ''
mkdir -p $out/bin
'';
meta = {
meta = with stdenv.lib; {
description = "Brute force attack against Wifi Protected Setup";
homepage = http://code.google.com/p/reaver-wps;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nico202 volth ];
};
}

View file

@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
keyring
minidb
pyyaml
requests2
requests
];
meta = with stdenv.lib; {

View file

@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
dogpile_cache
click
requests2
requests
characteristic
];

View file

@ -13,15 +13,15 @@ assert x11Support -> xclip != null
&& dmenu != null;
stdenv.mkDerivation rec {
version = "1.7";
version = "1.7.1";
name = "password-store-${version}";
src = fetchurl {
url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
sha256 = "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn";
sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn";
};
patches = [ ./set-correct-program-name-for-sleep.patch
patches = [ ./set-correct-program-name-for-sleep.patch
] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
nativeBuildInputs = [ makeWrapper ];

View file

@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication rec{
colorama
lxml
pyyaml
requests2
requests
external.zodb
]);

View file

@ -0,0 +1,53 @@
{ stdenv, fetchurl }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "socklog-${version}";
version = "2.1.0";
src = fetchurl {
url = "http://smarden.org/socklog/socklog-${version}.tar.gz";
sha256 = "0mdlmhiq2j2fip7c4l669ams85yc3c1s1d89am7dl170grw9m1ma";
};
sourceRoot = "admin/socklog-${version}";
outputs = [ "out" "man" "doc" ];
configurePhase = ''
echo "$NIX_CC/bin/cc $NIX_CFLAGS_COMPILE" >src/conf-cc
echo "$NIX_CC/bin/cc -s" >src/conf-ld
'';
buildPhase = ''package/compile'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv command"/"* $out/bin
for i in {1,8} ; do
mkdir -p $man/share/man/man$i
mv man"/"*.$i $man/share/man/man$i
done
mkdir -p $doc/share/socklog/html
mv doc"/"*.html $doc/share/socklog/html/
runHook postInstall
'';
checkPhase = ''package/check'';
doCheck = true;
meta = {
description = "System and kernel logging services";
homepage = http://smarden.org/socklog/;
license = licenses.publicDomain;
platforms = platforms.unix;
maintainers = [ maintainers.joachifm ];
};
}

Some files were not shown because too many files have changed in this diff Show more