BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tuomas Tynkkynen 2018-01-17 12:52:47 +02:00
commit 884a167f87
180 changed files with 373 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View file

@ -301,6 +301,7 @@
pykms = 282;
kodi = 283;
restya-board = 284;
mighttpd2 = 285;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -570,6 +571,7 @@
pykms = 282;
kodi = 283;
restya-board = 284;
mighttpd2 = 285;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

1
nixos/modules/module-list.nix
View file

@ -633,6 +633,7 @@
./services/web-servers/lighttpd/default.nix
./services/web-servers/lighttpd/gitweb.nix
./services/web-servers/lighttpd/inginious.nix
./services/web-servers/mighttpd2.nix
./services/web-servers/minio.nix
./services/web-servers/nginx/default.nix
./services/web-servers/phpfpm/default.nix

132
nixos/modules/services/web-servers/mighttpd2.nix Normal file
View file

@ -0,0 +1,132 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.mighttpd2;
configFile = pkgs.writeText "mighty-config" cfg.config;
routingFile = pkgs.writeText "mighty-routing" cfg.routing;
in {
options.services.mighttpd2 = {
enable = mkEnableOption "Mighttpd2 web server";
config = mkOption {
default = "";
example = ''
# Example configuration for Mighttpd 2
Port: 80
# IP address or "*"
Host: *
Debug_Mode: Yes # Yes or No
# If available, "nobody" is much more secure for User:.
User: root
# If available, "nobody" is much more secure for Group:.
Group: root
Pid_File: /var/run/mighty.pid
Logging: Yes # Yes or No
Log_File: /var/log/mighty # The directory must be writable by User:
Log_File_Size: 16777216 # bytes
Log_Backup_Number: 10
Index_File: index.html
Index_Cgi: index.cgi
Status_File_Dir: /usr/local/share/mighty/status
Connection_Timeout: 30 # seconds
Fd_Cache_Duration: 10 # seconds
# Server_Name: Mighttpd/3.x.y
Tls_Port: 443
Tls_Cert_File: cert.pem # should change this with an absolute path
# should change this with comma-separated absolute paths
Tls_Chain_Files: chain.pem
# Currently, Tls_Key_File must not be encrypted.
Tls_Key_File: privkey.pem # should change this with an absolute path
Service: 0 # 0 is HTTP only, 1 is HTTPS only, 2 is both
'';
type = types.lines;
description = ''
Verbatim config file to use
(see http://www.mew.org/~kazu/proj/mighttpd/en/config.html)
'';
};
routing = mkOption {
default = "";
example = ''
# Example routing for Mighttpd 2
# Domain lists
[localhost www.example.com]
# Entries are looked up in the specified order
# All paths must end with "/"
# A path to CGI scripts should be specified with "=>"
/~alice/cgi-bin/ => /home/alice/public_html/cgi-bin/
# A path to static files should be specified with "->"
/~alice/ -> /home/alice/public_html/
/cgi-bin/ => /export/cgi-bin/
# Reverse proxy rules should be specified with ">>"
# /path >> host:port/path2
# Either "host" or ":port" can be committed, but not both.
/app/cal/ >> example.net/calendar/
# Yesod app in the same server
/app/wiki/ >> 127.0.0.1:3000/
/ -> /export/www/
'';
type = types.lines;
description = ''
Verbatim routing file to use
(see http://www.mew.org/~kazu/proj/mighttpd/en/config.html)
'';
};
cores = mkOption {
default = null;
type = types.nullOr types.int;
description = ''
How many cores to use.
If null it will be determined automatically
'';
};
};
config = mkIf cfg.enable {
assertions =
[ { assertion = cfg.routing != "";
message = "You need at least one rule in mighttpd2.routing";
}
];
systemd.services.mighttpd2 = {
description = "Mighttpd2 web server";
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = ''
${pkgs.haskellPackages.mighttpd2}/bin/mighty \
${configFile} \
${routingFile} \
+RTS -N${optionalString (cfg.cores != null) "${cfg.cores}"}
'';
Type = "simple";
User = "mighttpd2";
Group = "mighttpd2";
Restart = "on-failure";
AmbientCapabilities = "cap_net_bind_service";
CapabilityBoundingSet = "cap_net_bind_service";
};
};
users.extraUsers.mighttpd2 = {
group = "mighttpd2";
uid = config.ids.uids.mighttpd2;
isSystemUser = true;
};
users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2;
};
meta.maintainers = with lib.maintainers; [ fgaz ];
}

1
pkgs/applications/audio/dfasma/default.nix
View file

@ -62,6 +62,5 @@ in stdenv.mkDerivation rec {
homepage = http://gillesdegottex.github.io/dfasma/;
license = [ licenses.gpl3Plus reaperFork.meta.license ];
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/audio/fmit/default.nix
View file

@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
homepage = http://gillesdegottex.github.io/fmit/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/audio/id3v2/default.nix
View file

@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
description = "A command line editor for id3v2 tags";
homepage = http://id3v2.sourceforge.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ nckx ];
platforms = with platforms; unix;
};
}

