Merge branch 'master' into staging
This commit is contained in:
Vladimír Čunát
commit
e962a3c95f
@ -249,6 +249,7 @@
|
||||
koral = "Koral <koral@mailoo.org>";
|
||||
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
|
||||
kragniz = "Louis Taylor <louis@kragniz.eu>";
|
||||
kristoff3r = "Kristoffer Søholm <k.soeholm@gmail.com>";
|
||||
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
|
||||
lassulus = "Lassulus <lassulus@gmail.com>";
|
||||
layus = "Guillaume Maudoux <layus.on@gmail.com>";
|
||||
|
||||
@ -287,6 +287,7 @@
|
||||
pdns-recursor = 269;
|
||||
kresd = 270;
|
||||
rpc = 271;
|
||||
geoip = 272;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
@ -543,6 +544,7 @@
|
||||
gogs = 268;
|
||||
kresd = 270;
|
||||
#rpc = 271; # unused
|
||||
#geoip = 272; # unused
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
||||
@ -212,6 +212,17 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
enableKwallet = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If enabled, pam_wallet will attempt to automatically unlock the
|
||||
user's default KDE wallet upon login. If the user has no wallet named
|
||||
"kdewallet", or the login password does not match their wallet
|
||||
password, KDE will prompt separately after login.
|
||||
'';
|
||||
};
|
||||
|
||||
text = mkOption {
|
||||
type = types.nullOr types.lines;
|
||||
description = "Contents of the PAM service file.";
|
||||
@ -262,12 +273,15 @@ let
|
||||
# prompts the user for password so we run it once with 'required' at an
|
||||
# earlier point and it will run again with 'sufficient' further down.
|
||||
# We use try_first_pass the second time to avoid prompting password twice
|
||||
(optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount)) ''
|
||||
(optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) ''
|
||||
auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
|
||||
${optionalString config.security.pam.enableEcryptfs
|
||||
"auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
|
||||
${optionalString cfg.pamMount
|
||||
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
|
||||
${optionalString cfg.enableKwallet
|
||||
("auth optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
|
||||
" kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
|
||||
'') + ''
|
||||
${optionalString cfg.unixAuth
|
||||
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
|
||||
@ -334,6 +348,9 @@ let
|
||||
"session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
|
||||
${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
|
||||
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
|
||||
${optionalString (cfg.enableKwallet)
|
||||
("session optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
|
||||
" kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
|
||||
'');
|
||||
};
|
||||
|
||||
|
||||
@ -99,31 +99,35 @@ in
|
||||
security.wrappers = lib.mkOption {
|
||||
type = lib.types.attrs;
|
||||
default = {};
|
||||
example = {
|
||||
sendmail.source = "/nix/store/.../bin/sendmail";
|
||||
ping = {
|
||||
source = "${pkgs.iputils.out}/bin/ping";
|
||||
owner = "nobody";
|
||||
group = "nogroup";
|
||||
capabilities = "cap_net_raw+ep";
|
||||
};
|
||||
};
|
||||
example = lib.literalExample
|
||||
''
|
||||
{ sendmail.source = "/nix/store/.../bin/sendmail";
|
||||
ping = {
|
||||
source = "${pkgs.iputils.out}/bin/ping";
|
||||
owner = "nobody";
|
||||
group = "nogroup";
|
||||
capabilities = "cap_net_raw+ep";
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
This option allows the ownership and permissions on the setuid
|
||||
wrappers for specific programs to be overridden from the
|
||||
default (setuid root, but not setgid root).
|
||||
|
||||
<note>
|
||||
<para>The sub-attribute <literal>source</literal> is mandatory,
|
||||
it must be the absolute path to the program to be wrapped.
|
||||
</para>
|
||||
|
||||
<para>The sub-attribute <literal>program</literal> is optional and
|
||||
can give the wrapper program a new name. The default name is the same
|
||||
as the attribute name itself.</para>
|
||||
|
||||
<para>Additionally, this option can set capabilities on a
|
||||
wrapper program that propagates those capabilities down to the
|
||||
wrapped, real program.</para>
|
||||
|
||||
<para>The <literal>program</literal> attribute is the name of
|
||||
the program to be wrapped. If no <literal>source</literal>
|
||||
attribute is provided, specifying the absolute path to the
|
||||
program, then the program will be searched for in the path
|
||||
environment variable.</para>
|
||||
|
||||
<para>NOTE: cap_setpcap, which is required for the wrapper
|
||||
program to be able to raise caps into the Ambient set is NOT
|
||||
raised to the Ambient set so that the real program cannot
|
||||
|
||||
@ -251,6 +251,12 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
users.extraUsers.geoip = {
|
||||
group = "root";
|
||||
description = "GeoIP database updater";
|
||||
uid = config.ids.uids.geoip;
|
||||
};
|
||||
|
||||
systemd.timers.geoip-updater =
|
||||
{ description = "GeoIP Updater Timer";
|
||||
partOf = [ "geoip-updater.service" ];
|
||||
@ -267,11 +273,11 @@ in
|
||||
preStart = ''
|
||||
mkdir -p "${cfg.databaseDir}"
|
||||
chmod 755 "${cfg.databaseDir}"
|
||||
chown nobody:root "${cfg.databaseDir}"
|
||||
chown geoip:root "${cfg.databaseDir}"
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = "${geoip-updater}/bin/geoip-updater";
|
||||
User = "nobody";
|
||||
User = "geoip";
|
||||
PermissionsStartOnly = true;
|
||||
};
|
||||
};
|
||||
@ -285,11 +291,11 @@ in
|
||||
preStart = ''
|
||||
mkdir -p "${cfg.databaseDir}"
|
||||
chmod 755 "${cfg.databaseDir}"
|
||||
chown nobody:root "${cfg.databaseDir}"
|
||||
chown geoip:root "${cfg.databaseDir}"
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing";
|
||||
User = "nobody";
|
||||
User = "geoip";
|
||||
PermissionsStartOnly = true;
|
||||
# So it won't be (needlessly) restarted:
|
||||
RemainAfterExit = true;
|
||||
|
||||
@ -54,6 +54,7 @@ in {
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
WorkingDirectory = /tmp;
|
||||
AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
|
||||
-web.listen-address :${toString cfg.port} \
|
||||
|
||||
@ -25,12 +25,12 @@ in
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.quasselDaemon_qt5;
|
||||
defaultText = "pkgs.quasselDaemon_qt5";
|
||||
default = pkgs.quasselDaemon;
|
||||
defaultText = "pkgs.quasselDaemon";
|
||||
description = ''
|
||||
The package of the quassel daemon.
|
||||
'';
|
||||
example = literalExample "pkgs.quasselDaemon_qt5";
|
||||
example = literalExample "pkgs.quasselDaemon";
|
||||
};
|
||||
|
||||
interfaces = mkOption {
|
||||
|
||||
@ -42,13 +42,14 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
security.wrappers = map (program: {"${program}" = {
|
||||
source = "${pkgs.atd}/bin/${program}";
|
||||
security.wrappers = builtins.listToAttrs (
|
||||
map (program: { name = "${program}"; value = {
|
||||
source = "${at}/bin/${program}";
|
||||
owner = "atd";
|
||||
group = "atd";
|
||||
setuid = true;
|
||||
setgid = true;
|
||||
};}) [ "at" "atq" "atrm" "batch" ];
|
||||
};}) [ "at" "atq" "atrm" "batch" ]);
|
||||
|
||||
environment.systemPackages = [ at ];
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ in
|
||||
|
||||
{ services.cron.enable = mkDefault (allFiles != []); }
|
||||
(mkIf (config.services.cron.enable) {
|
||||
security.wrappers.crontab.source = "${pkgs.cronNixosPkg.out}/bin/crontab";
|
||||
security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab";
|
||||
environment.systemPackages = [ cronNixosPkg ];
|
||||
environment.etc.crontab =
|
||||
{ source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; }
|
||||
|
||||
@ -103,6 +103,8 @@ in
|
||||
kde5.kservice
|
||||
kde5.ktextwidgets
|
||||
kde5.kwallet
|
||||
kde5.kwallet-pam
|
||||
kde5.kwalletmanager
|
||||
kde5.kwayland
|
||||
kde5.kwidgetsaddons
|
||||
kde5.kxmlgui
|
||||
@ -234,6 +236,14 @@ in
|
||||
|
||||
security.pam.services.kde = { allowNullPassword = true; };
|
||||
|
||||
# Doing these one by one seems silly, but we currently lack a better
|
||||
# construct for handling common pam configs.
|
||||
security.pam.services.gdm.enableKwallet = true;
|
||||
security.pam.services.kdm.enableKwallet = true;
|
||||
security.pam.services.lightdm.enableKwallet = true;
|
||||
security.pam.services.sddm.enableKwallet = true;
|
||||
security.pam.services.slim.enableKwallet = true;
|
||||
|
||||
# use kimpanel as the default IBus panel
|
||||
i18n.inputMethod.ibus.panel =
|
||||
lib.mkDefault
|
||||
|
||||
@ -5,6 +5,11 @@ with utils;
|
||||
|
||||
let
|
||||
|
||||
addCheckDesc = desc: elemType: check: types.addCheck elemType check
|
||||
// { description = "${elemType.description} (with check: ${desc})"; };
|
||||
nonEmptyStr = addCheckDesc "non-empty" types.str
|
||||
(x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x)));
|
||||
|
||||
fileSystems' = toposort fsBefore (attrValues config.fileSystems);
|
||||
|
||||
fileSystems = if fileSystems' ? "result"
|
||||
@ -26,21 +31,21 @@ let
|
||||
|
||||
mountPoint = mkOption {
|
||||
example = "/mnt/usb";
|
||||
type = types.str;
|
||||
type = nonEmptyStr;
|
||||
description = "Location of the mounted the file system.";
|
||||
};
|
||||
|
||||
device = mkOption {
|
||||
default = null;
|
||||
example = "/dev/sda";
|
||||
type = types.nullOr types.str;
|
||||
type = types.nullOr nonEmptyStr;
|
||||
description = "Location of the device.";
|
||||
};
|
||||
|
||||
fsType = mkOption {
|
||||
default = "auto";
|
||||
example = "ext3";
|
||||
type = types.str;
|
||||
type = nonEmptyStr;
|
||||
description = "Type of the file system.";
|
||||
};
|
||||
|
||||
@ -48,7 +53,7 @@ let
|
||||
default = [ "defaults" ];
|
||||
example = [ "data=journal" ];
|
||||
description = "Options used to mount the file system.";
|
||||
type = types.listOf types.str;
|
||||
type = types.listOf nonEmptyStr;
|
||||
};
|
||||
|
||||
};
|
||||
@ -67,7 +72,7 @@ let
|
||||
label = mkOption {
|
||||
default = null;
|
||||
example = "root-partition";
|
||||
type = types.nullOr types.str;
|
||||
type = types.nullOr nonEmptyStr;
|
||||
description = "Label of the device (if any).";
|
||||
};
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ in
|
||||
###### implementation
|
||||
|
||||
config = mkMerge [
|
||||
(mkIf (!setVconsole || (setVconsole && config.boot.earlyVconsoleSetup)) {
|
||||
(mkIf (!setVconsole) {
|
||||
systemd.services."systemd-vconsole-setup".enable = false;
|
||||
})
|
||||
|
||||
@ -97,17 +97,25 @@ in
|
||||
printf "${makeColorCS n color}" >> /dev/console
|
||||
'') config.i18n.consoleColors}
|
||||
'';
|
||||
}
|
||||
|
||||
(mkIf (!config.boot.earlyVconsoleSetup) {
|
||||
/* XXX: systemd-vconsole-setup needs a "main" terminal. By default
|
||||
* /dev/tty0 is used which wouldn't work when the service is restarted
|
||||
* from X11. We set this to /dev/tty1; not ideal because it may also be
|
||||
* owned by X11 or something else.
|
||||
*
|
||||
* See #22470.
|
||||
*/
|
||||
systemd.services."systemd-vconsole-setup" =
|
||||
{ wantedBy = [ "sysinit.target" ];
|
||||
before = [ "display-manager.service" ];
|
||||
after = [ "systemd-udev-settle.service" ];
|
||||
restartTriggers = [ vconsoleConf kbdEnv ];
|
||||
restartIfChanged = false; # fails when tty is inactive
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
"${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1"
|
||||
];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
(mkIf config.boot.earlyVconsoleSetup {
|
||||
boot.initrd.extraUtilsCommands = ''
|
||||
|
||||
@ -1,20 +1,18 @@
|
||||
{ config, pkgs, modulesPath, ... }:
|
||||
|
||||
# This attempts to pull a nix expression from this EC2 instance's user-data.
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
bootScript = pkgs.writeScript "bootscript.sh" ''
|
||||
script = ''
|
||||
#!${pkgs.stdenv.shell} -eu
|
||||
|
||||
echo "attempting to fetch configuration from EC2 user data..."
|
||||
|
||||
export HOME=/root
|
||||
export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
|
||||
export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
|
||||
|
||||
userData=/etc/ec2-metadata/user-data
|
||||
|
||||
if [ -s "$userData" ]; then
|
||||
|
||||
# If the user-data looks like it could be a nix expression,
|
||||
# copy it over. Also, look for a magic three-hash comment and set
|
||||
# that as the channel.
|
||||
@ -43,7 +41,22 @@ let
|
||||
nixos-rebuild switch
|
||||
'';
|
||||
in {
|
||||
boot.postBootCommands = ''
|
||||
${bootScript} &
|
||||
'';
|
||||
systemd.services.amazon-init = {
|
||||
inherit script;
|
||||
description = "Reconfigure the system from EC2 userdata on startup";
|
||||
|
||||
wantedBy = [ "sshd.service" ];
|
||||
before = [ "sshd.service" ];
|
||||
after = [ "network-online.target" ];
|
||||
requires = [ "network-online.target" ];
|
||||
|
||||
restartIfChanged = false;
|
||||
unitConfig.X-StopOnRemoval = false;
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -424,6 +424,29 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
yedit = buildEclipsePlugin rec {
|
||||
name = "yedit-${version}";
|
||||
version = "1.0.20.201509041456";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
url = "http://dadacoalition.org/yedit/features/org.dadacoalition.yedit.feature_${version}-RELEASE.jar";
|
||||
sha256 = "0rps73y19gwlrdr8jjrg3rhcaaagghnmri8297inxc5q2dvg0mlk";
|
||||
};
|
||||
|
||||
srcPlugin = fetchurl {
|
||||
url = "http://dadacoalition.org/yedit/plugins/org.dadacoalition.yedit_${version}-RELEASE.jar";
|
||||
sha256 = "1wpyw4z28ka60z36f8m71kz1giajcm26wb9bpv18sjiqwdgx9v0z";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/oyse/yedit;
|
||||
description = "A YAML editor plugin for Eclipse";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
zest = buildEclipseUpdateSite rec {
|
||||
name = "zest-${version}";
|
||||
version = "3.9.101";
|
||||
|
||||
@ -40,19 +40,19 @@ stdenv.mkDerivation rec {
|
||||
## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358
|
||||
(fetchurl {
|
||||
url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199;
|
||||
sha256 = "1iifyfqh7qfdfsrpqgz2l7z0l7alvma57jlklyq258qyjg0pc8n4"; })
|
||||
sha256 = "0pshhq8wlh98m9hm8xd3g7gy3ms0l44dq6vgzkg67ydlccziqz40"; })
|
||||
(fetchurl {
|
||||
url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0;
|
||||
sha256 = "0vadqvcigca0j891yis1mhjn18rg4l9qj621q6vzip46ka6qig0d"; })
|
||||
sha256 = "0h76wrrqyrky441immprskx5x7200zl7ajf7hyg4da22q7sr09qa"; })
|
||||
(fetchurl {
|
||||
url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c;
|
||||
sha256 = "01lfa89qw7y0spcy57hm1ymijb57i6kvhb9z9impcxwza60lbi7b"; })
|
||||
sha256 = "0hk9pi3f2zj266qj8armzpl0z8rfjg0m9ss4k09mgg1hyz80wdvv"; })
|
||||
(fetchurl {
|
||||
url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240;
|
||||
sha256 = "0bmkrm356fbwc8wsiqh2w706mq5r9q4ic4m8vzdj099ihnf121nn"; })
|
||||
sha256 = "1q2hqkjvj9z46b5ik56lv9wiibz09mvg2q3pn8fnpa04ki3zbh4x"; })
|
||||
(fetchurl {
|
||||
url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a;
|
||||
sha256 = "0kp8dgs7fjgvidhm2y84jrxad78mxi0c47jhyszj5644qqxm47cr";
|
||||
sha256 = "1wlyy04qahvls7bdrcxaazh9k27gksk7if1q58h83f7h6g9xxkzj";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "8.0.0075";
|
||||
version = "8.0.0329";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
sha256 = "1imhvrd90f797jlbzvx8sc08h53s55ns6jxy1kl5kh8lz1qq455w";
|
||||
sha256 = "0dcvj2la5g6s87mx3vm96jk904xfmqbwi0jyds9bd3qgbpnn80r1";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,29 +1,33 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, gettext, withBuildColors ? true, ncurses ? null}:
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses
|
||||
, withBuildColors ? true
|
||||
}:
|
||||
|
||||
assert withBuildColors -> ncurses != null;
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "girara-${version}";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
|
||||
sha256 = "03wsxj27hvcbs3x96nah7j3paclifwlfag8kdph4kldl48srp9pb";
|
||||
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
|
||||
sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's/ifdef TPUT_AVAILABLE/ifneq ($(TPUT_AVAILABLE), 0)/' colors.mk
|
||||
substituteInPlace colors.mk \
|
||||
--replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
|
||||
'';
|
||||
|
||||
buildInputs = [ pkgconfig gtk gettext ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ optional withBuildColors "TPUT=${ncurses.out}/bin/tput"
|
||||
++ optional (!withBuildColors) "TPUT_AVAILABLE=0"
|
||||
;
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
(if withBuildColors
|
||||
then "TPUT=${ncurses.out}/bin/tput"
|
||||
else "TPUT_AVAILABLE=0")
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pwmt.org/projects/girara/;
|
||||
description = "User interface library";
|
||||
longDescription = ''
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
{ stdenv, lib, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils
|
||||
, file, makeWrapper, sqlite, glib
|
||||
, synctexSupport ? true, texlive ? null }:
|
||||
{ stdenv, fetchurl, makeWrapper, pkgconfig
|
||||
, gtk, girara, ncurses, gettext, docutils
|
||||
, file, sqlite, glib, texlive
|
||||
, synctexSupport ? true
|
||||
}:
|
||||
|
||||
assert synctexSupport -> texlive != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.6";
|
||||
name = "zathura-core-${version}";
|
||||
name = "zathura-core-${version}";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
|
||||
sha256 = "0fyb5hak0knqvg90rmdavwcmilhnrwgg1s5ykx9wd3skbpi8nsh8";
|
||||
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
|
||||
sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2";
|
||||
};
|
||||
|
||||
icon = ./icon.xpm;
|
||||
|
||||
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib
|
||||
] ++ lib.optional synctexSupport texlive.bin.core;
|
||||
buildInputs = [
|
||||
pkgconfig file gtk girara
|
||||
gettext makeWrapper sqlite glib
|
||||
] ++ optional synctexSupport texlive.bin.core;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
@ -25,11 +31,12 @@ stdenv.mkDerivation rec {
|
||||
"RSTTOMAN=${docutils}/bin/rst2man.py"
|
||||
"VERBOSE=1"
|
||||
"TPUT=${ncurses.out}/bin/tput"
|
||||
] ++ lib.optional synctexSupport "WITH_SYNCTEX=1";
|
||||
(optionalString synctexSupport "WITH_SYNCTEX=1")
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/zathura" \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ file ]}" \
|
||||
--prefix PATH ":" "${makeBinPath [ file ]}" \
|
||||
--prefix XDG_CONFIG_DIRS ":" "$out/etc"
|
||||
|
||||
install -Dm644 $icon $out/share/pixmaps/pwmt.xpm
|
||||
@ -38,11 +45,11 @@ stdenv.mkDerivation rec {
|
||||
echo "Icon=pwmt" >> $out/share/applications/zathura.desktop
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
meta = {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
description = "A core component for zathura PDF viewer";
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ garbas ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -94,12 +94,12 @@ let
|
||||
|
||||
flash = stdenv.mkDerivation rec {
|
||||
name = "flashplayer-ppapi-${version}";
|
||||
version = "24.0.0.194";
|
||||
version = "24.0.0.221";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
|
||||
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "1l9gz81mwb4p1yj9n8s7hrkxdyw0amcpcc3295dq7zhsr35dm76z";
|
||||
sha256 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -2,16 +2,15 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "terraform-${version}";
|
||||
version = "0.8.6";
|
||||
rev = "v${version}";
|
||||
version = "0.8.7";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/terraform";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "hashicorp";
|
||||
repo = "terraform";
|
||||
sha256 = "1yrsb940xx4iqjz4s6c4dbmxzmqzffrxn6if7ywixg4dgpi279mx";
|
||||
owner = "hashicorp";
|
||||
repo = "terraform";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b30m0qc50x84klc8ggc3i83z36l46b1qmc8mpw90mxp07ra8vbw";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "terragrunt-${version}";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
goPackagePath = "github.com/gruntwork-io/terragrunt";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
rev = "v${version}";
|
||||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
sha256 = "1cdhl7rqd2jslvp1ia1gph1lg0sjzsnvj7dj6lg85jfdcffafygj";
|
||||
sha256 = "04q9wm8dnbm1pcy9i3c7ral49k3z10a7gx7h6h4bsvjy1sdf58vz";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aws/aws-sdk-go";
|
||||
rev = "63102d196e0996a2910839857c3584f62be907cc";
|
||||
sha256 = "0n207g4bf5fjq23f63nkhh14shj7kjdrr4qn6h28d7x2vqfb9pss";
|
||||
rev = "f85f603a3e5b4d0eb9516dddb33778918f3b45c6";
|
||||
sha256 = "10frgavkbsqpfninrlgwh64qjx9rwyjzbdfrikciv75v1gljh6zv";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -95,8 +95,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "347a9884a87374d000eec7e6445a34487c1f4a2b";
|
||||
sha256 = "0wii48b2g5dyp6bknnlgs3ln93qxz5jvi96420wnpkkz51nrcmbp";
|
||||
rev = "2526b57c56f30b50466c96c4133b1a4ad0f0191f";
|
||||
sha256 = "03vvr1wq4pw2fixxsbr1d623hwqxf93d07p8vjml6iyd6k97b15p";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,29 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
|
||||
|
||||
let
|
||||
version = "dd181722ea";
|
||||
date = "20141202";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tox-prpl-${date}-${version}";
|
||||
name = "tox-prpl-${version}";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jin-eld";
|
||||
repo = "tox-prpl";
|
||||
rev = "${version}";
|
||||
sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v";
|
||||
owner = "jin-eld";
|
||||
repo = "tox-prpl";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ms367l2f7x83k407c93bmhpyc820f1css61fh2gx4jq13cxqq3p";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lssp -lsodium";
|
||||
|
||||
postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
|
||||
|
||||
buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];
|
||||
buildInputs = [ libtoxcore pidgin libsodium ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://tox.dhs.org/;
|
||||
description = "Tox plugin for Pidgin / libpurple";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,46 +1,31 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv,
|
||||
libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
|
||||
libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,
|
||||
pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,
|
||||
qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }:
|
||||
|
||||
let
|
||||
version = "1.5.0";
|
||||
revision = "v${version}";
|
||||
in
|
||||
qtbase, qtsvg, qttools, qttranslations, sqlcipher,
|
||||
libvpx, libopus }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtox-${version}";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tux3";
|
||||
repo = "qTox";
|
||||
rev = revision;
|
||||
sha256 = "1na2qqzbdbjfw8kymxw5jfglslmw18fz3vpw805pqg4d5y7f7vsi";
|
||||
owner = "tux3";
|
||||
repo = "qTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
libtoxcore-dev openal opencv libsodium filter-audio
|
||||
qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
|
||||
pango atk qrencode ffmpeg qttranslations makeQtWrapper
|
||||
sqlcipher
|
||||
];
|
||||
buildInputs = [
|
||||
libtoxcore openal opencv libsodium filter-audio
|
||||
qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
|
||||
pango atk qrencode ffmpeg qttranslations
|
||||
sqlcipher
|
||||
libopus libvpx
|
||||
] ++ (with xorg; [
|
||||
libpthreadstubs libXdmcp
|
||||
]);
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmakeHook ];
|
||||
|
||||
preConfigure = ''
|
||||
# patch .pro file for proper set of the git hash
|
||||
sed -i '/git rev-parse/d' qtox.pro
|
||||
sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro
|
||||
# since .pro have hardcoded paths, we need to explicitly set paths here
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)"
|
||||
'';
|
||||
nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -1,26 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, libsodium, ncurses, curl
|
||||
, libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig
|
||||
, libqrencode }:
|
||||
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
|
||||
, libqrencode, gdk_pixbuf, libnotify }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "toxic-dev-20160728";
|
||||
name = "toxic-${version}";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tox";
|
||||
repo = "toxic";
|
||||
rev = "cb21672600206423c844306a84f8b122e534c348";
|
||||
sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k";
|
||||
owner = "Tox";
|
||||
repo = "toxic";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
makeFlags = [ "PREFIX=$(out)"];
|
||||
installFlags = [ "PREFIX=$(out)"];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libconfig ];
|
||||
buildInputs = [
|
||||
libtoxcore-dev libsodium ncurses curl
|
||||
libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
|
||||
] ++ stdenv.lib.optionals (!stdenv.isArm) [
|
||||
openal libvpx freealut libqrencode
|
||||
openal libopus libvpx freealut libqrencode
|
||||
];
|
||||
nativeBuildInputs = [ pkgconfig libconfig ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Reference CLI for Tox";
|
||||
|
||||
@ -1,20 +1,26 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
|
||||
, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "utox-${version}";
|
||||
version = "0.9.8";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrayHatter";
|
||||
repo = "uTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ahwdwqhi1gmvw80jihc1ba4cqqnx8ifjnzazxidfdky4ikzccmn";
|
||||
owner = "uTox";
|
||||
repo = "uTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype
|
||||
libv4l libXrender fontconfig libXext libXft filter-audio
|
||||
git libsodium ];
|
||||
buildInputs = [
|
||||
libtoxcore dbus libvpx libX11 openal freetype
|
||||
libv4l libXrender fontconfig libXext libXft filter-audio
|
||||
libsodium
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake git pkgconfig
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
name = "irssi-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
|
||||
sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr";
|
||||
sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}:
|
||||
{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, makeWrapper
|
||||
, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
|
||||
}:
|
||||
# We need an old version of Graphviz for format compatibility reasons.
|
||||
# This version is vulnerable, but monotone-viz will never feed it bad input.
|
||||
let graphviz_2_0 = import ./graphviz-2.0.nix {
|
||||
inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
|
||||
yacc libtool fontconfig pango gd libwebp;
|
||||
}; in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.2";
|
||||
name = "monotone-viz-${version}";
|
||||
|
||||
@ -1,38 +1,52 @@
|
||||
{ stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre,
|
||||
libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender,
|
||||
libXext, xwininfo }:
|
||||
{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
|
||||
, docbook_xsl, libxslt, libxml2, makeWrapper
|
||||
, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage
|
||||
, libXinerama, libXrandr, libXrender, libXext, xwininfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compton-0.1_beta2";
|
||||
name = "compton-0.1_beta2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/chjj/compton/releases/download/v0.1_beta2/compton-git-v0.1_beta2-2013-10-21.tar.xz;
|
||||
sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chjj";
|
||||
repo = "compton";
|
||||
rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
|
||||
sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig
|
||||
dbus
|
||||
libconfig
|
||||
libdrm
|
||||
libxml2
|
||||
mesa
|
||||
pcre
|
||||
libX11
|
||||
libXcomposite
|
||||
libXfixes
|
||||
libXdamage
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libXrandr
|
||||
libXext
|
||||
libXinerama
|
||||
libdrm
|
||||
pcre
|
||||
libconfig
|
||||
dbus
|
||||
mesa_noglu
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
asciidoc
|
||||
libxml2
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
libxslt
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ xwininfo ];
|
||||
|
||||
installFlags = "PREFIX=$(out)";
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/compton-trans \
|
||||
--prefix PATH : ${lib.makeBinPath [ xwininfo ]}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/chjj/compton/;
|
||||
homepage = "https://github.com/chjj/compton/";
|
||||
description = "A fork of XCompMgr, a sample compositing manager for X servers";
|
||||
longDescription = ''
|
||||
A fork of XCompMgr, which is a sample compositing manager for X
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig
|
||||
, libxml2, libXinerama, libXcursor, libXau, libXrandr
|
||||
{ stdenv, fetchurl, pkgconfig, python2
|
||||
, libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM
|
||||
, imlib2, pango, libstartup_notification, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -8,8 +8,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig libxml2
|
||||
libXinerama libXcursor libXau libXrandr
|
||||
libXinerama libXcursor libXau libXrandr libICE libSM
|
||||
libstartup_notification makeWrapper
|
||||
python2.pkgs.wrapPython
|
||||
];
|
||||
|
||||
pythonPath = with python2.pkgs; [
|
||||
pyxdg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -35,7 +40,8 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
|
||||
wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
|
||||
wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
|
||||
'';
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "X window manager for non-desktop embedded systems";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchFromGitHub, pango, libinput
|
||||
, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
|
||||
, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
|
||||
, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.9";
|
||||
version = "0.11";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sway-${version}";
|
||||
@ -13,12 +13,12 @@ in
|
||||
owner = "Sircmpwn";
|
||||
repo = "sway";
|
||||
rev = "${version}";
|
||||
sha256 = "0qqqg23rknxnjcgvkfrx3pijqc3dvi74qmmavq07vy2qfs1xlwg0";
|
||||
sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
|
||||
|
||||
buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ];
|
||||
buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
|
||||
|
||||
@ -387,6 +387,9 @@ rec {
|
||||
|
||||
# Python PyPI mirrors
|
||||
pypi = [
|
||||
https://files.pythonhosted.org/packages/source/
|
||||
# pypi.io is a more semantic link, but atm it’s referencing
|
||||
# files.pythonhosted.org over two redirects
|
||||
https://pypi.io/packages/source/
|
||||
];
|
||||
|
||||
|
||||
@ -1,171 +0,0 @@
|
||||
#! /bin/sh -e
|
||||
|
||||
usage(){
|
||||
echo >&2 "syntax: nix-prefetch-zip [OPTIONS] [URL [EXPECTED-HASH]]
|
||||
|
||||
Options:
|
||||
--url url The url of the archive to fetch.
|
||||
--name name The name to use for the store path (defaults to \`basename \$url\`).
|
||||
--ext ext The file extension (.zip, .tar.gz, ...) to be REMOVED from name
|
||||
--hash hash The hash of unpacked archive.
|
||||
--hash-type type Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256.
|
||||
--leave-root Keep the root directory of the archive.
|
||||
--help Show this help text.
|
||||
"
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
name=""
|
||||
ext=""
|
||||
argi=0
|
||||
argfun=""
|
||||
for arg; do
|
||||
if test -z "$argfun"; then
|
||||
case $arg in
|
||||
--url) argfun=set_url;;
|
||||
--name) argfun=set_name;;
|
||||
--ext) argfun=set_ext;;
|
||||
--hash) argfun=set_expHash;;
|
||||
--hash-type) argfun=set_hashType;;
|
||||
--leave-root) leaveRoot=true;;
|
||||
--help) usage;;
|
||||
*) argi=$(($argi + 1))
|
||||
case $argi in
|
||||
1) url=$arg;;
|
||||
2) rev=$arg;;
|
||||
3) expHash=$arg;;
|
||||
*) echo "Unexpected argument: $arg" >&2
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
else
|
||||
case $argfun in
|
||||
set_*)
|
||||
var=$(echo $argfun | sed 's,^set_,,')
|
||||
eval "$var=\$arg"
|
||||
;;
|
||||
esac
|
||||
argfun=""
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$url" ]; then
|
||||
echo "Error: No --url flag given" >&2
|
||||
usage
|
||||
fi
|
||||
|
||||
if [ -z "$name" ]; then
|
||||
name=$(basename "$url")
|
||||
fi
|
||||
|
||||
if test -z "$hashType"; then
|
||||
hashType=sha256
|
||||
fi
|
||||
|
||||
hashFormat="--base32"
|
||||
|
||||
tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$")
|
||||
trap "rm -rf '$tmp'" EXIT
|
||||
|
||||
dirname=$(basename -s "$ext" "$name")
|
||||
|
||||
unpackDirTmp=$tmp/unpacked-tmp/$dirname
|
||||
mkdir -p $unpackDirTmp
|
||||
|
||||
unpackDir=$tmp/unpacked/$dirname
|
||||
mkdir -p $unpackDir
|
||||
|
||||
downloadedFile=$tmp/$(basename "$url")
|
||||
|
||||
unpackFile() {
|
||||
local curSrc="$1"
|
||||
|
||||
case "$curSrc" in
|
||||
*.tar.xz | *.tar.lzma)
|
||||
# Don't rely on tar knowing about .xz.
|
||||
xz -d < $curSrc | tar xf -
|
||||
;;
|
||||
*.tar | *.tar.* | *.tgz | *.tbz2)
|
||||
# GNU tar can automatically select the decompression method
|
||||
# (info "(tar) gzip").
|
||||
tar xf $curSrc
|
||||
;;
|
||||
*.zip)
|
||||
unzip -qq $curSrc
|
||||
;;
|
||||
*)
|
||||
echo "source archive $curSrc has unknown type" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# If the hash was given, a file with that hash may already be in the
|
||||
# store.
|
||||
if test -n "$expHash"; then
|
||||
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$name")
|
||||
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
|
||||
finalPath=
|
||||
fi
|
||||
hash=$expHash
|
||||
fi
|
||||
|
||||
# If we don't know the hash or a path with that hash doesn't exist,
|
||||
# download the file and add it to the store.
|
||||
if test -z "$finalPath"; then
|
||||
curl="curl \
|
||||
--location --max-redirs 20 \
|
||||
--disable-epsv \
|
||||
--insecure"
|
||||
|
||||
if ! $curl --fail "$url" --output "$downloadedFile"; then
|
||||
echo "error: could not download $url" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$leaveRoot" ]; then
|
||||
shopt -s dotglob
|
||||
|
||||
cd "$unpackDirTmp"
|
||||
unpackFile "$downloadedFile"
|
||||
|
||||
if [ $(ls "$unpackDirTmp" | wc -l) != 1 ]; then
|
||||
echo "error: zip file must contain a single file or directory."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
fn=$(cd "$unpackDirTmp" && echo *)
|
||||
|
||||
if [ -f "$unpackDirTmp/$fn" ]; then
|
||||
mv "$unpackDirTmp/$fn" "$unpackDir"
|
||||
else
|
||||
mv "$unpackDirTmp/$fn/"* "$unpackDir/"
|
||||
fi
|
||||
else
|
||||
cd $unpackDir
|
||||
unpackFile "$downloadedFile"
|
||||
fi
|
||||
|
||||
# Compute the hash.
|
||||
hash=$(nix-hash --type $hashType $hashFormat $unpackDir)
|
||||
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
|
||||
|
||||
# Add the downloaded file to the Nix store.
|
||||
finalPath=$(nix-store --add-fixed --recursive "$hashType" $unpackDir)
|
||||
|
||||
if test -n "$expHash" -a "$expHash" != "$hash"; then
|
||||
echo "hash mismatch for URL \`$url'"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
|
||||
|
||||
echo $hash
|
||||
|
||||
if test -n "$PRINT_PATH"; then
|
||||
echo $finalPath
|
||||
fi
|
||||
@ -6,6 +6,6 @@
|
||||
fetchFromGitHub {
|
||||
owner = "commercialhaskell";
|
||||
repo = "all-cabal-hashes";
|
||||
rev = "a7e72af80fb1e68d9a2c4a5927a253b71ed68239";
|
||||
sha256 = "1ppk5r7yllvibsgxgs7k9kb2dcwh4pphf0876hcdh392cal47h3x";
|
||||
rev = "53fcf983669a3f0cdfd795fec28ecb40740a64ca";
|
||||
sha256 = "0jfrr6mjb3x1ybgrsinhm0nl3jmdjyf9mghpgsm75lgr83cm12a5";
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
|
||||
, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
|
||||
, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
|
||||
, libusb, libarchive, acl, libgudev, qemu
|
||||
, libusb, libarchive, acl, libgudev, qemu, libsecret
|
||||
}:
|
||||
|
||||
# TODO: ovirt (optional)
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
|
||||
libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
|
||||
gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
|
||||
librsvg desktop_file_utils acl libgudev numactl xen
|
||||
librsvg desktop_file_utils acl libgudev numactl xen libsecret
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Autogenerated by maintainers/scripts/gnome.sh update
|
||||
|
||||
fetchurl: {
|
||||
name = "gnome-boxes-3.22.0";
|
||||
name = "gnome-boxes-3.22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.0.tar.xz;
|
||||
sha256 = "9f02e3032f8b6aaa77d9eab6aabe7fc09902be429e266ad9fd4185b94ac867ee";
|
||||
url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;
|
||||
sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lxappearance-0.6.2";
|
||||
name = "lxappearance-0.6.3";
|
||||
|
||||
src = fetchurl{
|
||||
url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
|
||||
sha256 = "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4";
|
||||
sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "A lightweight program for configuring the theme and fonts of gtk applications";
|
||||
homepage = "http://lxde.org/";
|
||||
maintainers = [ stdenv.lib.maintainers.hinton ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
homepage = "http://lxde.org/";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +1,30 @@
|
||||
{ stdenv, fetchurl, boost, emacs, gmp, makeWrapper
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
, boost, gmp
|
||||
, tcl-8_5, tk-8_5
|
||||
, emacs
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
version = "2.0.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
binaries = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
|
||||
sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mozart-binary-${version}";
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
|
||||
sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
|
||||
};
|
||||
src = binaries."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath
|
||||
[ stdenv.cc.cc
|
||||
boost
|
||||
emacs
|
||||
gmp
|
||||
tcl-8_5
|
||||
tk-8_5
|
||||
@ -27,10 +32,36 @@ in stdenv.mkDerivation {
|
||||
|
||||
TK_LIBRARY = "${tk-8_5}/lib/tk8.5";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir $out
|
||||
tar xvf $src -C $out --strip-components=1
|
||||
|
||||
for exe in $out/bin/{ozemulator,ozwish} ; do
|
||||
patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath $libPath \
|
||||
$exe
|
||||
done
|
||||
|
||||
wrapProgram $out/bin/ozwish \
|
||||
--set OZHOME $out \
|
||||
--set TK_LIBRARY $TK_LIBRARY
|
||||
|
||||
wrapProgram $out/bin/ozemulator --set OZHOME $out
|
||||
|
||||
${stdenv.lib.optionalString (emacs != null) ''
|
||||
wrapProgram $out/bin/oz --suffix PATH ":" ${stdenv.lib.makeBinPath [ emacs ]}
|
||||
''}
|
||||
|
||||
sed -i $out/share/applications/oz.desktop \
|
||||
-e "s,Exec=oz %u,Exec=$out/bin/oz %u,"
|
||||
|
||||
gzip -9n $out/share/mozart/elisp"/"*.elc
|
||||
|
||||
patchShebangs $out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.mozart-oz.org/";
|
||||
description = "Multiplatform implementation of the Oz programming language";
|
||||
@ -42,6 +73,7 @@ in stdenv.mkDerivation {
|
||||
expressive power and advanced functionality.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = attrNames binaries;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
echo "unpacking $src..."
|
||||
tar xvfz $src
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share
|
||||
|
||||
mv mozart*linux/bin/* $out/bin
|
||||
mv mozart*linux/share/* $out/share
|
||||
|
||||
patchShebangs $out
|
||||
|
||||
for f in $out/bin/*; do
|
||||
b=$(basename $f)
|
||||
|
||||
if [ $b == "ozemulator" ] || [ $b == "ozwish" ]; then
|
||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath $libPath \
|
||||
$f
|
||||
continue;
|
||||
fi
|
||||
|
||||
wrapProgram $f --set OZHOME $out \
|
||||
--set TK_LIBRARY $TK_LIBRARY
|
||||
done
|
||||
@ -62,7 +62,7 @@ self: super: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "joeyh";
|
||||
repo = "git-annex";
|
||||
sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya";
|
||||
sha256 = "0f79i2i1cr8j02vc4ganw92prbkv9ca1yl9jgkny0rxf28wdlc6v";
|
||||
rev = drv.version;
|
||||
};
|
||||
}))).override {
|
||||
@ -805,6 +805,9 @@ self: super: {
|
||||
# note: the library is unmaintained, no upstream issue
|
||||
dataenc = doJailbreak super.dataenc;
|
||||
|
||||
# https://github.com/divipp/ActiveHs-misc/issues/10
|
||||
data-pprint = doJailbreak super.data-pprint;
|
||||
|
||||
# horribly outdated (X11 interface changed a lot)
|
||||
sindre = markBroken super.sindre;
|
||||
|
||||
|
||||
@ -2223,10 +2223,8 @@ extra-packages:
|
||||
- containers < 0.5 # required to build alex with GHC 6.12.3
|
||||
- control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x
|
||||
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
|
||||
- esqueleto < 2.5 # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8
|
||||
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
|
||||
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
|
||||
- hpack == 0.15.* # needed for stack-1.3.2
|
||||
- haddock < 2.17 # required on GHC 7.10.x
|
||||
- haddock-api == 2.15.* # required on GHC 7.8.x
|
||||
- haddock-api == 2.16.* # required on GHC 7.10.x
|
||||
@ -2235,14 +2233,11 @@ extra-packages:
|
||||
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
|
||||
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
|
||||
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
|
||||
- persistent == 2.2.* # needed for git-annex
|
||||
- persistent-sqlite == 2.2.* # needed for git-annex
|
||||
- persistent-template == 2.1.* # needed for git-annex
|
||||
- primitive == 0.5.1.* # required to build alex with GHC 6.12.3
|
||||
- QuickCheck < 2 # required by test-framework-quickcheck and its users
|
||||
- servant-auth-server < 0.2.2.0 # https://github.com/plow-technologies/servant-auth/issues/25
|
||||
- seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
|
||||
- seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
|
||||
- servant-auth-server < 0.2.2.0 # https://github.com/plow-technologies/servant-auth/issues/25
|
||||
- split < 0.2 # newer versions don't work with GHC 6.12.3
|
||||
- tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x
|
||||
- transformers == 0.4.3.* # the latest version isn't supported by mtl yet
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -40,14 +40,14 @@ let
|
||||
if !isGhcjs
|
||||
then "ghc"
|
||||
else "ghcjs";
|
||||
docLibGlob =
|
||||
ghcDocLibDir =
|
||||
if !isGhcjs
|
||||
then ''share/doc/ghc*/html/libraries''
|
||||
else ''doc/lib'';
|
||||
then ghc.doc + ''/share/doc/ghc*/html/libraries''
|
||||
else ghc + ''/doc/lib'';
|
||||
# On GHCJS, use a stripped down version of GHC's prologue.txt
|
||||
prologue =
|
||||
if !isGhcjs
|
||||
then "${ghc.doc}/${docLibGlob}/prologue.txt"
|
||||
then "${ghcDocLibDir}/prologue.txt"
|
||||
else writeText "ghcjs-prologue.txt" ''
|
||||
This index includes documentation for many Haskell modules.
|
||||
'';
|
||||
@ -67,7 +67,7 @@ stdenv.mkDerivation {
|
||||
mkdir -p $out/share/doc/hoogle
|
||||
|
||||
echo importing builtin packages
|
||||
for docdir in ${ghc.doc}/${docLibGlob}/*; do
|
||||
for docdir in ${ghcDocLibDir}/*; do
|
||||
name="$(basename $docdir)"
|
||||
${opts isGhcjs ''docdir="$docdir/html"''}
|
||||
if [[ -d $docdir ]]; then
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, agda, fetchFromGitHub, ghcWithPackages }:
|
||||
|
||||
agda.mkDerivation (self: rec {
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
name = "agda-stdlib-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "agda-stdlib";
|
||||
owner = "agda";
|
||||
rev = "v${version}";
|
||||
sha256 = "1n5hn3xa0bqyq8rjvfsfmh6z3l8rr4z3s7gyfmf3kiv9f235bnd2";
|
||||
sha256 = "156xbqvqjck9izz613v52ppwk8s1y0kv7xkjpcm16vys2c3bh0x5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
|
||||
|
||||
@ -28,6 +28,15 @@ let
|
||||
|
||||
in {
|
||||
|
||||
ca = buildDict {
|
||||
shortName = "ca-2.1.5-1";
|
||||
fullName = "Catalan";
|
||||
src = fetchurl {
|
||||
url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2;
|
||||
sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb";
|
||||
};
|
||||
};
|
||||
|
||||
cs = buildDict {
|
||||
shortName = "cs-20040614-1";
|
||||
fullName = "Czech";
|
||||
|
||||
12
pkgs/development/libraries/boost/1.63.nix
Normal file
12
pkgs/development/libraries/boost/1.63.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ stdenv, callPackage, fetchurl, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.63.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_63_0.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_63_0.html
|
||||
sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
|
||||
};
|
||||
|
||||
})
|
||||
@ -1,7 +1,7 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.10";
|
||||
version = "${branch}.11";
|
||||
branch = "2.8";
|
||||
sha256 = "1jd9vqrsng6swk1xsms3qvwqjzla58xbk3103qmnxkixa1rimkni";
|
||||
sha256 = "0cldkzcbvsnb7mxz3kwpa0mnb44wmlc0qyl01wwi2qznn7vf11wr";
|
||||
})
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
}@args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.6";
|
||||
version = "${branch}.7";
|
||||
branch = "3.1";
|
||||
sha256 = "0c9g9zhrnvbfwwcca35jis7f7njskhzrwa7n7wpd1618cms2kjvx";
|
||||
sha256 = "0ldf484r3waslv0sjx3vcwlkfgh28bd1wqcj26snfhav7zkf10kl";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
|
||||
})
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
}@args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.2";
|
||||
version = "${branch}.4";
|
||||
branch = "3.2";
|
||||
sha256 = "0srn788i4k5827sl8vmds6133vjy9ygsmgzwn40n3l5qs5b9l4hb";
|
||||
sha256 = "194n8hwmz2rpgh2rz8bc3mnxjyj3jh090mqp7k76msg9la9kbyn0";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
|
||||
})
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ callPackage, fetchurl, libunistring, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "3.5.8";
|
||||
version = "3.5.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
|
||||
sha256 = "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf";
|
||||
sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2";
|
||||
};
|
||||
|
||||
buildInputs = [ libunistring ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libivykis-${version}";
|
||||
|
||||
version = "0.40";
|
||||
version = "0.41";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
|
||||
sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj";
|
||||
sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
41
pkgs/development/libraries/libtoxcore/default.nix
Normal file
41
pkgs/development/libraries/libtoxcore/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
|
||||
, libvpx, check, libconfig, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtoxcore-${version}";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TokTok";
|
||||
repo = "c-toxcore";
|
||||
rev = "v${version}";
|
||||
sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_NTOX=ON"
|
||||
"-DDHT_BOOTSTRAP=ON"
|
||||
"-DBOOTSTRAP_DAEMON=ON"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsodium libmsgpack ncurses
|
||||
] ++ stdenv.lib.optionals (!stdenv.isArm) [
|
||||
libopus
|
||||
libvpx
|
||||
];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
checkInputs = [ check ];
|
||||
|
||||
checkPhase = "ctest";
|
||||
|
||||
# for some reason the tests are not running - it says "No tests found!!"
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
, libvpx, check, libconfig, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tox-core-dev-20160727";
|
||||
name = "tox-core-new-20160727";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irungentoo";
|
||||
@ -4,9 +4,9 @@
|
||||
let
|
||||
version = "4c220e336330213b151a0c20307d0a1fce04ac9e";
|
||||
date = "20150126";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tox-core-${date}-${builtins.substring 0 7 version}";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "tox-core-old-${date}-${builtins.substring 0 7 version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irungentoo";
|
||||
@ -115,8 +115,8 @@ in {
|
||||
};
|
||||
|
||||
openssl_1_1_0 = common {
|
||||
version = "1.1.0d";
|
||||
sha256 = "1pv0zql3r73qpjini90hn29l28d65b7i777zav0larbmi6gbnpkx";
|
||||
version = "1.1.0e";
|
||||
sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
|
||||
};
|
||||
|
||||
openssl_1_0_2-steam = common {
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
|
||||
, pkgconfig, gettext, gobjectIntrospection, libnotify
|
||||
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
|
||||
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
|
||||
, enableGeoLocation ? true, geoclue2, sqlite
|
||||
, gst-plugins-base
|
||||
}:
|
||||
|
||||
assert enableGeoLocation -> geoclue2 != null;
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "webkitgtk-${version}";
|
||||
version = "2.12.5";
|
||||
|
||||
meta = {
|
||||
description = "Web content rendering engine, GTK+ port";
|
||||
homepage = "http://webkitgtk.org/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ koral ];
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs Tools";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||
sha256 = "0h0wig413399wws6l88mn1nnjbqb42vb55yvz8az39b4p1a7h53b";
|
||||
};
|
||||
|
||||
patches = [ ./finding-harfbuzz-icu.patch ];
|
||||
|
||||
cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
|
||||
|
||||
# XXX: WebKit2 missing include path for gst-plugins-base.
|
||||
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
|
||||
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake perl python2 ruby bison gperf sqlite
|
||||
pkgconfig gettext gobjectIntrospection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2 wayland libwebp enchant libnotify
|
||||
libxml2 libsecret libxslt harfbuzz libpthreadstubs
|
||||
gst-plugins-base libxkbcommon epoxy at_spi2_core
|
||||
] ++ optional enableGeoLocation geoclue2
|
||||
++ (with xlibs; [ libXdmcp libXt libXtst ]);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsoup gtk3
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "webkitgtk-${version}";
|
||||
version = "2.14.3";
|
||||
version = "2.14.5";
|
||||
|
||||
meta = {
|
||||
description = "Web content rendering engine, GTK+ port";
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||
sha256 = "0v0hkvggxi38cdb3v672qwr0m0y3x2rmnwh8j3q28869li8d9shb";
|
||||
sha256 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w";
|
||||
};
|
||||
|
||||
# see if we can clean this up....
|
||||
|
||||
19
pkgs/development/python-modules/aenum/default.nix
Normal file
19
pkgs/development/python-modules/aenum/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aenum";
|
||||
version = "1.4.7";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1bvn2k53nz99fiwql5fkl0fh7xjw8ama9qzdjp36609mpk05ikl8";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
|
||||
maintainer = with stdenv.lib.maintainers; [ vrthra ];
|
||||
license = with stdenv.lib.licenses; [ bsd3 ];
|
||||
homepage = https://bitbucket.org/stoneleaf/aenum;
|
||||
};
|
||||
}
|
||||
43
pkgs/development/python-modules/keras/default.nix
Normal file
43
pkgs/development/python-modules/keras/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, pytestcov
|
||||
, pytestpep8
|
||||
, pytest_xdist
|
||||
, six
|
||||
, Theano
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Keras";
|
||||
version = "1.2.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0bby93sffjadrxnx9j9nn2lq0ygsgqjp16260c6lz77b6r1qrcfj";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestcov
|
||||
pytestpep8
|
||||
pytest_xdist
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six Theano pyyaml
|
||||
];
|
||||
|
||||
# Couldn't get tests working
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deep Learning library for Theano and TensorFlow";
|
||||
homepage = "https://keras.io";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ NikolaMandic ];
|
||||
};
|
||||
}
|
||||
22
pkgs/development/python-modules/leather/default.nix
Normal file
22
pkgs/development/python-modules/leather/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "leather";
|
||||
version = "0.3.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "125r372q7bwcajfdysp7w5zh5wccwxf1mkhqawl8h518nl1icv87";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://leather.rtfd.io";
|
||||
description = "Python charting library";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
};
|
||||
}
|
||||
38
pkgs/development/python-modules/scrapy/default.nix
Normal file
38
pkgs/development/python-modules/scrapy/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
|
||||
testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
|
||||
service-identity, parsel, pydispatcher, cssselect, lib }:
|
||||
buildPythonPackage rec {
|
||||
name = "Scrapy-${version}";
|
||||
version = "1.3.1";
|
||||
|
||||
buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
|
||||
propagatedBuildInputs = [
|
||||
six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
|
||||
];
|
||||
|
||||
# Scrapy is usually installed via pip where copying all
|
||||
# permissions makes sense. In Nix the files copied are owned by
|
||||
# root and readonly. As a consequence scrapy can't edit the
|
||||
# project templates.
|
||||
patches = [ ./permissions-fix.patch ];
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
checkPhase = ''
|
||||
py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
|
||||
# The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
|
||||
sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
|
||||
homepage = "http://scrapy.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ drewkett ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
28
pkgs/development/python-modules/scrapy/permissions-fix.patch
Normal file
28
pkgs/development/python-modules/scrapy/permissions-fix.patch
Normal file
@ -0,0 +1,28 @@
|
||||
diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.py
|
||||
index 5941066..89f8edb 100644
|
||||
--- a/scrapy/commands/startproject.py
|
||||
+++ b/scrapy/commands/startproject.py
|
||||
@@ -4,7 +4,7 @@ import os
|
||||
import string
|
||||
from importlib import import_module
|
||||
from os.path import join, exists, abspath
|
||||
-from shutil import ignore_patterns, move, copy2, copystat
|
||||
+from shutil import ignore_patterns, move, copyfile, copystat
|
||||
|
||||
import scrapy
|
||||
from scrapy.commands import ScrapyCommand
|
||||
@@ -76,8 +76,7 @@ class Command(ScrapyCommand):
|
||||
if os.path.isdir(srcname):
|
||||
self._copytree(srcname, dstname)
|
||||
else:
|
||||
- copy2(srcname, dstname)
|
||||
- copystat(src, dst)
|
||||
+ copyfile(srcname, dstname)
|
||||
|
||||
def run(self, args, opts):
|
||||
if len(args) not in (1, 2):
|
||||
@@ -118,4 +117,3 @@ class Command(ScrapyCommand):
|
||||
_templates_base_dir = self.settings['TEMPLATES_DIR'] or \
|
||||
join(scrapy.__path__[0], 'templates')
|
||||
return join(_templates_base_dir, 'project')
|
||||
-
|
||||
52
pkgs/development/python-modules/tensorflow/cuda.nix
Normal file
52
pkgs/development/python-modules/tensorflow/cuda.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, buildPythonPackage
|
||||
, swig
|
||||
, numpy
|
||||
, six
|
||||
, protobuf3_0
|
||||
, cudatoolkit75
|
||||
, cudnn5_cudatoolkit75
|
||||
, gcc49
|
||||
, zlib
|
||||
, linuxPackages
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow";
|
||||
version = "0.11.0rc0";
|
||||
name = "${pname}-${version}";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
|
||||
sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
|
||||
};
|
||||
|
||||
buildInputs = [ swig ];
|
||||
propagatedBuildInputs = [ numpy six protobuf3_0 cudatoolkit75 cudnn5_cudatoolkit75 gcc49 mock ];
|
||||
|
||||
# Note that we need to run *after* the fixup phase because the
|
||||
# libraries are loaded at runtime. If we run in preFixup then
|
||||
# patchelf --shrink-rpath will remove the cuda libraries.
|
||||
postFixup = let
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
gcc49.cc.lib
|
||||
zlib cudatoolkit75
|
||||
cudnn5_cudatoolkit75
|
||||
linuxPackages.nvidia_x11
|
||||
];
|
||||
in ''
|
||||
find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "TensorFlow helps the tensors flow (no gpu support)";
|
||||
homepage = http://tensorflow.org;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
48
pkgs/development/python-modules/tensorflow/default.nix
Normal file
48
pkgs/development/python-modules/tensorflow/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, buildPythonPackage
|
||||
, numpy
|
||||
, six
|
||||
, protobuf3_0_0b2
|
||||
, swig
|
||||
, mock
|
||||
, gcc
|
||||
, zlib
|
||||
}:
|
||||
|
||||
# tensorflow is built from a downloaded wheel, because the upstream
|
||||
# project's build system is an arcane beast based on
|
||||
# bazel. Untangling it and building the wheel from source is an open
|
||||
# problem.
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow";
|
||||
version = "0.10.0";
|
||||
name = "${pname}-${version}";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchurl {
|
||||
url = if stdenv.isDarwin then
|
||||
"https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else
|
||||
"https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
|
||||
sha256 = if stdenv.isDarwin then
|
||||
"1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else
|
||||
"0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy six protobuf3_0_0b2 swig mock];
|
||||
|
||||
preFixup = ''
|
||||
RPATH="${stdenv.lib.makeLibraryPath [ gcc.cc.lib zlib ]}"
|
||||
find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \;
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "TensorFlow helps the tensors flow (no gpu support)";
|
||||
homepage = http://tensorflow.org;
|
||||
license = licenses.asl20;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,22 @@
|
||||
{ fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opengrok-0.12.1";
|
||||
name = "opengrok-${version}";
|
||||
version = "0.12.5";
|
||||
|
||||
# 0.12.5 is the latest distributed as a .tar.gz file.
|
||||
# Newer are distribued as .zip so a source build is required.
|
||||
|
||||
# if builded from source
|
||||
#src = fetchurl {
|
||||
# url = "https://github.com/OpenGrok/OpenGrok/archive/${version}.tar.gz";
|
||||
# sha256 = "01r7ipnj915rnyxyqrnmjfagkip23q5lx9g787qb7qrnbvgfi118";
|
||||
#};
|
||||
|
||||
# binary distribution
|
||||
src = fetchurl {
|
||||
url = "http://java.net/projects/opengrok/downloads/download/${name}.tar.gz";
|
||||
sha256 = "0ihaqgf1z2gsjmy2q96m0s07dpnh92j3ss3myiqjdsh9957fwg79";
|
||||
url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz;
|
||||
sha256 = "c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.9.8";
|
||||
version = "4.9.10";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha512 = "39r4hq5f70nc1v8qq4qvnd0fq98h4akm6y6zp7ml6mi5knz7v6zm86ykq87a0ph3zh23msimi4155354qcsmsxp4cbd22cq8s1w86ds";
|
||||
sha512 = "1mqlw5x7ryqb1jlhkn31p5xhilmqi55j5307i94xdj1xgn2411fiym5mpx1h8b0jc42g728jl896qplkrbd682vz5wci7fg4022ry81";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
||||
@ -95,9 +95,9 @@ rec {
|
||||
};
|
||||
|
||||
grsecurity_testing = grsecPatch
|
||||
{ kver = "4.9.8";
|
||||
grrev = "201702071801";
|
||||
sha512 = "05hxn9jzkywd15iqjd7lykj0f9czw0kq1rs7krxnrk4lhr4k4ahbhq4330mw4pwcvln4ys25dw7mbljn9zvymb7b1kc3m301rrbgj5f";
|
||||
{ kver = "4.9.10";
|
||||
grrev = "201702152052";
|
||||
sha512 = "3whjlrm06r724q9lkycm2jalv3wm9bhxjlvgnglrfnc48rnv3b4j2m6gnq396pc3axnd2mpiinlwjwarw59dhs9qax9l7ddcc3cxd4k";
|
||||
};
|
||||
|
||||
# This patch relaxes grsec constraints on the location of usermode helpers,
|
||||
|
||||
@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
|
||||
|
||||
buildInputs = [ knot-dns lmdb luajit libuv gnutls ]
|
||||
buildInputs = [ knot-dns luajit libuv gnutls ]
|
||||
++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin
|
||||
## optional dependencies
|
||||
++ optional doInstallCheck cmocka
|
||||
++ optional stdenv.isLinux systemd # socket activation
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "prometheus-${version}";
|
||||
version = "1.4.1";
|
||||
version = "1.5.2";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/prometheus/prometheus";
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "prometheus";
|
||||
sha256 = "05yd3y1b0406qdmx7p27pya9kzcrv66069z1y8dqwj3bf9c7csnm";
|
||||
sha256 = "1b24nx6gmx2c7fj92p2byla3i0zs6xwymxqji00gvgpxr8bsfhn1";
|
||||
};
|
||||
|
||||
docheck = true;
|
||||
@ -36,7 +36,7 @@ buildGoPackage rec {
|
||||
description = "Service monitoring system and time series database";
|
||||
homepage = http://prometheus.io;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
maintainers = with maintainers; [ benley fpletz ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, lua }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2.5";
|
||||
version = "3.2.7";
|
||||
name = "redis-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.redis.io/releases/${name}.tar.gz";
|
||||
sha256 = "05ak12xfkcinky6wvhy77knzd95m4vlshwka6jrdcjfqxyqww2c5";
|
||||
sha256 = "1abghfr9nq5k69vg0kjh2409k51xy6fhyf466gy7pzjb6zjz77dz";
|
||||
};
|
||||
|
||||
buildInputs = [ lua ];
|
||||
|
||||
@ -8,11 +8,11 @@ let
|
||||
inherit (pythonPackages) pygobject3 python;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gtk-vnc-${version}";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz";
|
||||
sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433";
|
||||
url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz";
|
||||
sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
|
||||
, obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
|
||||
, hicolor_icon_theme , withPulseAudio ? true, libpulseaudio }:
|
||||
, hicolor_icon_theme, librsvg
|
||||
, withPulseAudio ? true, libpulseaudio }:
|
||||
|
||||
let
|
||||
binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
|
||||
@ -16,7 +17,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
|
||||
|
||||
buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf
|
||||
buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg
|
||||
gsettings_desktop_schemas hicolor_icon_theme ]
|
||||
++ pythonPath
|
||||
++ lib.optional withPulseAudio libpulseaudio;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz";
|
||||
sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373";
|
||||
sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0";
|
||||
};
|
||||
|
||||
buildInputs = [ boost clasp cmake gringo re2c ];
|
||||
|
||||
@ -15,11 +15,11 @@ with stdenv.lib;
|
||||
buildPythonApplication rec {
|
||||
|
||||
name = "youtube-dl-${version}";
|
||||
version = "2017.02.04.1";
|
||||
version = "2017.02.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
|
||||
sha256 = "1aqca4mxgdjiv1qfnzqxx6lpwggfxsaahvvs235pyz0j3kywa4nj";
|
||||
sha256 = "21a5014f25d8ad2882999dd8cbf8cc2fd13c42116f5fe7b4781c982421ea59b0";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
|
||||
|
||||
@ -1,31 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }:
|
||||
{ stdenv, fetchFromGitHub, cmake, lib
|
||||
, libtoxcore, jsoncpp, libsodium, systemd, libcap }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: {
|
||||
name = "libtoxcore-2016-09-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "TokTok";
|
||||
repo = "toxcore";
|
||||
rev = "3521898b0cbf398d882496f6382f6c4ea1c23bc1";
|
||||
sha256 = "1jvf0v9cqwd4ssj1iarhgsr05qg48v7yvmbnn3k01jy0lqci8iaq";
|
||||
};
|
||||
});
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "toxvpn-2016-09-09";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "toxvpn-${version}";
|
||||
version = "20161230";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cleverca22";
|
||||
repo = "toxvpn";
|
||||
rev = "6e188f26fff8bddc1014ee3cc7a7423f9f344a09";
|
||||
sha256 = "1bshc6pzk7z7q7g17cwx9gmlcyzn4szqvdiy0ihbk2xmx9k31c6p";
|
||||
rev = "4b7498a5fae680484cb5779ac01fb08ad3089bdd";
|
||||
sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd;
|
||||
buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ];
|
||||
cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
|
||||
|
||||
@ -37,12 +37,11 @@ in rec {
|
||||
nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils];
|
||||
nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial];
|
||||
nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out];
|
||||
nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl.bin];
|
||||
|
||||
nix-prefetch-scripts = buildEnv {
|
||||
name = "nix-prefetch-scripts";
|
||||
|
||||
paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn nix-prefetch-zip ];
|
||||
paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes";
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
|
||||
sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd";
|
||||
sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
|
||||
};
|
||||
})
|
||||
|
||||
@ -23,8 +23,10 @@ python2Packages.buildPythonApplication {
|
||||
azure-mgmt-resource
|
||||
azure-mgmt-storage
|
||||
adal
|
||||
pysqlite # Go back to builtin sqlite once Python 2.7.13 is released
|
||||
# Go back to sqlite once Python 2.7.13 is released
|
||||
pysqlite
|
||||
datadog
|
||||
digital-ocean
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = "2016-11-23";
|
||||
version = "1.5";
|
||||
src = fetchurl {
|
||||
# Hydra doesn't serve production outputs anymore :(
|
||||
url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2";
|
||||
sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz";
|
||||
url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
|
||||
sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
|
||||
};
|
||||
})
|
||||
|
||||
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||
FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
|
||||
for file in $FILES; do
|
||||
substituteInPlace "$file" \
|
||||
--replace /bin/mount ${utillinux}/bin/mount \
|
||||
--replace /bin/umount ${utillinux}/bin/umount \
|
||||
--replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
|
||||
--replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
|
||||
--replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
|
||||
@ -26,8 +28,6 @@ stdenv.mkDerivation rec {
|
||||
--replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \
|
||||
--replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \
|
||||
--replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \
|
||||
--replace /bin/mount ${utillinux}/bin/mount \
|
||||
--replace /bin/umount ${utillinux}/bin/umount \
|
||||
--replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \
|
||||
--replace /bin/bash ${bash}/bin/bash
|
||||
done
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng
|
||||
, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc
|
||||
, eventlog, perl, python, yacc, protobufc, libivykis
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "syslog-ng-incubator-${version}";
|
||||
version = "141106-54179c5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balabit";
|
||||
repo = "syslog-ng-incubator";
|
||||
rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a";
|
||||
sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam";
|
||||
rev = name;
|
||||
sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook yacc ];
|
||||
|
||||
buildInputs = [
|
||||
autoreconfHook pkgconfig glib syslogng eventlog perl python
|
||||
yacc riemann_c_client libivykis protobufc
|
||||
glib syslogng eventlog perl python protobufc libivykis
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--without-ivykis"
|
||||
"--with-module-dir=$(out)/lib/syslog-ng"
|
||||
];
|
||||
|
||||
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.rickynils ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # does not work with our new syslog-ng version yet
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,29 +1,62 @@
|
||||
{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
|
||||
, riemann_c_client, protobufc, pcre, yacc }:
|
||||
{ stdenv, fetchurl, openssl, libcap, curl, which
|
||||
, eventlog, pkgconfig, glib, python, systemd, perl
|
||||
, riemann_c_client, protobufc, pcre, libnet
|
||||
, json_c, libuuid, libivykis, mongoc, rabbitmq-c }:
|
||||
|
||||
let
|
||||
pname = "syslog-ng";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "syslog-ng-${version}";
|
||||
|
||||
version = "3.6.2";
|
||||
name = "${pname}-${version}";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";
|
||||
sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
|
||||
url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
|
||||
sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n";
|
||||
};
|
||||
|
||||
buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];
|
||||
nativeBuildInputs = [ pkgconfig which ];
|
||||
|
||||
buildInputs = [
|
||||
libcap
|
||||
curl
|
||||
openssl
|
||||
eventlog
|
||||
glib
|
||||
perl
|
||||
python
|
||||
systemd
|
||||
riemann_c_client
|
||||
protobufc
|
||||
pcre
|
||||
libnet
|
||||
json_c
|
||||
libuuid
|
||||
libivykis
|
||||
mongoc
|
||||
rabbitmq-c
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-manpages"
|
||||
"--enable-dynamic-linking"
|
||||
"--enable-systemd"
|
||||
"--with-ivykis=system"
|
||||
"--with-librabbitmq-client=system"
|
||||
"--with-mongoc=system"
|
||||
"--with-jsonc=system"
|
||||
"--with-systemd-journal=system"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.balabit.com/network-security/syslog-ng/";
|
||||
description = "Next-generation syslogd with advanced networking and filtering capabilities";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.rickynils ];
|
||||
maintainers = with maintainers; [ rickynils fpletz ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -548,7 +548,7 @@ with pkgs;
|
||||
aria = aria2;
|
||||
|
||||
aspcud = callPackage ../tools/misc/aspcud {
|
||||
boost = boost155;
|
||||
boost = boost163;
|
||||
};
|
||||
|
||||
at = callPackage ../tools/system/at { };
|
||||
@ -2013,12 +2013,6 @@ with pkgs;
|
||||
libdevil = libdevil-nox;
|
||||
};
|
||||
|
||||
/* Readded by Michael Raskin. There are programs in the wild
|
||||
* that do want 2.0 but not 2.22. Please give a day's notice for
|
||||
* objections before removal. The feature is integer coordinates
|
||||
*/
|
||||
graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
|
||||
|
||||
/* Readded by Michael Raskin. There are programs in the wild
|
||||
* that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
|
||||
* objections before removal. The feature is libgraph.
|
||||
@ -6925,6 +6919,7 @@ with pkgs;
|
||||
boost159 = callPackage ../development/libraries/boost/1.59.nix { };
|
||||
boost160 = callPackage ../development/libraries/boost/1.60.nix { };
|
||||
boost162 = callPackage ../development/libraries/boost/1.62.nix { };
|
||||
boost163 = callPackage ../development/libraries/boost/1.63.nix { };
|
||||
boost = boost162;
|
||||
|
||||
boost_process = callPackage ../development/libraries/boost-process { };
|
||||
@ -8576,9 +8571,11 @@ with pkgs;
|
||||
|
||||
libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { };
|
||||
|
||||
libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { };
|
||||
libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { };
|
||||
|
||||
libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };
|
||||
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
|
||||
|
||||
libtoxcore = callPackage ../development/libraries/libtoxcore { };
|
||||
|
||||
libtap = callPackage ../development/libraries/libtap { };
|
||||
|
||||
@ -9842,11 +9839,6 @@ with pkgs;
|
||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
||||
};
|
||||
|
||||
webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {
|
||||
harfbuzz = harfbuzz-icu;
|
||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
||||
};
|
||||
|
||||
webkitgtk2 = webkitgtk24x.override {
|
||||
withGtk2 = true;
|
||||
enableIntrospection = false;
|
||||
@ -14629,7 +14621,9 @@ with pkgs;
|
||||
|
||||
telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };
|
||||
|
||||
toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
|
||||
toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
|
||||
libtoxcore = libtoxcore-new;
|
||||
};
|
||||
|
||||
pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };
|
||||
|
||||
@ -14813,7 +14807,9 @@ with pkgs;
|
||||
|
||||
ratmen = callPackage ../tools/X11/ratmen {};
|
||||
|
||||
ratox = callPackage ../applications/networking/instant-messengers/ratox { };
|
||||
ratox = callPackage ../applications/networking/instant-messengers/ratox {
|
||||
libtoxcore = libtoxcore-old;
|
||||
};
|
||||
|
||||
ratpoison = callPackage ../applications/window-managers/ratpoison { };
|
||||
|
||||
@ -17660,7 +17656,6 @@ with pkgs;
|
||||
nix-prefetch-git
|
||||
nix-prefetch-hg
|
||||
nix-prefetch-svn
|
||||
nix-prefetch-zip
|
||||
nix-prefetch-scripts;
|
||||
|
||||
nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
|
||||
|
||||
@ -95,6 +95,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
aenum = callPackage ../development/python-modules/aenum { };
|
||||
|
||||
agate = buildPythonPackage rec {
|
||||
name = "agate-1.2.2";
|
||||
disabled = isPy3k;
|
||||
@ -5651,6 +5653,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
leather = callPackage ../development/python-modules/leather { };
|
||||
|
||||
libtmux = buildPythonPackage rec {
|
||||
name = "libtmux-${version}";
|
||||
version = "0.6.0";
|
||||
@ -11914,7 +11918,6 @@ in {
|
||||
downloadPage = https://github.com/PythonCharmers/python-future/releases;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ prikhi ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
@ -18149,11 +18152,11 @@ in {
|
||||
|
||||
parsel = buildPythonPackage rec {
|
||||
name = "parsel-${version}";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/parsel/${name}.tar.gz";
|
||||
sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431";
|
||||
sha256 = "0a34d1c0bj1fzb5dk5744m2ag6v3b8glk4xp0amqxdan9ldbcd97";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pytest pytestrunner ];
|
||||
@ -30943,13 +30946,13 @@ EOF
|
||||
|
||||
w3lib = buildPythonPackage rec {
|
||||
name = "w3lib-${version}";
|
||||
version = "1.14.2";
|
||||
version = "1.17.0";
|
||||
|
||||
buildInputs = with self ; [ six pytest ];
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/w/w3lib/${name}.tar.gz";
|
||||
sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004";
|
||||
sha256 = "0vshh300ay5wn5hwl9qcb32m71pz5s6miy0if56vm4nggy159inq";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -31008,35 +31011,8 @@ EOF
|
||||
};
|
||||
};
|
||||
|
||||
scrapy = buildPythonPackage rec {
|
||||
name = "Scrapy-${version}";
|
||||
version = "1.1.2";
|
||||
scrapy = callPackage ../development/python-modules/scrapy { };
|
||||
|
||||
buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ];
|
||||
propagatedBuildInputs = with self; [
|
||||
six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
|
||||
];
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
checkPhase = ''
|
||||
py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
|
||||
# The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
|
||||
'';
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
|
||||
sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
|
||||
homepage = "http://scrapy.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ drewkett ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
pandocfilters = buildPythonPackage rec{
|
||||
version = "1.4.1";
|
||||
pname = "pandocfilters";
|
||||
@ -31105,27 +31081,7 @@ EOF
|
||||
};
|
||||
};
|
||||
|
||||
Keras = buildPythonPackage rec {
|
||||
name = "Keras-${version}";
|
||||
version = "1.0.3";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/k/keras/${name}.tar.gz";
|
||||
sha256 = "0wi826bvifvy12w490ghj1g45z5xb83q2cadqh425sg56p98khaq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
six Theano pyyaml
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Deep Learning library for Theano and TensorFlow";
|
||||
homepage = "https://keras.io";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ NikolaMandic ];
|
||||
};
|
||||
};
|
||||
Keras = callPackage ../development/python-modules/keras { };
|
||||
|
||||
Lasagne = buildPythonPackage rec {
|
||||
name = "Lasagne-${version}";
|
||||
@ -31248,78 +31204,11 @@ EOF
|
||||
};
|
||||
};
|
||||
|
||||
# tensorflow is built from a downloaded wheel, because the upstream
|
||||
# project's build system is an arcane beast based on
|
||||
# bazel. Untangling it and building the wheel from source is an open
|
||||
# problem.
|
||||
tensorflow = self.tensorflowWithoutCuda;
|
||||
|
||||
tensorflow = self.tensorflowNoGpuSupport;
|
||||
tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { };
|
||||
|
||||
tensorflowNoGpuSupport = buildPythonPackage rec {
|
||||
name = "tensorflow";
|
||||
version = "0.10.0";
|
||||
format = "wheel";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = if stdenv.isDarwin then
|
||||
"https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else
|
||||
"https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
|
||||
sha256 = if stdenv.isDarwin then
|
||||
"1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else
|
||||
"0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock];
|
||||
|
||||
preFixup = ''
|
||||
RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}"
|
||||
find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \;
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "TensorFlow helps the tensors flow (no gpu support)";
|
||||
homepage = http://tensorflow.org;
|
||||
license = licenses.asl20;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
};
|
||||
|
||||
tensorflowCuDNN = buildPythonPackage rec {
|
||||
name = "tensorflow";
|
||||
version = "0.11.0rc0";
|
||||
format = "wheel";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
|
||||
sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pkgs.swig ];
|
||||
propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.cudatoolkit75 pkgs.cudnn5_cudatoolkit75 pkgs.gcc49 self.mock ];
|
||||
|
||||
# Note that we need to run *after* the fixup phase because the
|
||||
# libraries are loaded at runtime. If we run in preFixup then
|
||||
# patchelf --shrink-rpath will remove the cuda libraries.
|
||||
postFixup = let rpath = stdenv.lib.makeLibraryPath [
|
||||
pkgs.gcc49.cc.lib
|
||||
pkgs.zlib pkgs.cudatoolkit75
|
||||
pkgs.cudnn5_cudatoolkit75
|
||||
pkgs.linuxPackages.nvidia_x11
|
||||
]; in ''
|
||||
find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "TensorFlow helps the tensors flow (no gpu support)";
|
||||
homepage = http://tensorflow.org;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
tensorflowWithCuda = callPackage ../development/python-modules/tensorflow/cuda.nix { };
|
||||
|
||||
tflearn = buildPythonPackage rec {
|
||||
name = "tflearn-0.2.1";
|
||||
@ -32008,18 +31897,28 @@ EOF
|
||||
};
|
||||
|
||||
pypandoc = buildPythonPackage rec {
|
||||
name = "pypandoc-1.2.0";
|
||||
name = "pypandoc-1.3.3";
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/pypandoc/${name}.zip";
|
||||
sha256 = "1sxmgrpy0a0yy3nyxiymzqrw715gm23s01fq53q4vgn79j47jakm";
|
||||
url = "mirror://pypi/p/pypandoc/${name}.tar.gz";
|
||||
sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
|
||||
};
|
||||
|
||||
# Fix tests: first requires network access, second is a bug (reported upstream)
|
||||
preConfigure = ''
|
||||
substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'"
|
||||
substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
|
||||
'';
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
propagatedBuildInputs = with self; [ self.pip ];
|
||||
buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc ];
|
||||
buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ];
|
||||
|
||||
meta = with pkgs.stdenv.lib; {
|
||||
description = "Thin wrapper for pandoc";
|
||||
homepage = "https://github.com/bebraw/pypandoc";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
maintainers = with maintainers; [ bennofs kristoff3r ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user