1
pkgs/applications/audio/keyfinder-cli/default.nix
View file

@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/audio/keyfinder/default.nix
View file

@ -37,6 +37,5 @@ stdenv.mkDerivation rec {
homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/applications/audio/seq24/default.nix
View file

@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://www.filter24.org/seq24;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu nckx ];
maintainers = with maintainers; [ goibhniu ];
};
}

2
pkgs/applications/editors/neovim/default.nix
View file

@ -32,7 +32,7 @@ let
description = "VT220/xterm/ECMA-48 terminal emulator library";
homepage = http://www.leonerd.org.uk/code/libvterm/;
license = licenses.mit;
maintainers = with maintainers; [ nckx garbas ];
maintainers = with maintainers; [ garbas ];
platforms = platforms.unix;
};
};

1
pkgs/applications/editors/tiled/default.nix
View file

@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
gpl2Plus # all the rest
];
platforms = platforms.linux;
maintainers = [ maintainers.nckx ];
};
}

1
pkgs/applications/graphics/apitrace/default.nix
View file

@ -22,6 +22,5 @@ stdenv.mkDerivation rec {
description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/applications/graphics/sane/backends/generic.nix
View file

@ -71,7 +71,7 @@ stdenv.mkDerivation {
homepage = http://www.sane-project.org/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ nckx peti ];
maintainers = with maintainers; [ peti ];
platforms = platforms.linux;
};
}

1
pkgs/applications/graphics/swingsane/default.nix
View file

@ -57,6 +57,5 @@ stdenv.mkDerivation rec {
homepage = http://swingsane.com/;
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/misc/ganttproject-bin/default.nix
View file

@ -51,6 +51,5 @@ stdenv.mkDerivation rec {
# ‘GPL3-compatible’. See ${downloadPage} for detailed information.
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

4
pkgs/applications/misc/moonlight-embedded/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "moonlight-embedded-${version}";
version = "2.4.2";
version = "2.4.6";
# fetchgit used to ensure submodules are available
src = fetchgit {
url = "git://github.com/irtimmer/moonlight-embedded";
rev = "refs/tags/v${version}";
sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr";
sha256 = "0vs6rjmz8058s9lscagiif6pcizwfrvfpk9rxxgacfi0xisfgmf1";
};
outputs = [ "out" "man" ];

2
pkgs/applications/misc/ocropus/default.nix
View file

@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec {
description = "Open source document analysis and OCR system";
license = licenses.asl20;
homepage = https://github.com/tmbdev/ocropy/;
maintainers = with maintainers; [ domenkozar nckx viric ];
maintainers = with maintainers; [ domenkozar viric ];
platforms = platforms.linux;
};
}

5
pkgs/applications/misc/qlcplus/default.nix
View file

@ -5,13 +5,13 @@
mkDerivation rec {
name = "qlcplus-${version}";
version = "4.11.0";
version = "4.11.1";
src = fetchFromGitHub {
owner = "mcallegari";
repo = "qlcplus";
rev = "QLC+_${version}";
sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg";
sha256 = "0lb1mdp7kbnkja14phgyknr65irwkxcmzk96rqacysvwrvzvfzyd";
};
nativeBuildInputs = [ qmake pkgconfig ];
@ -34,5 +34,6 @@ mkDerivation rec {
maintainers = [ maintainers.globin ];
license = licenses.asl20;
platforms = platforms.all;
homepage = "http://www.qlcplus.org/";
};
}

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 nckx ];
maintainers = with maintainers; [ mornfall yegortimoshenko ];
};
}

2
pkgs/applications/misc/workrave/default.nix
View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
homepage = http://www.workrave.org/;
downloadPage = https://github.com/rcaelers/workrave/releases;
license = licenses.gpl3;
maintainers = with maintainers; [ nckx prikhi ];
maintainers = with maintainers; [ prikhi ];
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/errbot/default.nix
View file

@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
name = "errbot-${version}";
version = "5.1.2";
version = "5.1.3";
src = fetchurl {
url = "mirror://pypi/e/errbot/${name}.tar.gz";
sha256 = "1r9w7pmdw77h1hwxns6d0sdg8cndsq1lwkq0y5qiiqr91jz93ajm";
sha256 = "0nkfq6fx87g7kvxrb5lp8gkb75658cmyffnacpy8jq3a16py3jrr";
};
disabled = !pythonPackages.isPy3k;

1
pkgs/applications/networking/feedreaders/rawdog/default.nix
View file

@ -18,6 +18,5 @@ python2Packages.buildPythonApplication rec {
description = "RSS Aggregator Without Delusions Of Grandeur";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/networking/feedreaders/rsstail/default.nix
View file

@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
homepage = http://www.vanheusden.com/rsstail/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

6
pkgs/applications/networking/mailreaders/claws-mail/default.nix
View file

@ -32,19 +32,17 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "claws-mail-${version}";
version = "3.15.1";
version = "3.16.0";
src = fetchurl {
url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd";
sha256 = "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2";
};
outputs = [ "out" "dev" ];
patches = [ ./mime.patch ];
hardeningDisable = [ "format" ];
postPatch = ''
substituteInPlace src/procmime.c \
--subst-var-by MIMEROOTDIR ${shared_mime_info}/share

1
pkgs/applications/networking/remote/x2goclient/default.nix
View file

@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
homepage = http://x2go.org/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/networking/vnstat/default.nix
View file

@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
'';
homepage = http://humdi.net/vnstat/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ nckx ];
platforms = platforms.linux;
};
}

1
pkgs/applications/version-management/git-and-tools/git-bz/default.nix
View file

@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = http://git.fishsoup.net/cgit/git-bz/;
maintainers = with maintainers; [ nckx ];
platforms = platforms.linux;
};
}

1
pkgs/applications/version-management/git-and-tools/git-hub/default.nix
View file

@ -40,6 +40,5 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

6
pkgs/applications/version-management/gitlab/default.nix
View file

@ -18,11 +18,11 @@ let
};
};
version = "10.3.3";
version = "10.3.4";
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
sha256 = "0bnafl7mpm3vjhfkqwgf5ff1y1iixfdfvv25zmpl0yjd70fwx2aq";
sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica";
};
in
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
sha256 = "1fhjijs8rvxrgx43fc7vp6f3vwshwq74gjwk41fi2yam8bri8p6k";
sha256 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1";
};
buildInputs = [

1
pkgs/applications/video/clipgrab/default.nix
View file

@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
homepage = https://clipgrab.org/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/video/gnome-mpv/default.nix
View file

@ -37,6 +37,5 @@ stdenv.mkDerivation rec {
homepage = https://github.com/gnome-mpv/gnome-mpv;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/video/minitube/default.nix
View file

@ -36,6 +36,5 @@ stdenv.mkDerivation rec {
homepage = https://flavio.tordini.org/minitube;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/applications/virtualization/remotebox/default.nix
View file

@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
RemoteBox aims to fill this gap by providing a graphical VirtualBox
client which is able to manage a VirtualBox server installation.
'';
maintainers = with maintainers; [ nckx ];
platforms = platforms.all;
};
}

1
pkgs/data/documentation/man-pages/default.nix
View file

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
description = "Linux development manual pages";
homepage = https://www.kernel.org/doc/man-pages/;
repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
maintainers = with maintainers; [ nckx ];
platforms = with platforms; unix;
};
}

1
pkgs/data/fonts/hack/default.nix
View file

@ -37,6 +37,5 @@ in fetchzip rec {
*/
license = licenses.free;
platforms = platforms.all;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/data/misc/geolite-legacy/default.nix
View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
homepage = https://geolite.maxmind.com/download/geoip;
license = licenses.cc-by-sa-30;
platforms = platforms.all;
maintainers = with maintainers; [ nckx fpletz ];
maintainers = with maintainers; [ fpletz ];
};
builder = ./builder.sh;

1
pkgs/data/misc/sound-theme-freedesktop/default.nix
View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
# See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS:
license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ];
maintainers = with maintainers; [ nckx ];
platforms = with platforms; unix;
};
}

2
pkgs/data/misc/wireless-regdb/default.nix
View file

@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = http://wireless.kernel.org/en/developers/Regulatory/;
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ nckx fpletz ];
maintainers = with maintainers; [ fpletz ];
};
}

1
pkgs/desktops/gnome-3/core/simple-scan/default.nix
View file

@ -52,6 +52,5 @@ stdenv.mkDerivation rec {
homepage = https://launchpad.net/simple-scan;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

5
pkgs/development/compilers/llvm/4/lldb.nix
View file

@ -43,6 +43,11 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
postInstall = ''
mkdir -p $out/share/man/man1
cp ../docs/lldb.1 $out/share/man/man1/
'';
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;

5
pkgs/development/compilers/llvm/5/lldb.nix
View file

@ -42,6 +42,11 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
postInstall = ''
mkdir -p $out/share/man/man1
cp ../docs/lldb.1 $out/share/man/man1/
'';
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;

1
pkgs/development/compilers/squeak/default.nix
View file

@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
downloadPage = http://squeakvm.org/unix/index.html;
license = with licenses; [ asl20 mit ];
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/interpreters/picoc/default.nix
View file

@ -47,6 +47,5 @@ stdenv.mkDerivation rec {
downloadPage = https://code.google.com/p/picoc/downloads/list;
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/accounts-qt/default.nix
View file

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
description = "Qt library for accessing the online accounts database";
homepage = https://gitlab.com/accounts-sso;
license = licenses.lgpl21;
maintainers = with maintainers; [ nckx ];
platforms = with platforms; linux;
};
}

1
pkgs/development/libraries/bobcat/default.nix
View file

@ -39,6 +39,5 @@ stdenv.mkDerivation rec {
homepage = https://fbb-git.github.io/bobcat/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/cpp-netlib/default.nix
View file

@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
homepage = http://cpp-netlib.org;
license = licenses.boost;
platforms = platforms.all;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/ip2location-c/default.nix
View file

@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
homepage = http://www.ip2location.com/developers/c-7;
license = with licenses; [ gpl3Plus lgpl3Plus ];
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/libcli/default.nix
View file

@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
homepage = http://sites.dparrish.com/libcli;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/libconfuse/default.nix
View file

@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
'';
license = licenses.isc;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/libkeyfinder/default.nix
View file

@ -34,6 +34,5 @@ stdenv.mkDerivation rec {
homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/libnetfilter_conntrack/default.nix
View file

@ -24,6 +24,5 @@ stdenv.mkDerivation rec {
homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/development/libraries/libnetfilter_log/default.nix
View file

@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = http://netfilter.org/projects/libnetfilter_log/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ orivej nckx ];
maintainers = with maintainers; [ orivej ];
};
}

1
pkgs/development/libraries/libpsl/default.nix
View file

@ -64,6 +64,5 @@ in stdenv.mkDerivation rec {
homepage = http://rockdaboot.github.io/libpsl/;
license = licenses.mit;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ nckx ];
};
}

4
pkgs/development/libraries/libressl/default.nix
View file

@ -33,7 +33,7 @@ in {
};
libressl_2_6 = generic {
version = "2.6.2";
sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh";
version = "2.6.4";
sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";
};
}

1
pkgs/development/libraries/libxcomp/default.nix
View file

@ -23,6 +23,5 @@ stdenv.mkDerivation rec {
homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/libraries/lzo/default.nix
View file

@ -30,6 +30,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ nckx ];
};
}

4
pkgs/development/libraries/rabbitmq-c/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "rabbitmq-c-${version}";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "alanxz";
repo = "rabbitmq-c";
rev = "v${version}";
sha256 = "084zlir59zc505nxd4m2g9d355m9a8y94gbjaqmjz9kym8lpayd1";
sha256 = "0vjh1q3hyzrq1iiddy28vvwpwwn4px00mjc2hqp4zgfpis2xlqbj";
};
buildInputs = [ cmake openssl popt xmlto ];

1
pkgs/development/libraries/rote/default.nix
View file

@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
homepage = http://rote.sourceforge.net/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/development/python-modules/Pygments/default.nix
View file

@ -23,6 +23,6 @@ buildPythonPackage rec {
homepage = http://pygments.org/;
description = "A generic syntax highlighter";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ nckx garbas ];
maintainers = with lib.maintainers; [ garbas ];
};
}

4
pkgs/development/python-modules/django/1_11.nix
View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "Django";
name = "${pname}-${version}";
version = "1.11.8";
version = "1.11.9";
disabled = pythonOlder "2.7";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
sha256 = "04gphaarwj1yrhhpi9im6gsg77i2vv0iwyjc0pmxba53nndyglzy";
sha256 = "0d0hh9sh2rwazi7z2lnqvz1424bq6ps6c5h6ss04klp14agi4g9m";
};
patches = stdenv.lib.optionals withGdal [

30
pkgs/development/python-modules/nimfa/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, numpy
, scipy
, matplotlib
, pytest
}:
buildPythonPackage rec {
pname = "nimfa";
version = "1.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "0iqcrr48jwy7nh8g13xf4rvpw9wq5qs3hyd6gqlh30mgyn9i85w7";
};
propagatedBuildInputs = [ numpy scipy ];
checkInputs = [ matplotlib pytest ];
doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42
meta = with stdenv.lib; {
description = "Nonnegative matrix factorization library";
homepage = "http://nimfa.biolab.si";
license = licenses.bsd3;
maintainers = with maintainers; [ ashgillman ];
};
}

8
pkgs/development/python-modules/notebook/default.nix
View file

@ -17,17 +17,17 @@
, ipykernel
, terminado
, requests
, send2trash
, pexpect
}:
buildPythonPackage rec {
pname = "notebook";
version = "5.2.2";
name = "${pname}-${version}";
version = "5.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "7bb54fb61b9c5426bc116f840541b973431198e00ea2896122d05fc122dbbd67";
sha256 = "12vk3shylx61whdchxbg71mdlwiw2l31vl227sqwpb0p67bbw2rq";
};
LC_ALL = "en_US.utf8";
@ -36,7 +36,7 @@ buildPythonPackage rec {
++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
propagatedBuildInputs = [
jinja2 tornado ipython_genutils traitlets jupyter_core
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
];

50
pkgs/development/python-modules/progressbar2/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv
, python
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pytest
, python-utils
, sphinx
, coverage
, execnet
, flake8
, pytestpep8
, pytestflakes
, pytestcov
, pytestcache
, pep8
}:
buildPythonPackage rec {
pname = "progressbar2";
version = "3.12.0";
# Use source from GitHub, PyPI is missing tests
# https://github.com/WoLpH/python-progressbar/issues/151
src = fetchFromGitHub {
owner = "WoLpH";
repo = "python-progressbar";
rev = "v${version}";
sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f";
};
propagatedBuildInputs = [ python-utils ];
checkInputs = [
pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov
pytestcache pep8
];
# ignore tests on the nix wrapped setup.py and don't flake .eggs directory
checkPhase = ''
runHook preCheck
${python.interpreter} setup.py test --addopts "--ignore=nix_run_setup.py --ignore=.eggs"
runHook postCheck
'';
meta = with stdenv.lib; {
homepage = https://progressbar-2.readthedocs.io/en/latest/;
description = "Text progressbar library for python";
license = licenses.bsd3;
maintainers = with maintainers; [ ashgillman ];
};
}

1
pkgs/development/python-modules/prompt_toolkit/default.nix
View file

@ -35,6 +35,5 @@ buildPythonPackage rec {
'';
homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ nckx ];
};
}

27
pkgs/development/python-modules/send2trash/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
, configparser
}:
buildPythonPackage rec {
pname = "Send2Trash";
version = "1.4.2";
src = fetchFromGitHub {
owner = "hsoft";
repo = "send2trash";
rev = version;
sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx";
};
checkPhase = "HOME=. py.test";
checkInputs = [ pytest configparser ];
meta = with lib; {
description = "Send file to trash natively under macOS, Windows and Linux";
homepage = https://github.com/hsoft/send2trash;
license = licenses.bsd3;
};
}

24
pkgs/development/python-modules/terminado/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, ptyprocess
, tornado
}:
buildPythonPackage rec {
pname = "terminado";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "0yh69k6579g848rmjyllb5h75pkvgcy27r1l3yzgkf33wnnzkasm";
};
propagatedBuildInputs = [ ptyprocess tornado ];
meta = with lib; {
description = "Terminals served by Tornado websockets";
homepage = https://github.com/jupyter/terminado;
license = licenses.bsd2;
};
}

1
pkgs/development/tools/alloy/default.nix
View file

@ -54,6 +54,5 @@ stdenv.mkDerivation rec {
downloadPage = http://alloy.mit.edu/alloy/download.html;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/tools/analysis/coan/default.nix
View file

@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
homepage = http://coan2.sourceforge.net/;
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/tools/analysis/egypt/default.nix
View file

@ -28,6 +28,5 @@ buildPerlPackage rec {
homepage = http://www.gson.org/egypt/;
license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/tools/analysis/include-what-you-use/default.nix
View file

@ -30,6 +30,5 @@ stdenv.mkDerivation rec {
homepage = http://include-what-you-use.org;
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/development/tools/build-managers/icmake/default.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
description = "A program maintenance (make) utility using a C-like grammar";
homepage = https://fbb-git.github.io/icmake/;
license = licenses.gpl3;
maintainers = with maintainers; [ nckx pSub ];
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
};
}

1
pkgs/development/tools/database/pgcli/default.nix
View file

@ -35,6 +35,5 @@ pythonPackages.buildPythonApplication rec {
'';
homepage = https://pgcli.com;
license = licenses.bsd3;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/tools/java/cfr/default.nix
View file

@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
homepage = http://www.benf.org/other/cfr/;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/tools/misc/bin_replace_string/default.nix
View file

@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
downloadPage = ftp://ohnopub.net/mirror/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/tools/misc/ccache/default.nix
View file

@ -69,7 +69,6 @@ let ccache = stdenv.mkDerivation rec {
homepage = http://ccache.samba.org/;
downloadPage = https://ccache.samba.org/download.html;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ nckx ];
platforms = platforms.unix;
};
};

6
pkgs/development/tools/misc/kibana/5.x.nix
View file

@ -11,9 +11,9 @@ let
elasticArch = archOverrides."${arch}" or arch;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "09bck05dfq4j1csyghlpw86nzn28kpx8ikli3v1s4si2hbxb1ifr";
"i686-linux" = "0ql1611wg7i9vwqr4wmz04606hjj7w224ak34svfsn6qxyrh2dbb";
"x86_64-darwin" = "1x24rqkkc9slm7jbyy41q5c2rbn17h85m0k6h3ijiafky6cv0cz2";
"x86_64-linux" = "1a9n7s9r0klqvpyr5d3a410cchbsb0syx6cqwbhhnihqyw8dcx1i";
"i686-linux" = "0snnm5jwynvk6ahgl42yzl2jhld0ykn79rlcq9dsv2gpqnjb2mmv";
"x86_64-darwin" = "0qw3xkj3n3aja8s8n9r4hbr65jm9m6dgfjhhnrln434648rx7z4v";
};
in stdenv.mkDerivation rec {
name = "kibana-${version}";

4
pkgs/development/tools/misc/kibana/6.x.nix
View file

@ -7,8 +7,8 @@ let
arch = elemAt info 0;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "0847flk4sfimcdx9wqkaglk7bvbnz1iyindz10z0d1fvbldivp46";
"x86_64-darwin" = "03f7l91r6nczzzlqxsxkpzzwafpy45fx4lss4g6kg022rwisdma7";
"x86_64-linux" = "0kgsafjn8wzrmiklfc8jg0h3cx25lhlkby8yz35wgpx4wbk3vfjx";
"x86_64-darwin" = "0i2kq9vyjv151kk7h3dl3hjrqqgxsg0qqxdqwjwlz9ja5axzlxhd";
};
in stdenv.mkDerivation rec {
name = "kibana-${version}";

2
pkgs/development/tools/misc/yodl/default.nix
View file

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
description = "A package that implements a pre-document language and tools to process it";
homepage = https://fbb-git.github.io/yodl/;
license = licenses.gpl3;
maintainers = with maintainers; [ nckx pSub ];
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
};
}

1
pkgs/development/tools/parsing/flexc++/default.nix
View file

@ -43,6 +43,5 @@ stdenv.mkDerivation rec {
homepage = https://fbb-git.github.io/flexcpp/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/development/tools/parsing/lemon/default.nix
View file

@ -41,6 +41,5 @@ in stdenv.mkDerivation rec {
homepage = http://www.hwaci.com/sw/lemon/;
license = licenses.publicDomain;
platforms = platforms.unix;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/games/2048-in-terminal/default.nix
View file

@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
description = "Animated console version of the 2048 game";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

4
pkgs/games/bzflag/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bzflag";
version = "2.4.10";
version = "2.4.12";
src = fetchurl {
url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa";
sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/games/eduke32/default.nix
View file

@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
description = "Enhanched port of Duke Nukem 3D for various platforms";
license = licenses.gpl2Plus;
homepage = http://eduke32.com;
maintainers = with maintainers; [ nckx sander ];
maintainers = with maintainers; [ sander ];
platforms = with platforms; linux;
};
}

2
pkgs/games/soi/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A physics-based puzzle game";
maintainers = with maintainers; [ raskin nckx ];
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.free;
downloadPage = http://sourceforge.net/projects/soi/files/;

1
pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
View file

@ -38,6 +38,5 @@ in stdenv.mkDerivation rec {
homepage = http://www.samsung.com/;
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/misc/cups/drivers/samsung/default.nix
View file

@ -94,6 +94,5 @@ in stdenv.mkDerivation rec {
# Tested on linux-x86_64. Might work on linux-i386.
# Probably won't work on anything else.
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/misc/logging/beats/5.x.nix
View file

@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
sha256 = "0pp4in66byggcfmvf8yx0m1vra98cs77m7mbr45sdla4hinvaqar";
sha256 = "0ri2l8pyl1fnx0zypliwprkk1wkaxz8ywkgz8h2f08v7h1zgq1m6";
};
goPackagePath = "github.com/elastic/beats";

2
pkgs/misc/logging/beats/6.x.nix
View file

@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
sha256 = "1vifxa0v6ha29ijvgnrkx02syckhydg6vjxjqbm8y8zysvnh1869";
sha256 = "05ay6hdc1jgi6b00bd998zc39ca8jhnk7i6m3mw70s0baqv1scik";
};
goPackagePath = "github.com/elastic/beats";

1
pkgs/os-specific/linux/acpid/default.nix
View file

@ -13,6 +13,5 @@ stdenv.mkDerivation rec {
description = "A daemon for delivering ACPI events to userspace programs";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

4
pkgs/os-specific/linux/batman-adv/alfred.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
let
ver = "2017.3";
ver = "2017.4";
in
stdenv.mkDerivation rec {
name = "alfred-${ver}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "0202mxp7hwflkqnkkajx5lv1nxjng45q5gcvvdv68x46p8ikb5n2";
sha256 = "126wfmng4x19k8n4930v03qbjhwrikq9bvhl7mlng1k2fpx1msn4";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/os-specific/linux/batman-adv/batctl.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libnl }:
let
ver = "2017.3";
ver = "2017.4";
in
stdenv.mkDerivation rec {
name = "batctl-${ver}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "1a48kc2v8cb1757pxlli96qf3d7x7k3qw04rjadfs0iy09sz1ir9";
sha256 = "0r742krc9mn677wmfwbhwhqq9739n74vpw0xfasvy7d59nn6lz84";
};
nativeBuildInputs = [ pkgconfig ];

6
pkgs/os-specific/linux/batman-adv/default.nix
View file

@ -1,15 +1,17 @@
{ stdenv, fetchurl, kernel }:
let base = "batman-adv-2017.3"; in
let base = "batman-adv-2017.4"; in
stdenv.mkDerivation rec {
name = "${base}-${kernel.version}";
src = fetchurl {
url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
sha256 = "1m541czjwgi4rfhjr6rg9r9c3cp2ncnif4ln7ri926zigwlxs3l3";
sha256 = "0k4sf52sbk39m25w6plk8spwcf4kzc3axckyk2r6anxxsangyl4a";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
preBuild = ''

1
pkgs/os-specific/linux/cifs-utils/default.nix
View file

@ -18,6 +18,5 @@ stdenv.mkDerivation rec {
description = "Tools for managing Linux CIFS client filesystems";
platforms = platforms.linux;
license = licenses.lgpl3;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/os-specific/linux/conntrack-tools/default.nix
View file

@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
description = "Connection tracking userspace tools";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ nckx fpletz ];
maintainers = with maintainers; [ fpletz ];
};
}

1
pkgs/os-specific/linux/crda/default.nix
View file

@ -53,6 +53,5 @@ stdenv.mkDerivation rec {
homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/;
license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

2
pkgs/os-specific/linux/dstat/default.nix
View file

@ -19,6 +19,6 @@ python2Packages.buildPythonApplication rec {
description = "Versatile resource statistics tool";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ jgeerds nckx ];
maintainers = with maintainers; [ jgeerds ];
};
}

1
pkgs/os-specific/linux/fatrace/default.nix
View file

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
Requires a Linux kernel with the FANOTIFY configuration option enabled.
Enabling X86_MSR is also recommended for power-usage-report on x86.
'';
maintainers = with maintainers; [ nckx ];
platforms = platforms.linux;
};
}

1
pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
View file

@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
homepage = http://wireless.kernel.org/en/users/Drivers/b43;
downloadPage = http://www.lwfinger.com/b43-firmware;
license = licenses.unfree;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/os-specific/linux/freefall/default.nix
View file

@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
}

1
pkgs/os-specific/linux/ftop/default.nix
View file

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
generally all that is of interest to the user).
As with top, the items are displayed in order from most to least active.
'';
maintainers = with maintainers; [ nckx ];
platforms = platforms.linux;
};
}

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