public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-10-26 13:06:43 +02:00
commit 7077a270bf
177 changed files with 4107 additions and 1641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/maintainers.nix
View File

@ -10,6 +10,7 @@
aaronschif = "Aaron Schif <aaronschif@gmail.com>"; aaronschif = "Aaron Schif <aaronschif@gmail.com>";
abaldeau = "Andreas Baldeau <andreas@baldeau.net>"; abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
abbradar = "Nikolay Amiantov <ab@fmap.me>"; abbradar = "Nikolay Amiantov <ab@fmap.me>";
abigailbuccaneer = "Abigail Bunyan <abigailbuccaneer@gmail.com>";
aboseley = "Adam Boseley <adam.boseley@gmail.com>"; aboseley = "Adam Boseley <adam.boseley@gmail.com>";
abuibrahim = "Ruslan Babayev <ruslan@babayev.com>"; abuibrahim = "Ruslan Babayev <ruslan@babayev.com>";
acowley = "Anthony Cowley <acowley@gmail.com>"; acowley = "Anthony Cowley <acowley@gmail.com>";
@ -219,6 +220,7 @@
kevincox = "Kevin Cox <kevincox@kevincox.ca>"; kevincox = "Kevin Cox <kevincox@kevincox.ca>";
khumba = "Bryan Gardiner <bog@khumba.net>"; khumba = "Bryan Gardiner <bog@khumba.net>";
KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>"; KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
kierdavis = "Kier Davis <kierdavis@gmail.com>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
koral = "Koral <koral@mailoo.org>"; koral = "Koral <koral@mailoo.org>";
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>"; kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
@ -454,6 +456,7 @@
veprbl = "Dmitry Kalinkin <veprbl@gmail.com>"; veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
viric = "Lluís Batlle i Rossell <viric@viric.name>"; viric = "Lluís Batlle i Rossell <viric@viric.name>";
vizanto = "Danny Wilson <danny@prime.vc>"; vizanto = "Danny Wilson <danny@prime.vc>";
vklquevs = "vklquevs <vklquevs@gmail.com>";
vlstill = "Vladimír Štill <xstill@fi.muni.cz>"; vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>"; vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>"; volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>";

2
nixos/modules/installer/tools/auto-upgrade.nix
View File

@ -84,7 +84,7 @@ let cfg = config.system.autoUpgrade; in
${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags} ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags}
''; '';
startAt = optionalString cfg.enable cfg.dates; startAt = optional cfg.enable cfg.dates;
}; };
}; };

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

@ -77,6 +77,7 @@
./programs/man.nix ./programs/man.nix
./programs/mosh.nix ./programs/mosh.nix
./programs/nano.nix ./programs/nano.nix
./programs/oblogout.nix
./programs/screen.nix ./programs/screen.nix
./programs/shadow.nix ./programs/shadow.nix
./programs/shell.nix ./programs/shell.nix

160
nixos/modules/programs/oblogout.nix Normal file
View File

@ -0,0 +1,160 @@
# Global configuration for oblogout.
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.programs.oblogout;
in
{
###### interface
options = {
programs.oblogout = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to install OBLogout and create <filename>/etc/oblogout.conf</filename>.
See <filename>${pkgs.oblogout}/share/doc/README</filename>.
'';
};
opacity = mkOption {
type = types.int;
default = 70;
description = ''
'';
};
bgcolor = mkOption {
type = types.str;
default = "black";
description = ''
'';
};
buttontheme = mkOption {
type = types.str;
default = "simplistic";
description = ''
'';
};
buttons = mkOption {
type = types.str;
default = "cancel, logout, restart, shutdown, suspend, hibernate";
description = ''
'';
};
cancel = mkOption {
type = types.str;
default = "Escape";
description = ''
'';
};
shutdown = mkOption {
type = types.str;
default = "S";
description = ''
'';
};
restart = mkOption {
type = types.str;
default = "R";
description = ''
'';
};
suspend = mkOption {
type = types.str;
default = "U";
description = ''
'';
};
logout = mkOption {
type = types.str;
default = "L";
description = ''
'';
};
lock = mkOption {
type = types.str;
default = "K";
description = ''
'';
};
hibernate = mkOption {
type = types.str;
default = "H";
description = ''
'';
};
clogout = mkOption {
type = types.str;
default = "openbox --exit";
description = ''
'';
};
clock = mkOption {
type = types.str;
default = "";
description = ''
'';
};
cswitchuser = mkOption {
type = types.str;
default = "";
description = ''
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.oblogout ];
environment.etc."oblogout.conf".text = ''
[settings]
usehal = false
[looks]
opacity = ${toString cfg.opacity}
bgcolor = ${cfg.bgcolor}
buttontheme = ${cfg.buttontheme}
buttons = ${cfg.buttons}
[shortcuts]
cancel = ${cfg.cancel}
shutdown = ${cfg.shutdown}
restart = ${cfg.restart}
suspend = ${cfg.suspend}
logout = ${cfg.logout}
lock = ${cfg.lock}
hibernate = ${cfg.hibernate}
[commands]
shutdown = systemctl poweroff
restart = systemctl reboot
suspend = systemctl suspend
hibernate = systemctl hibernate
logout = ${cfg.clogout}
lock = ${cfg.clock}
switchuser = ${cfg.cswitchuser}
'';
};
}

2
nixos/modules/services/audio/mpd.nix
View File

@ -49,7 +49,7 @@ in {
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.lines;
default = ""; default = "";
description = '' description = ''
Extra directives added to to the end of MPD's configuration file, Extra directives added to to the end of MPD's configuration file,

1
nixos/modules/services/backup/bacula.nix
View File

@ -340,6 +340,7 @@ in {
extraConfig = mkOption { extraConfig = mkOption {
default = ""; default = "";
type = types.lines;
description = '' description = ''
Extra configuration for Bacula Director Daemon. Extra configuration for Bacula Director Daemon.
''; '';

94
nixos/modules/services/databases/neo4j.nix
View File

@ -5,34 +5,34 @@ with lib;
let let
cfg = config.services.neo4j; cfg = config.services.neo4j;
serverConfig = pkgs.writeText "neo4j-server.properties" '' serverConfig = pkgs.writeText "neo4j.conf" ''
org.neo4j.server.database.location=${cfg.dataDir}/data/graph.db dbms.directories.data=${cfg.dataDir}/data
org.neo4j.server.webserver.address=${cfg.listenAddress} dbms.directories.certificates=${cfg.certDir}
org.neo4j.server.webserver.port=${toString cfg.port} dbms.directories.logs=${cfg.dataDir}/logs
${optionalString cfg.enableHttps '' dbms.directories.plugins=${cfg.dataDir}/plugins
org.neo4j.server.webserver.https.enabled=true dbms.connector.http.type=HTTP
org.neo4j.server.webserver.https.port=${toString cfg.httpsPort} dbms.connector.http.enabled=true
org.neo4j.server.webserver.https.cert.location=${cfg.cert} dbms.connector.http.address=${cfg.listenAddress}:${toString cfg.port}
org.neo4j.server.webserver.https.key.location=${cfg.key} ${optionalString cfg.enableBolt ''
org.neo4j.server.webserver.https.keystore.location=${cfg.dataDir}/data/keystore dbms.connector.bolt.type=BOLT
dbms.connector.bolt.enabled=true
dbms.connector.bolt.tls_level=OPTIONAL
dbms.connector.bolt.address=${cfg.listenAddress}:${toString cfg.boltPort}
''} ''}
org.neo4j.server.webadmin.rrdb.location=${cfg.dataDir}/data/rrd ${optionalString cfg.enableHttps ''
org.neo4j.server.webadmin.data.uri=/db/data/ dbms.connector.https.type=HTTP
org.neo4j.server.webadmin.management.uri=/db/manage/ dbms.connector.https.enabled=true
org.neo4j.server.db.tuning.properties=${cfg.package}/share/neo4j/conf/neo4j.properties dbms.connector.https.encryption=TLS
org.neo4j.server.manage.console_engines=shell dbms.connector.https.address=${cfg.listenAddress}:${toString cfg.httpsPort}
''}
dbms.shell.enabled=true
${cfg.extraServerConfig} ${cfg.extraServerConfig}
''; '';
loggingConfig = pkgs.writeText "logging.properties" cfg.loggingConfig;
wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" '' wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" ''
wrapper.java.additional=-Dorg.neo4j.server.properties=${serverConfig} dbms.jvm.additional=-Dunsupported.dbms.udc.source=tarball
wrapper.java.additional=-Djava.util.logging.config.file=${loggingConfig} dbms.jvm.additional=-XX:+UseConcMarkSweepGC
wrapper.java.additional=-XX:+UseConcMarkSweepGC dbms.jvm.additional=-XX:+CMSClassUnloadingEnabled
wrapper.java.additional=-XX:+CMSClassUnloadingEnabled
wrapper.pidfile=${cfg.dataDir}/neo4j-server.pid
wrapper.name=neo4j
''; '';
in { in {
@ -65,6 +65,18 @@ in {
type = types.int; type = types.int;
}; };
enableBolt = mkOption {
description = "Enable bolt for Neo4j.";
default = true;
type = types.bool;
};
boltPort = mkOption {
description = "Neo4j port to listen for BOLT traffic.";
default = 7687;
type = types.int;
};
enableHttps = mkOption { enableHttps = mkOption {
description = "Enable https for Neo4j."; description = "Enable https for Neo4j.";
default = false; default = false;
@ -77,15 +89,9 @@ in {
type = types.int; type = types.int;
}; };
cert = mkOption { certDir = mkOption {
description = "Neo4j https certificate."; description = "Neo4j TLS certificates directory.";
default = "${cfg.dataDir}/conf/ssl/neo4j.cert"; default = "${cfg.dataDir}/certificates";
type = types.path;
};
key = mkOption {
description = "Neo4j https certificate key.";
default = "${cfg.dataDir}/conf/ssl/neo4j.key";
type = types.path; type = types.path;
}; };
@ -95,26 +101,11 @@ in {
type = types.path; type = types.path;
}; };
loggingConfig = mkOption {
description = "Neo4j logging configuration.";
default = ''
handlers=java.util.logging.ConsoleHandler
.level=INFO
org.neo4j.server.level=INFO
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=org.neo4j.server.logging.SimpleConsoleFormatter
java.util.logging.ConsoleHandler.filter=org.neo4j.server.logging.NeoLogFilter
'';
type = types.lines;
};
extraServerConfig = mkOption { extraServerConfig = mkOption {
description = "Extra configuration for neo4j server."; description = "Extra configuration for neo4j server.";
default = ""; default = "";
type = types.lines; type = types.lines;
}; };
}; };
###### implementation ###### implementation
@ -124,14 +115,18 @@ in {
description = "Neo4j Daemon"; description = "Neo4j Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
environment = { NEO4J_INSTANCE = cfg.dataDir; }; environment = {
NEO4J_HOME = "${cfg.package}/share/neo4j";
NEO4J_CONF = "${cfg.dataDir}/conf";
};
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/neo4j console"; ExecStart = "${cfg.package}/bin/neo4j console";
User = "neo4j"; User = "neo4j";
PermissionsStartOnly = true; PermissionsStartOnly = true;
}; };
preStart = '' preStart = ''
mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf} mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs}
ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf
ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf
if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi
''; '';
@ -146,5 +141,4 @@ in {
home = cfg.dataDir; home = cfg.dataDir;
}; };
}; };
} }

6
nixos/modules/services/databases/openldap.nix
View File

@ -54,8 +54,8 @@ in
}; };
configDir = mkOption { configDir = mkOption {
type = types.path; type = types.nullOr types.path;
default = ""; default = null;
description = "Use this optional config directory instead of using slapd.conf"; description = "Use this optional config directory instead of using slapd.conf";
example = "/var/db/slapd.d"; example = "/var/db/slapd.d";
}; };
@ -103,7 +103,7 @@ in
mkdir -p ${cfg.dataDir} mkdir -p ${cfg.dataDir}
chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
''; '';
serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == "" then "-f "+configFile else "-F "+cfg.configDir}"; serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == null then "-f "+configFile else "-F "+cfg.configDir}";
}; };
users.extraUsers.openldap = users.extraUsers.openldap =

2
nixos/modules/services/hardware/brltty.nix
View File

@ -28,7 +28,7 @@ in {
}; };
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon"; ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon";
Type = "simple"; # Change to notidy after next releae Type = "notify";
TimeoutStartSec = 5; TimeoutStartSec = 5;
TimeoutStopSec = 10; TimeoutStopSec = 10;
Restart = "always"; Restart = "always";

2
nixos/modules/services/hardware/tlp.nix
View File

@ -40,7 +40,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.lines;
default = ""; default = "";
description = "Additional configuration variables for TLP"; description = "Additional configuration variables for TLP";
}; };

2
nixos/modules/services/mail/dovecot.nix
View File

@ -111,7 +111,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.lines;
default = ""; default = "";
example = "mail_debug = yes"; example = "mail_debug = yes";
description = "Additional entries to put verbatim into Dovecot's config file."; description = "Additional entries to put verbatim into Dovecot's config file.";

2
nixos/modules/services/misc/bepasty.nix
View File

@ -53,7 +53,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.lines;
description = '' description = ''
Extra configuration for bepasty server to be appended on the Extra configuration for bepasty server to be appended on the
configuration. configuration.

2
nixos/modules/services/misc/nix-gc.nix
View File

@ -53,7 +53,7 @@ in
systemd.services.nix-gc = systemd.services.nix-gc =
{ description = "Nix Garbage Collector"; { description = "Nix Garbage Collector";
script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";
startAt = optionalString cfg.automatic cfg.dates; startAt = optional cfg.automatic cfg.dates;
}; };
}; };

2
nixos/modules/services/misc/redmine.nix
View File

@ -71,7 +71,7 @@ in {
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.lines;
default = ""; default = "";
description = "Extra configuration in configuration.yml"; description = "Extra configuration in configuration.yml";
}; };

2
nixos/modules/services/monitoring/bosun.nix
View File

@ -107,7 +107,7 @@ in {
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.string; type = types.lines;
default = ""; default = "";
description = '' description = ''
Extra configuration options for Bosun. You should describe your Extra configuration options for Bosun. You should describe your

2
nixos/modules/services/monitoring/graphite.nix
View File

@ -167,7 +167,7 @@ in {
CACHE_TYPE: 'filesystem' CACHE_TYPE: 'filesystem'
CACHE_DIR: '/tmp/graphite-api-cache' CACHE_DIR: '/tmp/graphite-api-cache'
''; '';
type = types.str; type = types.lines;
}; };
}; };

1
nixos/modules/services/monitoring/munin.nix
View File

@ -100,6 +100,7 @@ in
extraConfig = mkOption { extraConfig = mkOption {
default = ""; default = "";
type = types.lines;
description = '' description = ''
<filename>munin-node.conf</filename> extra configuration. See <filename>munin-node.conf</filename> extra configuration. See
<link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' /> <link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />

1
nixos/modules/services/monitoring/zabbix-agent.nix
View File

@ -53,6 +53,7 @@ in
extraConfig = mkOption { extraConfig = mkOption {
default = ""; default = "";
type = types.lines;
description = '' description = ''
Configuration that is injected verbatim into the configuration file. Configuration that is injected verbatim into the configuration file.
''; '';

5
nixos/modules/services/network-filesystems/xtreemfs.nix
View File

@ -153,6 +153,7 @@ in
''; '';
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
example = '' example = ''
# specify whether SSL is required # specify whether SSL is required
@ -173,6 +174,7 @@ in
replication = { replication = {
enable = mkEnableOption "XtreemFS DIR replication plugin"; enable = mkEnableOption "XtreemFS DIR replication plugin";
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
example = '' example = ''
# participants of the replication including this replica # participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10 babudb.repl.participant.0 = 192.168.0.10
@ -269,6 +271,7 @@ in
''; '';
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
example = '' example = ''
osd_check_interval = 300 osd_check_interval = 300
no_atime = true no_atime = true
@ -307,6 +310,7 @@ in
replication = { replication = {
enable = mkEnableOption "XtreemFS MRC replication plugin"; enable = mkEnableOption "XtreemFS MRC replication plugin";
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
example = '' example = ''
# participants of the replication including this replica # participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10 babudb.repl.participant.0 = 192.168.0.10
@ -385,6 +389,7 @@ in
''; '';
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
example = '' example = ''
local_clock_renewal = 0 local_clock_renewal = 0
remote_time_sync = 30000 remote_time_sync = 30000

24
nixos/modules/services/networking/atftpd.nix
View File

@ -20,13 +20,27 @@ in
default = false; default = false;
type = types.bool; type = types.bool;
description = '' description = ''
Whenever to enable the atftpd TFTP server. Whether to enable the atftpd TFTP server. By default, the server
binds to address 0.0.0.0.
'';
};
extraOptions = mkOption {
default = [];
type = types.listOf types.str;
example = literalExample ''
[ "--bind-address 192.168.9.1"
"--verbose=7"
]
'';
description = ''
Extra command line arguments to pass to atftp.
''; '';
}; };
root = mkOption { root = mkOption {
default = "/var/empty"; default = "/srv/tftp";
type = types.str; type = types.path;
description = '' description = ''
Document root directory for the atftpd. Document root directory for the atftpd.
''; '';
@ -39,11 +53,11 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.atftpd = { systemd.services.atftpd = {
description = "atftpd TFTP server"; description = "TFTP Server";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# runs as nobody # runs as nobody
serviceConfig.ExecStart = "${pkgs.atftp}/sbin/atftpd --daemon --no-fork --bind-address 0.0.0.0 ${cfg.root}"; serviceConfig.ExecStart = "${pkgs.atftp}/sbin/atftpd --daemon --no-fork ${lib.concatStringsSep " " cfg.extraOptions} ${cfg.root}";
}; };
}; };

1
nixos/modules/services/networking/bind.nix
View File

@ -113,6 +113,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
description = " description = "
Extra lines to be added verbatim to the generated named configuration file. Extra lines to be added verbatim to the generated named configuration file.

1
nixos/modules/services/networking/chrony.nix
View File

@ -51,6 +51,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
description = '' description = ''
Extra configuration directives that should be added to Extra configuration directives that should be added to

1
nixos/modules/services/networking/cntlm.nix
View File

@ -61,6 +61,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
description = "Verbatim contents of <filename>cntlm.conf</filename>."; description = "Verbatim contents of <filename>cntlm.conf</filename>.";
}; };

2
nixos/modules/services/networking/ddclient.nix
View File

@ -89,7 +89,7 @@ in
extraConfig = mkOption { extraConfig = mkOption {
default = ""; default = "";
type = str; type = lines;
description = '' description = ''
Extra configuration. Contents will be added verbatim to the configuration file. Extra configuration. Contents will be added verbatim to the configuration file.
''; '';

1
nixos/modules/services/networking/dhcpd.nix
View File

@ -47,6 +47,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
example = '' example = ''
option subnet-mask 255.255.255.0; option subnet-mask 255.255.255.0;

2
nixos/modules/services/networking/hostapd.nix
View File

@ -140,7 +140,7 @@ in
ieee80211n=1 ieee80211n=1
ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40] ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40]
''; '';
type = types.string; type = types.lines;
description = "Extra configuration options to put in hostapd.conf."; description = "Extra configuration options to put in hostapd.conf.";
}; };
}; };

2
nixos/modules/services/networking/kippo.nix
View File

@ -46,7 +46,7 @@ rec {
}; };
extraConfig = mkOption { extraConfig = mkOption {
default = ""; default = "";
type = types.string; type = types.lines;
description = ''Extra verbatim configuration added to the end of kippo.cfg.''; description = ''Extra verbatim configuration added to the end of kippo.cfg.'';
}; };
}; };

2
nixos/modules/services/networking/murmur.nix
View File

@ -230,7 +230,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.lines;
default = ""; default = "";
description = "Extra configuration to put into mumur.ini."; description = "Extra configuration to put into mumur.ini.";
}; };

2
nixos/modules/services/networking/openfire.nix
View File

@ -47,7 +47,7 @@ with lib;
export HOME=/tmp export HOME=/tmp
mkdir /var/log/openfire || true mkdir /var/log/openfire || true
mkdir /etc/openfire || true mkdir /etc/openfire || true
for i in ${openfire}/conf.inst/*; do for i in ${pkgs.openfire}/conf.inst/*; do
if ! test -f /etc/openfire/$(basename $i); then if ! test -f /etc/openfire/$(basename $i); then
cp $i /etc/openfire/ cp $i /etc/openfire/
fi fi

1
nixos/modules/services/networking/prayer.nix
View File

@ -56,6 +56,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = "" ; default = "" ;
description = '' description = ''
Extra configuration. Contents will be added verbatim to the configuration file. Extra configuration. Contents will be added verbatim to the configuration file.

1
nixos/modules/services/networking/prosody.nix
View File

@ -195,6 +195,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ''''; default = '''';
description = "Additional prosody configuration"; description = "Additional prosody configuration";
}; };

2
nixos/modules/services/networking/smokeping.nix
View File

@ -244,7 +244,7 @@ in
description = "Target configuration"; description = "Target configuration";
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.string; type = types.lines;
default = ""; default = "";
description = "Any additional customization not already included."; description = "Any additional customization not already included.";
}; };

3
nixos/modules/services/networking/tftpd.nix
View File

@ -13,12 +13,13 @@ with lib;
default = false; default = false;
description = '' description = ''
Whether to enable tftpd, a Trivial File Transfer Protocol server. Whether to enable tftpd, a Trivial File Transfer Protocol server.
The server will be run as an xinetd service.
''; '';
}; };
services.tftpd.path = mkOption { services.tftpd.path = mkOption {
type = types.path; type = types.path;
default = "/home/tftp"; default = "/srv/tftp";
description = '' description = ''
Where the tftp server files are stored. Where the tftp server files are stored.
''; '';

2
nixos/modules/services/networking/unbound.nix
View File

@ -79,7 +79,7 @@ in
extraConfig = mkOption { extraConfig = mkOption {
default = ""; default = "";
type = types.str; type = types.lines;
description = '' description = ''
Extra unbound config. See Extra unbound config. See
<citerefentry><refentrytitle>unbound.conf</refentrytitle><manvolnum>8 <citerefentry><refentrytitle>unbound.conf</refentrytitle><manvolnum>8

2
nixos/modules/services/networking/xinetd.nix
View File

@ -124,7 +124,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.string; type = types.lines;
default = ""; default = "";
description = "Extra configuration-lines added to the section of the service."; description = "Extra configuration-lines added to the section of the service.";
}; };

178
nixos/modules/services/networking/znc.nix
View File

@ -26,53 +26,35 @@ let
}; };
# Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`. # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
notNull = a: ! isNull a;
mkZncConf = confOpts: '' mkZncConf = confOpts: ''
// Also check http://en.znc.in/wiki/Configuration Version = 1.6.3
AnonIPLimit = 10
ConnectDelay = 5
# Add `LoadModule = x` for each module...
${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules} ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
MaxBufferSize = 500
ProtectWebSessions = true
SSLCertFile = ${cfg.dataDir}/znc.pem
ServerThrottle = 30
Skin = dark-clouds
StatusPrefix = *
Version = 1.2
<Listener listener0> <Listener l>
AllowIRC = true Port = ${toString confOpts.port}
AllowWeb = true
IPv4 = true IPv4 = true
IPv6 = false IPv6 = true
Port = ${if confOpts.useSSL then "+" else ""}${toString confOpts.port}
SSL = ${if confOpts.useSSL then "true" else "false"} SSL = ${if confOpts.useSSL then "true" else "false"}
</Listener> </Listener>
<User ${confOpts.userName}> <User ${confOpts.userName}>
Admin = true
Allow = *
AltNick = ${confOpts.nick}_
AppendTimestamp = false
AutoClearChanBuffer = false
Buffer = 150
ChanModes = +stn
DenyLoadMod = false
DenySetBindHost = false
Ident = ident
JoinTries = 10
MaxJoins = 0
MaxNetworks = 1
MultiClients = true
Nick = ${confOpts.nick}
PrependTimestamp = true
QuitMsg = Quit
RealName = ${confOpts.nick}
TimestampFormat = [%H:%M:%S]
${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules}
${confOpts.passBlock} ${confOpts.passBlock}
Admin = true
Nick = ${confOpts.nick}
AltNick = ${confOpts.nick}_
Ident = ${confOpts.nick}
RealName = ${confOpts.nick}
${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules}
${ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: net: ''
<Network ${name}>
${concatMapStrings (m: "LoadModule = ${m}\n") net.modules}
Server = ${net.server} ${if net.useSSL then "+" else ""}${toString net.port}
${concatMapStrings (c: "<Chan #${c}>\n</Chan>\n") net.channels}
</Network>
'') confOpts.networks) }
</User> </User>
${confOpts.extraZncConf} ${confOpts.extraZncConf}
''; '';
@ -84,6 +66,62 @@ let
else mkZncConf cfg.confOptions; else mkZncConf cfg.confOptions;
}; };
networkOpts = { ... }: {
options = {
server = mkOption {
type = types.str;
example = "chat.freenode.net";
description = ''
IRC server address.
'';
};
port = mkOption {
type = types.int;
default = 6697;
example = 6697;
description = ''
IRC server port.
'';
};
useSSL = mkOption {
type = types.bool;
default = true;
description = ''
Whether to use SSL to connect to the IRC server.
'';
};
modulePackages = mkOption {
type = types.listOf types.package;
default = [];
example = [ "pkgs.zncModules.push" "pkgs.zncModules.fish" ];
description = ''
External ZNC modules to build.
'';
};
modules = mkOption {
type = types.listOf types.str;
default = [ "simple_away" ];
example = literalExample "[ simple_away sasl ]";
description = ''
ZNC modules to load.
'';
};
channels = mkOption {
type = types.listOf types.str;
default = [];
example = [ "nixos" ];
description = ''
IRC channels to join.
'';
};
};
};
in in
{ {
@ -111,6 +149,15 @@ in
''; '';
}; };
group = mkOption {
default = "";
example = "users";
type = types.string;
description = ''
Group to own the ZNCserver process.
'';
};
dataDir = mkOption { dataDir = mkOption {
default = "/var/lib/znc/"; default = "/var/lib/znc/";
example = "/home/john/.znc/"; example = "/home/john/.znc/";
@ -125,27 +172,16 @@ in
example = "See: http://wiki.znc.in/Configuration"; example = "See: http://wiki.znc.in/Configuration";
type = types.lines; type = types.lines;
description = '' description = ''
The contents of the `znc.conf` file to use when creating it. Config file as generated with `znc --makeconf` to use for the whole ZNC configuration.
If specified, `confOptions` will be ignored, and this value, as-is, will be used. If specified, `confOptions` will be ignored, and this value, as-is, will be used.
If left empty, a conf file with default values will be used. If left empty, a conf file with default values will be used.
Recommended to generate with `znc --makeconf` command.
''; '';
}; };
/* TODO: add to the documentation of the current module:
Values to use when creating a `znc.conf` file.
confOptions = {
modules = [ "log" ];
userName = "john";
nick = "johntron";
};
*/
confOptions = { confOptions = {
modules = mkOption { modules = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ "partyline" "webadmin" "adminlog" "log" ]; default = [ "webadmin" "adminlog" ];
example = [ "partyline" "webadmin" "adminlog" "log" ]; example = [ "partyline" "webadmin" "adminlog" "log" ];
description = '' description = ''
A list of modules to include in the `znc.conf` file. A list of modules to include in the `znc.conf` file.
@ -154,8 +190,8 @@ in
userModules = mkOption { userModules = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [ "chansaver" "controlpanel" ];
example = [ "fish" "push" ]; example = [ "chansaver" "controlpanel" "fish" "push" ];
description = '' description = ''
A list of user modules to include in the `znc.conf` file. A list of user modules to include in the `znc.conf` file.
''; '';
@ -166,29 +202,42 @@ in
example = "johntron"; example = "johntron";
type = types.string; type = types.string;
description = '' description = ''
The user name to use when generating the `znc.conf` file. The user name used to log in to the ZNC web admin interface.
This is the user name used by the user logging into the ZNC web admin.
''; '';
}; };
networks = mkOption {
default = { };
type = types.loaOf types.optionSet;
description = ''
IRC networks to connect the user to.
'';
options = [ networkOpts ];
example = {
"freenode" = {
server = "chat.freenode.net";
port = 6697;
ssl = true;
modules = [ "simple_away" ];
};
};
};
nick = mkOption { nick = mkOption {
default = "znc-user"; default = "znc-user";
example = "john"; example = "john";
type = types.string; type = types.string;
description = '' description = ''
The IRC nick to use when generating the `znc.conf` file. The IRC nick.
''; '';
}; };
passBlock = mkOption { passBlock = mkOption {
default = defaultPassBlock; example = defaultPassBlock;
example = "Must be the block generated by the `znc --makepass` command.";
type = types.string; type = types.string;
description = '' description = ''
The pass block to use when generating the `znc.conf` file. Generate with znc --makepass.
This is the password used by the user logging into the ZNC web admin. This is the password used to log in to the ZNC web admin interface.
This is the block generated by the `znc --makepass` command.
!!! If not specified, please change this after starting the service. !!!
''; '';
}; };
@ -206,7 +255,7 @@ in
example = true; example = true;
type = types.bool; type = types.bool;
description = '' description = ''
Indicates whether the ZNC server should use SSL when listening on the specified port. Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated.
''; '';
}; };
@ -214,7 +263,7 @@ in
default = ""; default = "";
type = types.lines; type = types.lines;
description = '' description = ''
Extra config to `znc.conf` file Extra config to `znc.conf` file.
''; '';
}; };
}; };
@ -265,6 +314,7 @@ in
after = [ "network.service" ]; after = [ "network.service" ];
serviceConfig = { serviceConfig = {
User = cfg.user; User = cfg.user;
Group = cfg.group;
Restart = "always"; Restart = "always";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";

1
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
View File

@ -288,6 +288,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
example = example =
'' ''

1
nixos/modules/services/web-servers/apache-httpd/moodle.nix
View File

@ -164,6 +164,7 @@ in
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
example = example =
'' ''

1
nixos/modules/services/web-servers/apache-httpd/wordpress.nix
View File

@ -212,6 +212,7 @@ in
example = "[ \"en_GB\" \"de_DE\" ];"; example = "[ \"en_GB\" \"de_DE\" ];";
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines;
default = ""; default = "";
example = example =
'' ''

2
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -86,7 +86,7 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.lines;
default = ""; default = "";
example = '' example = ''
[Autologin] [Autologin]

18
pkgs/applications/audio/kid3/default.nix
View File

@ -1,23 +1,24 @@
{ stdenv, fetchurl { stdenv, fetchurl
, pkgconfig, cmake, perl, ffmpeg , pkgconfig, cmake
, docbook_xml_dtd_45, docbook_xsl, libxslt , docbook_xml_dtd_45, docbook_xsl, libxslt
, phonon, automoc4, chromaprint, id3lib , python, ffmpeg, mp4v2, flac, libogg, libvorbis
, taglib, mp4v2, flac, libogg, libvorbis , phonon, automoc4, chromaprint, id3lib, taglib
, qt, zlib, readline , qt, zlib, readline
, makeWrapper , makeWrapper
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kid3-${meta.version}"; name = "kid3-${version}";
version = "3.4.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/kid3/kid3/${meta.version}/${name}.tar.gz"; url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
sha256 = "12sa54mg1b3wkagmh5yi20ski8km9d199lk0a1yfxy0ffjfld7js"; sha256 = "0gka4na583015jyqva18g85q7vnkjdk0iji2jp88di3kpvqhf1sw";
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig cmake perl ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt [ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt
phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis
qt zlib readline makeWrapper ]; qt zlib readline makeWrapper ];
@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
version = "3.3.0";
description = "A simple and powerful audio tag editor"; description = "A simple and powerful audio tag editor";
longDescription = '' longDescription = ''
If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
@ -71,4 +71,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }
# TODO: Qt5 support # TODO: Qt5 support - not so urgent!

20
pkgs/applications/editors/eclipse/default.nix
View File

@ -88,16 +88,16 @@ rec {
eclipse-platform = eclipse-platform-46; eclipse-platform = eclipse-platform-46;
eclipse-platform-46 = buildEclipse { eclipse-platform-46 = buildEclipse {
name = "eclipse-platform-4.6"; name = "eclipse-platform-4.6.1";
description = "Eclipse platform"; description = "Eclipse platform";
sources = { sources = {
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz; url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
sha256 = "02lfa0f4j53q4ks3nal4jxnm1vc6xck2k9zng58izfh49v73jyjd"; sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz; url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
sha256 = "053hsy87jmr9phn934a4qny959d6inxjx8nlcmxa2165ra8d7qfr"; sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
}; };
}; };
}; };
@ -123,16 +123,16 @@ rec {
### Eclipse SDK ### Eclipse SDK
eclipse-sdk-46 = buildEclipse { eclipse-sdk-46 = buildEclipse {
name = "eclipse-sdk-4.6"; name = "eclipse-sdk-4.6.1";
description = "Eclipse Neon Classic"; description = "Eclipse Neon Classic";
sources = { sources = {
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz; url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
sha256 = "4d7a39ce4e04ba1f5179f6a72926eb86ed506d97842a3bf4247814491c508e0a"; sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz; url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
sha256 = "d9e1d390cac504a17a65d4a22ebb8da6a592bcc54491912cbc29577990d77014"; sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
}; };
}; };
}; };

23
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -175,10 +175,10 @@
}) {}; }) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex"; pname = "auctex";
version = "11.89.5"; version = "11.89.6";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-11.89.5.tar"; url = "https://elpa.gnu.org/packages/auctex-11.89.6.tar";
sha256 = "0scab76ks9wnv1wp9lrm6h9hag7p70zn950srp2p02vrzz2z5p53"; sha256 = "1lfaki8s9ri6ds88mhpxwqb2jrjf7hbs1w3nxhg307344lac07gy";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -616,14 +616,15 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search"; pname = "el-search";
version = "0.2.3"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-0.2.3.tar"; url = "https://elpa.gnu.org/packages/el-search-1.0.1.tar";
sha256 = "0icxfq6hd8pfg4r5q70ylm84wgv1jiijpv0d56x7kjdh7wrdalrb"; sha256 = "14l7zq4bm5ihybpj8qvqpzzmgjsyhr8yq2d4jmadk35q5hlx1cbb";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs stream ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/el-search.html"; homepage = "https://elpa.gnu.org/packages/el-search.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1336,10 +1337,10 @@
}) {}; }) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20161010"; version = "20161024";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20161010.tar"; url = "https://elpa.gnu.org/packages/org-20161024.tar";
sha256 = "1f007wvwgr9mkx8djr4lc7a1x84s702hwlahb76w8yi80s81anlx"; sha256 = "1rg9hl8vghx72prc6m1c29p5crns0i70hh7lffbhqzjixq6jqvlj";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

1535
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

426
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

@ -1690,12 +1690,12 @@
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild { melpaBuild {
pname = "auth-password-store"; pname = "auth-password-store";
version = "1.1.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DamienCassou"; owner = "DamienCassou";
repo = "auth-password-store"; repo = "auth-password-store";
rev = "7b399fd7eb4a19f32d93ec6dc0eb3a344d2687aa"; rev = "5ca6a838489c1175de3df7af025751559eb13cb3";
sha256 = "021iqwn4lwpsx02m3ns8l3bn5dvssii5sk9vg32mh56fjpbi2dkj"; sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@ -2410,12 +2410,12 @@
bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "bind-key"; pname = "bind-key";
version = "2.2"; version = "2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jwiegley"; owner = "jwiegley";
repo = "use-package"; repo = "use-package";
rev = "27fdfba5b05fd51345dc2b947ae6342266fdb22b"; rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da";
sha256 = "1dzkvinp1h1w48lx44x9bn1b54c83m1wl5v8h99l76fh1y0jw7b4"; sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@ -2494,12 +2494,12 @@
bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "bm"; pname = "bm";
version = "201608"; version = "201610";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "joodland"; owner = "joodland";
repo = "bm"; repo = "bm";
rev = "b91f87c8f78d2430edc376830d5ba15f45d28637"; rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42";
sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x"; sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@ -2764,6 +2764,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bui";
version = "1.0";
src = fetchFromGitHub {
owner = "alezost";
repo = "bui.el";
rev = "c08d91b2d314b52c9ca5c2d5be7a7b2367b68162";
sha256 = "104q089cyy0m0hkdnvblss884npc4bv5xf03qr35x3s3573lxh4a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
sha256 = "0a4g55k02hi3cwvk4d35lk2x5kc4fabskl2025i83hx0rqw4w3f1";
name = "bui";
};
packageRequires = [ dash emacs ];
meta = {
homepage = "https://melpa.org/#/bui";
license = lib.licenses.free;
};
}) {};
bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "bundler"; pname = "bundler";
@ -3891,12 +3912,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "cmake-mode"; pname = "cmake-mode";
version = "3.7.0pre1"; version = "3.7.0pre2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Kitware"; owner = "Kitware";
repo = "CMake"; repo = "CMake";
rev = "1dc252ecf4d0946196133734540ebe8e90f312d3"; rev = "876da11858ab6649bb088c4bb7758fc84910ba20";
sha256 = "1bp5ann5a6k3xyb3s71y7crsy88bxscvzn6pp0zmjmdyk8igkj8j"; sha256 = "179925wbpnfiazqizw5zrhcdb5pi5a8x2x9m5wp0mvw9gxvmnwvn";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -5323,12 +5344,12 @@
darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "darktooth-theme"; pname = "darktooth-theme";
version = "0.1.57"; version = "0.1.60";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emacsfodder"; owner = "emacsfodder";
repo = "emacs-theme-darktooth"; repo = "emacs-theme-darktooth";
rev = "eb398c9b0500384f9e6d512f4be38f8bc6ff47ed"; rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f";
sha256 = "05a6bz0pmdy8wzggifwzcx31lqlknwhihd6yccjqgbplys8snxmd"; sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@ -5906,6 +5927,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
dired-icon = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-icon";
version = "0.2";
src = fetchFromGitLab {
owner = "xuhdev";
repo = "dired-icon";
rev = "68b7b7cf593e4e511eb78cdf83fefdb77ba4ebde";
sha256 = "0a7j40rw5wpxlw822ishgbcx7lk1pr4v6qqg4b5y1v5xvwaj7ciy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na";
name = "dired-icon";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/dired-icon";
license = lib.licenses.free;
};
}) {};
dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "dired-imenu"; pname = "dired-imenu";
@ -6220,22 +6262,30 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
docker = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tablist }: docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild { melpaBuild {
pname = "docker"; pname = "docker";
version = "0.4.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Silex"; owner = "Silex";
repo = "docker.el"; repo = "docker.el";
rev = "57c5f4edb7139cbf78055a1ceb7a9f8b4b299a8a"; rev = "1ee7b78d22807326bb30e45137bc36cb2ccef93f";
sha256 = "1wkgb6wq3crnpnd747ilwl2kbz5fjk5q5z1xza8j4bf1ic2aybb8"; sha256 = "03cbcmyqyrsafml9x497h8c4pw5rj5g02rr97ch87nbkzrih1kal";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk"; sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
name = "docker"; name = "docker";
}; };
packageRequires = [ dash emacs magit-popup s tablist ]; packageRequires = [
dash
docker-tramp
emacs
json-mode
magit-popup
s
tablist
];
meta = { meta = {
homepage = "https://melpa.org/#/docker"; homepage = "https://melpa.org/#/docker";
license = lib.licenses.free; license = lib.licenses.free;
@ -6325,6 +6375,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
dr-racket-like-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dr-racket-like-unicode";
version = "1.1.0";
src = fetchFromGitHub {
owner = "david-christiansen";
repo = "dr-racket-like-unicode";
rev = "4953f1c8a68472e157a0dcd0a7e35a4ec2577133";
sha256 = "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e612ede00c4b44ace741d2b6baabc61571af15c/recipes/dr-racket-like-unicode";
sha256 = "0cqcbn4hmv99d8z03xc0rqw4yh5by6g09y33h75dhl9nh95rybgf";
name = "dr-racket-like-unicode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/dr-racket-like-unicode";
license = lib.licenses.free;
};
}) {};
dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "dracula-theme"; pname = "dracula-theme";
@ -7131,8 +7202,8 @@
sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein"; url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
name = "ein"; name = "ein";
}; };
packageRequires = [ cl-generic request websocket ]; packageRequires = [ cl-generic request websocket ];
@ -7354,12 +7425,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild { melpaBuild {
pname = "electric-operator"; pname = "electric-operator";
version = "0.2"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "davidshepherd7"; owner = "davidshepherd7";
repo = "electric-operator"; repo = "electric-operator";
rev = "96a3696851abc47d369f8985bf6f790e68a4a9aa"; rev = "16df9e16da8efe25d410ba17165d7f5c1ad4e043";
sha256 = "1ji6rdbqwk8j0nl6yk3rdqrpgxir99lj9pf6i9rx55l63qyrdfc4"; sha256 = "010zr6dgix6bf8xshs8kascpzcrg83vqd1w71qin9anw6rf3z4d4";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@ -8572,12 +8643,12 @@
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "erlang"; pname = "erlang";
version = "19.1.4"; version = "19.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "erlang"; owner = "erlang";
repo = "otp"; repo = "otp";
rev = "c1c2149818396bdefe9eff995184f8864f18fca3"; rev = "926391fbb8761d5833b3a6f5c9e523fcda373c6d";
sha256 = "0zcq88x0r49cd6gm7kni04srr2sb0jn57syb513w3srn79pr5qmg"; sha256 = "1bbwnpam05rcsivmrh13mkcyb04a08d1fyb4y5w0y0gdpbzn7jq9";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -8799,6 +8870,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-up";
version = "0.0.3";
src = fetchFromGitHub {
owner = "peterwvj";
repo = "eshell-up";
rev = "653121392acd607d5dfbca0832927e06806a2d39";
sha256 = "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
sha256 = "0v26dqaszdg57brg8sls9ddmfwxzf98wkp471q1cqw75ss4999jd";
name = "eshell-up";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/eshell-up";
license = lib.licenses.free;
};
}) {};
eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "eshell-z"; pname = "eshell-z";
@ -8844,12 +8936,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ess"; pname = "ess";
version = "16.4"; version = "16.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emacs-ess"; owner = "emacs-ess";
repo = "ESS"; repo = "ESS";
rev = "81d34db66301e78e59ea79e4ae7b9600f1378641"; rev = "abacd7538e1bbfdd6ef2b5f11d4f5f4cc74782ee";
sha256 = "039iqrxd8nc52n2j9qjhfmb5f276h2ikvn2lagjbzk15mvg26va4"; sha256 = "0fbprkjb9cjkjyc1yxn9b1znc4w1im9akl4f9ma2ddgl8fzmi7p7";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@ -9284,12 +9376,12 @@
evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "evil-matchit"; pname = "evil-matchit";
version = "2.1.5"; version = "2.1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "redguardtoo"; owner = "redguardtoo";
repo = "evil-matchit"; repo = "evil-matchit";
rev = "b01763bf766a7449626e6216c2d360ae1e80e5c1"; rev = "51d46747e39dc247ea4b72839421b85f53d487be";
sha256 = "197ycwx02mjlvck5xraw2jwlsv3ham5jm2yv8133i4cq8dszcfaa"; sha256 = "15fr19gv2rf8pvns7r0jmy1z2f08bjprqxz3hj1fzn9wgc42iwg7";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@ -9704,12 +9796,12 @@
expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "expand-region"; pname = "expand-region";
version = "0.10.0"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "magnars"; owner = "magnars";
repo = "expand-region.el"; repo = "expand-region.el";
rev = "90c4e959ac8bf0bbd857dd679f38a121c592bf7a"; rev = "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96";
sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg"; sha256 = "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@ -10632,22 +10724,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
melpaBuild { melpaBuild {
pname = "flycheck-package"; pname = "flycheck-package";
version = "0.10"; version = "0.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "purcell"; owner = "purcell";
repo = "flycheck-package"; repo = "flycheck-package";
rev = "3d890612de15c98d37ae37255d79d45e0102b25c"; rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573";
sha256 = "1ay8qgshfhlrhjcvvr2qfw0lzwcdnksh75abfx0wgpqjd07iws2v"; sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d"; sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
name = "flycheck-package"; name = "flycheck-package";
}; };
packageRequires = [ cl-lib emacs flycheck ]; packageRequires = [ flycheck package-lint ];
meta = { meta = {
homepage = "https://melpa.org/#/flycheck-package"; homepage = "https://melpa.org/#/flycheck-package";
license = lib.licenses.free; license = lib.licenses.free;
@ -10695,6 +10787,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-rebar3";
version = "1.0.1";
src = fetchFromGitHub {
owner = "joedevivo";
repo = "flycheck-rebar3";
rev = "534df87b0c2197fa15057f1e1a19763411c59220";
sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc";
name = "flycheck-rebar3";
};
packageRequires = [ flycheck ];
meta = {
homepage = "https://melpa.org/#/flycheck-rebar3";
license = lib.licenses.free;
};
}) {};
flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "flycheck-status-emoji"; pname = "flycheck-status-emoji";
@ -12292,12 +12405,12 @@
git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "git-link"; pname = "git-link";
version = "0.4.3"; version = "0.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sshaw"; owner = "sshaw";
repo = "git-link"; repo = "git-link";
rev = "b9e197419b1d71c7190c2e7cb14b89d9e6759ab2"; rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b";
sha256 = "0f10qqmjaxy29qw86a85kjshyj8wc5dldymm8i89l3hb9s9iv260"; sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@ -12909,8 +13022,8 @@
sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx"; sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx"; sha256 = "0ghqm4lbkfla79plqiyb1lzf5kbz0380h9vf8px15zal00xrv0bl";
name = "go-mode"; name = "go-mode";
}; };
packageRequires = []; packageRequires = [];
@ -13132,12 +13245,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild { melpaBuild {
pname = "govc"; pname = "govc";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vmware"; owner = "vmware";
repo = "govmomi"; repo = "govmomi";
rev = "f9184c1d704efa615d419dd8d1dae1ade94701d1"; rev = "bb498f73762deb009468da8c3bd93b7c6002a63e";
sha256 = "1q86wklz73qmyif04fv5y42imly3yab5bjc8ymka8xkc5lh71mwm"; sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@ -13516,6 +13629,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
version = "0.17";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
rev = "89b060abf49791cad2639f234b230dc4882bdc39";
sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
name = "gruvbox-theme";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/gruvbox-theme";
license = lib.licenses.free;
};
}) {};
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "gscholar-bibtex"; pname = "gscholar-bibtex";
@ -13959,12 +14093,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild { melpaBuild {
pname = "helm"; pname = "helm";
version = "2.3.0"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emacs-helm"; owner = "emacs-helm";
repo = "helm"; repo = "helm";
rev = "378ceb9b8b8c63cd550d57248e07631de354439f"; rev = "b8193725f2c3ab20f2907171374ee762e397739d";
sha256 = "0s2cf9ax28rkr05bzqy70q9mmpwxd3xwcbdslmlmasq9y57i61k4"; sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@ -14190,12 +14324,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "helm-core"; pname = "helm-core";
version = "2.3.0"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emacs-helm"; owner = "emacs-helm";
repo = "helm"; repo = "helm";
rev = "378ceb9b8b8c63cd550d57248e07631de354439f"; rev = "b8193725f2c3ab20f2907171374ee762e397739d";
sha256 = "0s2cf9ax28rkr05bzqy70q9mmpwxd3xwcbdslmlmasq9y57i61k4"; sha256 = "13hwwihiy05dszhwb2zxzjqsgf7589zdirdmfxqsw0l224p0hcdd";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -14274,12 +14408,12 @@
helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "helm-dired-history"; pname = "helm-dired-history";
version = "1.0"; version = "1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jixiuf"; owner = "jixiuf";
repo = "helm-dired-history"; repo = "helm-dired-history";
rev = "dd324f383a66a5306ccd0fc3cf7a2c4815f45e8f"; rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56";
sha256 = "1xjnblqmk2247c0brbi6byiq3k7d9lz9bb94w9n6j1qyls0flinm"; sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
@ -15975,12 +16109,12 @@
ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ido-describe-bindings"; pname = "ido-describe-bindings";
version = "0.0.9"; version = "0.0.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "danil"; owner = "danil";
repo = "ido-describe-bindings"; repo = "ido-describe-bindings";
rev = "1f5c78bf56f2cab137a323ec426e906f2215bf7f"; rev = "a142ff1c33df23ed9665497d0dcae2943b3c706a";
sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa"; sha256 = "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings"; url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings";
@ -17064,12 +17198,12 @@
jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild { melpaBuild {
pname = "jade"; pname = "jade";
version = "0.22"; version = "0.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NicolasPetton"; owner = "NicolasPetton";
repo = "jade"; repo = "jade";
rev = "23444b1939e06f5caebff734c1d01a8a3d6265ef"; rev = "67174f42c38eeeda73cfed62197abf59f19b3b9c";
sha256 = "0sx94lps673b0dhbi26kgyjm4cnysdv2vgszpdmsbakdgd6zkdbf"; sha256 = "080dvzxymbrnaazx64lbvigd982z237a8427myi4mg5wnk68q1wg";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@ -19619,12 +19753,12 @@
meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild { melpaBuild {
pname = "meghanada"; pname = "meghanada";
version = "0.2.3"; version = "0.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mopemope"; owner = "mopemope";
repo = "meghanada-emacs"; repo = "meghanada-emacs";
rev = "2a68211d355edd8fca092a57c1a3d5e42c9193e3"; rev = "86820f22cd1ebf4c2f8cae5b64bc8ff3964ea221";
sha256 = "1s7m6p1i5wvfd0k136bcd59abm6aspmmjlcjhsnl36w8k82piaay"; sha256 = "0nn6p5r760hb3ffrv4lb3ny75np6ps0gscp1a20sdsfrz6fbv6dg";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@ -19682,12 +19816,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "merlin"; pname = "merlin";
version = "2.5.0"; version = "2.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "the-lambda-church"; owner = "the-lambda-church";
repo = "merlin"; repo = "merlin";
rev = "45ee84b5b0bb01784736df536760a6f8e4ea98a7"; rev = "6480e585a0e9d036d11aaf28bcee97e8e9b77c2e";
sha256 = "13x6np4cqzjf1jmiyhglsh2533nj5p2whj6gbcc3690p4chk32dy"; sha256 = "0p3hqxawp18q43ws6506cnndi49f3gxzmai0x2qch7h42dgh1cb8";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@ -20899,12 +21033,12 @@
nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "nginx-mode"; pname = "nginx-mode";
version = "1.1.4"; version = "1.1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ajc"; owner = "ajc";
repo = "nginx-mode"; repo = "nginx-mode";
rev = "8a296e30b01adbc40d1aa9ccde369a972ac5ceab"; rev = "304c9e2dbe884645661e3f133c11217a2b4d4274";
sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38"; sha256 = "1i9yh55zi7ml4i9nfjgvyz62y7id3c9fszs0h41skdzjfs9x5p6j";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@ -21106,11 +21240,11 @@
}) {}; }) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch"; pname = "notmuch";
version = "0.23"; version = "0.23.1";
src = fetchgit { src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch"; url = "git://git.notmuchmail.org/git/notmuch";
rev = "6cd6561aabcd24d033b592aa4503aaa3c06d241c"; rev = "ad517e9195a29b26955999c6e11fc37c73dbc01e";
sha256 = "0hiw1da6zdcr47znmxm9mm7r1318va026bq6jqvby61rbhzj2ny7"; sha256 = "0g1xybi4ndhvmnxgzxbp3x8kwg69jp3idf8x1asljcfsm6qhvr5i";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@ -21720,6 +21854,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
melpaBuild {
pname = "opensource";
version = "0.2.0";
src = fetchFromGitHub {
owner = "OpenSourceOrg";
repo = "el-opensourceorg";
rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370";
sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource";
sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my";
name = "opensource";
};
packageRequires = [ dash pkg-info request s ];
meta = {
homepage = "https://melpa.org/#/opensource";
license = lib.licenses.free;
};
}) {};
operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "operate-on-number"; pname = "operate-on-number";
@ -21807,12 +21962,12 @@
org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "org-beautify-theme"; pname = "org-beautify-theme";
version = "0.2"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jonnay"; owner = "jonnay";
repo = "org-beautify-theme"; repo = "org-beautify-theme";
rev = "152918e600c36400068b3d8849fb8b01882ce8c3"; rev = "7b7a7cbd4f25f77e8bd81783f517b2b182220fd9";
sha256 = "0414pi4yrzn87kfij83njwdw7aczx4ga6z7kq4miq2fh7cjq8bvj"; sha256 = "0nqw4apv642vqbjjqbi960zim9lkbnaszrlasf25c9fnzdg1m134";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme";
@ -23041,12 +23196,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "package-lint"; pname = "package-lint";
version = "0.2"; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "purcell"; owner = "purcell";
repo = "package-lint"; repo = "package-lint";
rev = "2f7bce95d26d06e5674b731c028dee820cbfe92e"; rev = "93fdd7b51ad7456387b905ff4c9b104d0b3089a8";
sha256 = "0wm107vriz1qvyaf82069dyscs5j6sccixik0bkh926i0whhysm1"; sha256 = "17swzcd58zh7yf221pfk8pmz8yhx2dsi2ad1y6lb2xpxxc5csflm";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@ -23375,12 +23530,12 @@
parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "parinfer"; pname = "parinfer";
version = "0.4.3"; version = "0.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DogLooksGood"; owner = "DogLooksGood";
repo = "parinfer-mode"; repo = "parinfer-mode";
rev = "f29efd86a13423055e47579f176db7fe0fd08bbd"; rev = "3831280b746049ab0dd76c4ab1facf35a7e91ff5";
sha256 = "0algcf5izfiyc154579fb3r7rbnv8dn7hy8iqy78ri1w8yb3xs2h"; sha256 = "14wj10yc0qg1g9sky8sgrlimc9a4fxk1jxvmacswb71s51vm906n";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@ -24150,12 +24305,12 @@
plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "plantuml-mode"; pname = "plantuml-mode";
version = "1.0.1"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "skuro"; owner = "skuro";
repo = "plantuml-mode"; repo = "plantuml-mode";
rev = "d7067729fa557e509784e50106eca802b81113e6"; rev = "2b7d79688608a5f328b95610edcdd871278fbd29";
sha256 = "0sgfy671vrqz8rny287vyd6cwvxgrbb2in5iq0fb3pbbp6fkp4d8"; sha256 = "1pmnz01k3n4jjkl1p31lcfh8j6g3zpr78p8f2wazdlgcl14g7pjz";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
@ -24697,8 +24852,8 @@
version = "0.7"; version = "0.7";
src = fetchhg { src = fetchhg {
url = "https://bitbucket.com/piranha/project-root"; url = "https://bitbucket.com/piranha/project-root";
rev = "fcd9df2eadca"; rev = "843ca1f4ab2b";
sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8"; sha256 = "0nw02f5lmbqdfnw93d3383sdxx1d31szk23zvjlrmmdwv2124281";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root"; url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root";
@ -25031,14 +25186,14 @@
pname = "puppet-mode"; pname = "puppet-mode";
version = "0.3"; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lunaryorn"; owner = "voxpupuli";
repo = "puppet-mode"; repo = "puppet-mode";
rev = "d943149691abd7b66c85d58aee9657bfcf822c02"; rev = "d943149691abd7b66c85d58aee9657bfcf822c02";
sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14"; sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca67e3241b3fe5037b8d6a8e4f1104d9a46a01b1/recipes/puppet-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc"; sha256 = "1qn71j6fkwnrsq1s6fhfcxhic3rbspg5cy9n7jv451ji7ywyhakf";
name = "puppet-mode"; name = "puppet-mode";
}; };
packageRequires = [ cl-lib emacs pkg-info ]; packageRequires = [ cl-lib emacs pkg-info ];
@ -26793,11 +26948,11 @@
secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild { melpaBuild {
pname = "secretaria"; pname = "secretaria";
version = "0.2.3"; version = "0.2.4";
src = fetchgit { src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el"; url = "https://bitbucket.org/shackra/secretaria.el";
rev = "7cbbbd5da3493b5fe7cd643e72c8cb4666453671"; rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b";
sha256 = "004cqj5ivmm0syyvncgadwmz9qaighih7nd7zn28xfc6v27m4jcg"; sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria"; url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@ -26960,12 +27115,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "sexy-monochrome-theme"; pname = "sexy-monochrome-theme";
version = "1.0"; version = "1.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nuncostans"; owner = "nuncostans";
repo = "sexy-monochrome-theme"; repo = "sexy-monochrome-theme";
rev = "64570387a30ec5ac685cb11824ee24f8890572e1"; rev = "dd582a45a4e13891935ab68f030d8c2d755fa6a5";
sha256 = "0fbm7gqg17blfpb5lybqvqw9qifsqjiprw65ih3asvrgynrxh2ra"; sha256 = "01jv7raxjyd37lipl05kl1892lz28ig292icik8l30y0p5gp8qgy";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@ -27485,12 +27640,12 @@
slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "slamhound"; pname = "slamhound";
version = "1.5.4"; version = "1.5.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "technomancy"; owner = "technomancy";
repo = "slamhound"; repo = "slamhound";
rev = "2f896d6ba15d09aae66b5fdecc0d855f6b03abc9"; rev = "7e38841ecdda7b3b569cca0b96c155ae2d3d433d";
sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8"; sha256 = "1kiczjqa1jhs24lgvizcs355rivx59psxw0fixc9yj8fgld7r4xs";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound"; url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound";
@ -27881,6 +28036,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
smmry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smmry";
version = "0.0.3";
src = fetchFromGitHub {
owner = "microamp";
repo = "smmry.el";
rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df";
sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry";
sha256 = "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn";
name = "smmry";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/smmry";
license = lib.licenses.free;
};
}) {};
smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "smooth-scroll"; pname = "smooth-scroll";
@ -27944,22 +28120,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rsnapshot-timemachine, seq }: snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
melpaBuild { melpaBuild {
pname = "snapshot-timemachine-rsnapshot"; pname = "snapshot-timemachine-rsnapshot";
version = "0.1"; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NicolasPetton"; owner = "NicolasPetton";
repo = "snapshot-timemachine-rsnapshot"; repo = "snapshot-timemachine-rsnapshot";
rev = "2c76bb73d157bc273c6ff13b76c57fa79dec2218"; rev = "4ff6b96219f4da576141e376b0348813c1c25615";
sha256 = "008064vg1586kjmdwi0hfps342dnfswah3nzz388gyl5lx7c356s"; sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot"; url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r"; sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r";
name = "snapshot-timemachine-rsnapshot"; name = "snapshot-timemachine-rsnapshot";
}; };
packageRequires = [ rsnapshot-timemachine seq ]; packageRequires = [ seq snapshot-timemachine ];
meta = { meta = {
homepage = "https://melpa.org/#/snapshot-timemachine-rsnapshot"; homepage = "https://melpa.org/#/snapshot-timemachine-rsnapshot";
license = lib.licenses.free; license = lib.licenses.free;
@ -28409,12 +28585,12 @@
stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "stan-mode"; pname = "stan-mode";
version = "9.1.0"; version = "9.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stan-dev"; owner = "stan-dev";
repo = "stan-mode"; repo = "stan-mode";
rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118"; rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr"; sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode";
@ -28430,12 +28606,12 @@
stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }: stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }:
melpaBuild { melpaBuild {
pname = "stan-snippets"; pname = "stan-snippets";
version = "9.1.0"; version = "9.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stan-dev"; owner = "stan-dev";
repo = "stan-mode"; repo = "stan-mode";
rev = "62109483b39c6dc20e1b55bd833c9f8ea38e7118"; rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
sha256 = "0jnfhb49hi6fydffhdj1kkhrsc45zjsnm43djbsgzdnd6abbfhnr"; sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets"; url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets";
@ -28739,22 +28915,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
suggest = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild { melpaBuild {
pname = "suggest"; pname = "suggest";
version = "0.1"; version = "0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Wilfred"; owner = "Wilfred";
repo = "suggest.el"; repo = "suggest.el";
rev = "785818164ce0823360409fd6e8d12e656409fdd3"; rev = "588ec8b9476c8d7f5f16018a7aaf90ee828fb4f5";
sha256 = "17xmpr2ir30x9nzb8fcbss7vnk1496sa1bxa8q8q1x778sh4728c"; sha256 = "1ckvsckqlbdcw6nbsrh9xizbpkr7r88ks39av8dhn5n412c5jm4g";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q"; sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q";
name = "suggest"; name = "suggest";
}; };
packageRequires = [ dash f loop s ]; packageRequires = [ dash emacs f loop s ];
meta = { meta = {
homepage = "https://melpa.org/#/suggest"; homepage = "https://melpa.org/#/suggest";
license = lib.licenses.free; license = lib.licenses.free;
@ -30468,12 +30644,12 @@
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "use-package"; pname = "use-package";
version = "2.2"; version = "2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jwiegley"; owner = "jwiegley";
repo = "use-package"; repo = "use-package";
rev = "27fdfba5b05fd51345dc2b947ae6342266fdb22b"; rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da";
sha256 = "1dzkvinp1h1w48lx44x9bn1b54c83m1wl5v8h99l76fh1y0jw7b4"; sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@ -32272,12 +32448,12 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }:
melpaBuild { melpaBuild {
pname = "zerodark-theme"; pname = "zerodark-theme";
version = "3.5"; version = "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NicolasPetton"; owner = "NicolasPetton";
repo = "zerodark-theme"; repo = "zerodark-theme";
rev = "e9205855c61c9afbfef061c3fd3703c3f7b39095"; rev = "0c662244a7d619938ec3673c21c735c19ee4e659";
sha256 = "1lfhr4hxbr522nfd7blx21k8kfrwawqrqg6s8hx2hcjzjabfssjz"; sha256 = "1c0r12dnhax5amiy01y0npm57r4wg8ln0ay4bick1f2jgc47g36k";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View File

@ -1,10 +1,10 @@
{ callPackage }: { { callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20161017"; version = "20161024";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-20161017.tar"; url = "http://orgmode.org/elpa/org-20161024.tar";
sha256 = "0hpvi68pzja6qna4x6bvj7hzfnfkgmmix7ramvr1q3m2nqxv2pvx"; sha256 = "0yph2wiwl426wn1vgbwxgnh8lr6x40swbpzzl87vfzfh5wjx4l1h";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -14,10 +14,10 @@
}) {}; }) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib"; pname = "org-plus-contrib";
version = "20161017"; version = "20161024";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20161017.tar"; url = "http://orgmode.org/elpa/org-plus-contrib-20161024.tar";
sha256 = "1qahvhkfgf5wh96j1v1c03yspjfqacyinix97is93c3nm94279f4"; sha256 = "1pr4mnf8mrxnlnn61y3w1jkwf1d7wlf9v8j65vvs1c26rbnzms85";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

20
pkgs/applications/editors/idea/default.nix
View File

@ -120,12 +120,12 @@ in
{ {
clion = buildClion rec { clion = buildClion rec {
name = "clion-${version}"; name = "clion-${version}";
version = "2016.2.2"; version = "2016.2.3";
description = "C/C++ IDE. New. Intelligent. Cross-platform"; description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "06aq3lfccki9203gjvibzj3gn9d82pc6s5z0m3fnf049zxk58ndi"; sha256 = "1gcglxmffq815r97wyy2wx1jsv467qyys8c0m5dv3yjdxknccbqd";
}; };
wmClass = "jetbrains-clion"; wmClass = "jetbrains-clion";
}; };
@ -156,12 +156,12 @@ in
idea-community = buildIdea rec { idea-community = buildIdea rec {
name = "idea-community-${version}"; name = "idea-community-${version}";
version = "2016.2.4"; version = "2016.2.5";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "0hk7z402qvkaa6hkhh4wsqxki2bnai5qkd2r0ngvy8kd71svrldz"; sha256 = "0d1pssnrn36fibwsyjh30fsd5hn7qw3nljdnwg40q52skilcdk0v";
}; };
wmClass = "jetbrains-idea-ce"; wmClass = "jetbrains-idea-ce";
}; };
@ -192,24 +192,24 @@ in
idea-ultimate = buildIdea rec { idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "2016.2.4"; version = "2016.2.5";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "165nchdnbyp85r2w0riv87j77lb7r492dkwrvm8q7qjnlfgznh7r"; sha256 = "0g8v3fw3610gyi25x489vlb72200rgb3b4rwh0igr4w35gwdv91h";
}; };
wmClass = "jetbrains-idea"; wmClass = "jetbrains-idea";
}; };
ruby-mine = buildRubyMine rec { ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}"; name = "ruby-mine-${version}";
version = "2016.2.2"; version = "2016.2.4";
description = "The Most Intelligent Ruby and Rails IDE"; description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "1ck4axjbrvq2n1j2rvf9a2f7dqvalg2b8sqy9n9qkzdn04szaqsl"; sha256 = "14c1afkmny78vj434y46nja3v9smzcqsfdkhr83bqic1a0h4g84w";
}; };
wmClass = "jetbrains-rubymine"; wmClass = "jetbrains-rubymine";
}; };
@ -288,12 +288,12 @@ in
webstorm = buildWebStorm rec { webstorm = buildWebStorm rec {
name = "webstorm-${version}"; name = "webstorm-${version}";
version = "2016.2.2"; version = "2016.2.4";
description = "Professional IDE for Web and JavaScript development"; description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0n2fvhjasklshyfcbwwn6wahzld8x65bid08245awdqv33p87bq6"; sha256 = "1h61l44xnbcdb26q8ylb25sj3rs43nxki203i2jra2i6j5jzxrvg";
}; };
wmClass = "jetbrains-webstorm"; wmClass = "jetbrains-webstorm";
}; };

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3; buildInputs = with gnome3;
[ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf
exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain
librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme ]; librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ];
enableParallelBuilding = true; enableParallelBuilding = true;

41
pkgs/applications/graphics/mtpaint/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv, fetchFromGitHub
, pkgconfig
, freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle
}:
stdenv.mkDerivation rec {
p_name = "mtPaint";
ver_maj = "3.49";
ver_min = "12";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchFromGitHub {
owner = "wjaguar";
repo = p_name;
rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8";
sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";
};
buildInputs = [
pkgconfig
freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle
];
meta = {
description = "A simple GTK+1/2 painting program";
longDescription = ''
mtPaint is a simple GTK+1/2 painting program designed for
creating icons and pixel based artwork. It can edit indexed palette
or 24 bit RGB images and offers basic painting and palette manipulation
tools. It also has several other more powerful features such as channels,
layers and animation.
Due to its simplicity and lack of dependencies it runs well on
GNU/Linux, Windows and older PC hardware.
'';
homepage = "http://mtpaint.sourceforge.net/";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.vklquevs ];
};
}

104
pkgs/applications/graphics/unigine-valley/default.nix Normal file
View File

@ -0,0 +1,104 @@
{ stdenv, fetchurl
# Build-time dependencies
, makeWrapper
, file
# Runtime dependencies
, fontconfig
, freetype
, libX11
, libXext
, libXinerama
, libXrandr
, libXrender
, openal}:
let
version = "1.0";
pkgversion = "1";
arch = if stdenv.system == "x86_64-linux" then
"x64"
else if stdenv.system == "i686-linux" then
"x86"
else
abort "Unsupported platform";
in
stdenv.mkDerivation {
name = "unigine-valley-${version}-${pkgversion}";
src = fetchurl {
url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run";
sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4";
};
sourceRoot = "Unigine_Valley-${version}";
buildInputs = [file makeWrapper];
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc # libstdc++.so.6
fontconfig
freetype
libX11
libXext
libXinerama
libXrandr
libXrender
openal
];
unpackPhase = ''
cp $src extractor.run
chmod +x extractor.run
./extractor.run --target $sourceRoot
'';
# The executable loads libGPUMonitor_${arch}.so "manually" (i.e. not through the ELF interpreter).
# However, it still uses the RPATH to look for it.
patchPhase = ''
# Patch ELF files.
elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1)
for elf in $elfs; do
echo "Patching $elf"
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true
done
'';
configurePhase = "";
buildPhase = "";
installPhase = ''
instdir=$out/opt/unigine/valley
# Install executables and libraries
mkdir -p $instdir/bin
install -m 0755 bin/browser_${arch} $instdir/bin
install -m 0755 bin/libApp{Stereo,Surround,Wall}_${arch}.so $instdir/bin
install -m 0755 bin/libGPUMonitor_${arch}.so $instdir/bin
install -m 0755 bin/libQt{Core,Gui,Network,WebKit,Xml}Unigine_${arch}.so.4 $instdir/bin
install -m 0755 bin/libUnigine_${arch}.so $instdir/bin
install -m 0755 bin/valley_${arch} $instdir/bin
install -m 0755 valley $instdir
# Install other files
cp -R data documentation $instdir
# Install and wrap executable
mkdir -p $out/bin
install -m 0755 valley $out/bin/valley
wrapProgram $out/bin/valley \
--run "cd $instdir" \
--prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath
'';
meta = {
description = "The Unigine Valley GPU benchmarking tool";
homepage = "http://unigine.com/products/benchmarks/valley/";
license = stdenv.lib.licenses.unfree; # see also: /nix/store/*-unigine-valley-1.0/opt/unigine/valley/documentation/License.pdf
maintainers = [ stdenv.lib.maintainers.kierdavis ];
platforms = ["x86_64-linux" "i686-linux"];
};
}

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

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
cp -r target/* "$out/share/java/zvtm/" cp -r target/* "$out/share/java/zvtm/"
echo '#!/bin/sh' > "$out/bin/zgrviewer" echo '#!/bin/sh' > "$out/bin/zgrviewer"
echo "java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer" echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer"
chmod a+x "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer"
''; '';
meta = { meta = {

12
pkgs/applications/misc/font-manager/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool, { stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
vala_0_32, gnome3, wrapGAppsHook librsvg, vala_0_34, gnome3, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "font-manager-${version}"; name = "font-manager-${version}";
version = "2016-06-04"; version = "0.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FontManager"; owner = "FontManager";
repo = "master"; repo = "master";
rev = "07b47c153494f19ced291c84437349253c5bde4d"; rev = version;
sha256 = "13pjmvx31fr8fqhl5qwawhawfl7as9c50qshzzig8n5g7vb5v1i0"; sha256 = "0qwi1mn2sc2q5cs28rga8i3cn34ylybs949vjnh97dl2rvlc0x06";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
automake autoconf libtool automake autoconf libtool
file file
intltool intltool
vala_0_32 vala_0_34
gnome3.yelp_tools gnome3.yelp_tools
wrapGAppsHook wrapGAppsHook
]; ];
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
json_glib json_glib
sqlite sqlite
itstool itstool
librsvg
gnome3.gtk gnome3.gtk
gnome3.gucharmap gnome3.gucharmap
gnome3.libgee gnome3.libgee
@ -40,7 +41,6 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
NOCONFIGURE=true ./autogen.sh NOCONFIGURE=true ./autogen.sh
chmod +x configure;
substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
''; '';

16
pkgs/applications/misc/hyperterm/default.nix → pkgs/applications/misc/hyper/default.nix
View File

@ -11,11 +11,11 @@ let
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.7.6"; version = "0.8.3";
name = "hyperterm-${version}"; name = "hyper-${version}";
src = fetchurl { src = fetchurl {
url = https://github.com/zeit/hyperterm/releases/download/v0.7.1/hyperterm-0.7.1.deb; url = "https://github.com/zeit/hyper/releases/download/${version}/hyper-${version}-amd64.deb";
sha256 = "1xdwhmzlkg1ly1xgsbv99xk4x1g1x270vx1b12dvf10ck5x9v63a"; sha256 = "1683gc0fhifn89l9h67yz02pk1xz7p5l3qpiyddr9w21qr9h3lhq";
}; };
buildInputs = [ dpkg ]; buildInputs = [ dpkg ];
unpackPhase = '' unpackPhase = ''
@ -25,16 +25,16 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
ln -s "$out/opt/HyperTerm/HyperTerm" "$out/bin/HyperTerm"
mv opt "$out/" mv opt "$out/"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/HyperTerm/HyperTerm" ln -s "$out/opt/Hyper/Hyper" "$out/bin/Hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/HyperTerm/resources/app/node_modules/child_pty/build/Release/exechelper" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/Hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/Hyper/resources/app/node_modules/child_pty/build/Release/exechelper"
mv usr/* "$out/" mv usr/* "$out/"
''; '';
dontPatchELF = true; dontPatchELF = true;
meta = with lib; { meta = with lib; {
description = "A terminal built on web technologies"; description = "A terminal built on web technologies";
homepage = https://hyperterm.org/; homepage = https://hyper.is/;
maintainers = with maintainers; [ puffnfresh ]; maintainers = with maintainers; [ puffnfresh ];
license = licenses.mit; license = licenses.mit;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];

4
pkgs/applications/misc/keepassx/2.0.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "keepassx2-${version}"; name = "keepassx2-${version}";
version = "2.0.2"; version = "2.0.3";
src = fetchurl { src = fetchurl {
url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz"; url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz";
sha256 = "1f1nlbd669rmpzr52d9dgfgclg4jcaq2jkrby3b8q1vjkksdqjr0"; sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3";
}; };
buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ]; buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];

166
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -1,91 +1,125 @@
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt { alsaLib
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , atk
, libuuid, cups, xz , cairo
, gstreamer, gst_plugins_base, libxml2 , cups
, gtkSupport ? true, glib, gtk2, pango, gdk_pixbuf, cairo, atk , curl
, kdeSupport ? false, qt4, kdelibs , dbus
, dpkg
, expat
, fetchurl
, fontconfig
, freetype
, gdk_pixbuf
, glib
, gnome2
, gtk2
, libX11
, libXScrnSaver
, libXcomposite
, libXcursor
, libXdamage
, libXext
, libXfixes
, libXi
, libXrandr
, libXrender
, libXtst
, libnotify
, libpulseaudio
, nspr
, nss
, pango
, stdenv
, systemd
}: }:
assert stdenv.isLinux && stdenv.cc.isGNU && stdenv.cc.libc != null;
let let
mirror = http://get.geo.opera.com/pub/opera;
in
stdenv.mkDerivation rec { mirror = https://get.geo.opera.com/pub/opera/desktop;
name = "opera-12.16-1860"; version = "40.0.2308.90";
rpath = stdenv.lib.makeLibraryPath [
# These provide shared libraries loaded when starting. If one is missing,
# an error is shown in stderr.
alsaLib.out
atk.out
cairo.out
cups.out
curl.out
dbus.lib
expat.out
fontconfig.lib
freetype.out
gdk_pixbuf.out
glib.out
gnome2.GConf.out
gtk2.out
libX11.out
libXScrnSaver.out
libXcomposite.out
libXcursor.out
libXdamage.out
libXext.out
libXfixes.out
libXi.out
libXrandr.out
libXrender.out
libXtst.out
libnotify.out
nspr.out
nss.out
pango.out
stdenv.cc.cc.lib
# This is a little tricky. Without it the app starts then crashes. Then it
# brings up the crash report, which also crashes. `strace -f` hints at a
# missing libudev.so.0.
systemd.lib
# Works fine without this except there is no sound.
libpulseaudio.out
];
in stdenv.mkDerivation {
name = "opera-${version}";
src = src =
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "${mirror}/linux/1216/${name}.i386.linux.tar.xz"; url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
sha256 = "df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d"; sha256 = "1fqbxbn4531yv9figgg8xxr63swimrgpamqrphcg8jq5q3smrk4k";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "${mirror}/linux/1216/${name}.x86_64.linux.tar.xz"; url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e"; sha256 = "12imzjxwip9r7bjyfnrpdsxyxb0cjn92s3b7ajdlbqccxxmc6k6g";
} }
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
dontStrip = 1; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
phases = "unpackPhase installPhase fixupPhase";
installPhase = '' installPhase = ''
./install --unattended --prefix $out mkdir --parent $out
''; mv * $out/
mv $out/lib/*/opera/*.so $out/lib/
buildInputs = '';
[ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE
libXft freetype fontconfig libXrender libuuid expat
gstreamer libxml2 gst_plugins_base
]
++ stdenv.lib.optionals gtkSupport [ glib gtk2 pango gdk_pixbuf cairo atk ]
++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
preFixup =
''
rm $out/bin/uninstall-opera
find $out/lib/opera -type f | while read f; do
type=$(readelf -h "$f" 2>/dev/null | sed -n 's/ *Type: *\([A-Z]*\).*/\1/p' || true)
if [ -z "$type" ]; then
:
elif [ $type == "EXEC" ]; then
echo "patching $f executable <<"
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
"$f"
elif [ $type == "DYN" ]; then
echo "patching $f library <<"
patchelf --set-rpath "${libPath}" "$f"
else
echo "Unknown type $type"
exit 1
fi
done
'';
postFixup = '' postFixup = ''
oldRPATH=`patchelf --print-rpath $out/lib/opera/opera` find $out -executable -type f \
patchelf --set-rpath $oldRPATH:${cups.out}/lib $out/lib/opera/opera | while read f
do
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command patchelf \
# It have no reasons to exist in a redistribuable package --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
rm $out/share/icons/hicolor/icon-theme.cache --set-rpath "$out/lib:${rpath}" \
''; "$f"
done
'';
meta = { meta = {
homepage = http://www.opera.com; homepage = http://www.opera.com;
description = "Web browser"; description = "Web browser";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
# Marked as broken due to needing an update for security issues.
# See: https://github.com/NixOS/nixpkgs/issues/18856
broken = true;
}; };
} }

66
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -1,55 +1,69 @@
{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils, e2fsprogs, procps-ng }: { stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync
, iptables, coreutils
, components ? [
"cmd/kubectl"
"cmd/kubelet"
"cmd/kube-apiserver"
"cmd/kube-controller-manager"
"cmd/kube-proxy"
"plugin/cmd/kube-scheduler"
"cmd/kube-dns"
"federation/cmd/federation-apiserver"
"federation/cmd/federation-controller-manager"
]
}:
with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kubernetes-${version}"; name = "kubernetes-${version}";
version = "1.2.4"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "kubernetes"; repo = "kubernetes";
rev = "v${version}"; rev = "v${version}";
sha256 = "1a3y0f1l008ywkwwygg9vn2rb722c54i3pbgqks38gw1yyvgbiih"; sha256 = "0q7xwdjsmfrz7pnmylkbkr2yxsl2gzzy17aapfznl2hb1ms81kys";
}; };
buildInputs = [ makeWrapper which go iptables rsync ]; buildInputs = [ makeWrapper which go rsync go-bindata ];
buildPhase = '' outputs = ["out" "man""pause"];
GOPATH=$(pwd):$(pwd)/Godeps/_workspace
mkdir -p $(pwd)/Godeps/_workspace/src/k8s.io
ln -s $(pwd) $(pwd)/Godeps/_workspace/src/k8s.io/kubernetes
postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
patchShebangs ./hack patchShebangs ./hack
hack/build-go.sh --use_go_build
(cd cluster/addons/dns/kube2sky && go build ./kube2sky.go)
''; '';
WHAT="--use_go_build ${concatStringsSep " " components}";
postBuild = "(cd build/pause && gcc pause.c -o pause)";
installPhase = '' installPhase = ''
mkdir -p "$out/bin" "$out"/libexec/kubernetes/cluster mkdir -p "$out/bin" "$man/share/man" "$pause/bin"
cp _output/local/go/bin/{kube*,hyperkube} "$out/bin/"
cp cluster/addons/dns/kube2sky/kube2sky "$out/bin/" cp _output/local/go/bin/* "$out/bin/"
cp cluster/saltbase/salt/helpers/safe_format_and_mount "$out/libexec/kubernetes" cp build/pause/pause "$pause/bin/pause"
cp -R hack "$out/libexec/kubernetes" cp -R docs/man/man1 "$man/share/man"
cp cluster/update-storage-objects.sh "$out/libexec/kubernetes/cluster"
makeWrapper "$out"/libexec/kubernetes/cluster/update-storage-objects.sh "$out"/bin/kube-update-storage-objects \
--prefix KUBE_BIN : "$out/bin"
''; '';
preFixup = '' preFixup = ''
wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin" wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
wrapProgram "$out/bin/kubelet" --prefix PATH : "${stdenv.lib.makeBinPath [ utillinux procps-ng ]}" wrapProgram "$out/bin/kubelet" --prefix PATH : "${coreutils}/bin"
chmod +x "$out/libexec/kubernetes/safe_format_and_mount"
wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${stdenv.lib.makeBinPath [ e2fsprogs utillinux ]}" # Remove references to go compiler
substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \ while read file; do
--replace KUBE_OUTPUT_HOSTBIN KUBE_BIN cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp
mv $file.tmp $file
chmod +x $file
done < <(find $out/bin $pause/bin -type f 2>/dev/null)
''; '';
meta = with stdenv.lib; { meta = {
description = "Production-Grade Container Scheduling and Management"; description = "Production-Grade Container Scheduling and Management";
license = licenses.asl20; license = licenses.asl20;
homepage = http://kubernetes.io; homepage = http://kubernetes.io;
maintainers = with maintainers; [offline]; maintainers = with maintainers; [offline];
platforms = [ "x86_64-linux" ]; platforms = platforms.linux;
}; };
} }

4
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
let version = "3.20.1"; in let version = "3.22.1"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "filezilla-${version}"; name = "filezilla-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
sha256 = "0bcy0j89y2mpjyzwnz1qa33412n7yl0g8px2r4v7gla25r2x5qwa"; sha256 = "0pr8wj2dk5s5xxrsl0pb8y1bna0k1s3c18dh056c6qp02gba1a1f";
}; };
configureFlags = [ configureFlags = [

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -4,7 +4,7 @@
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
, systemd, libXScrnSaver }: , systemd, libXScrnSaver }:
let version = "0.0.8"; in let version = "0.0.9"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "1g48jxiswpfvbgjs4dyywmzj9kncvrgpajhixk3acizdmfmsyqkk"; sha256 = "72f692cea62b836220f40d81d110846f9cde9a0fba7a8d47226d89e0980255b9";
}; };
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [

2
pkgs/applications/networking/irc/quassel-webserver/default.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
let let
nodePackages = callPackage <nixpkgs/pkgs/top-level/node-packages.nix> { nodePackages = callPackage ../../../../top-level/node-packages.nix {
neededNatives = [ python ]; neededNatives = [ python ];
self = nodePackages; self = nodePackages;
generated = ./quassel-webserver.nix; generated = ./quassel-webserver.nix;

6
pkgs/applications/networking/znc/default.nix
View File

@ -7,11 +7,11 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "znc-1.6.2"; name = "znc-1.6.3";
src = fetchurl { src = fetchurl {
url = "http://znc.in/releases/${name}.tar.gz"; url = "http://znc.in/releases/${name}.tar.gz";
sha256 = "14q5dyr5zg99hm6j6g1gilcn1zf7dskhxfpz3bnkyhy6q0kpgwgf"; sha256 = "09xqi5fs40x6nj9gq99bnw1a7saq96bvqxknxx0ilq7yfvg4c733";
}; };
buildInputs = [ openssl pkgconfig ] buildInputs = [ openssl pkgconfig ]
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Advanced IRC bouncer"; description = "Advanced IRC bouncer";
homepage = http://wiki.znc.in/ZNC; homepage = http://wiki.znc.in/ZNC;
maintainers = with maintainers; [ viric ]; maintainers = with maintainers; [ viric schneefux ];
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
}; };

42
pkgs/applications/networking/znc/modules.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, znc }: { stdenv, fetchurl, fetchFromGitHub, znc }:
let let
zncDerivation = a@{ zncDerivation = a@{
@ -20,8 +20,9 @@ in rec {
version = "git-2015-08-27"; version = "git-2015-08-27";
module_name = "clientbuffer"; module_name = "clientbuffer";
src = fetchgit { src = fetchFromGitHub {
url = meta.repositories.git; owner = "jpnurmi";
repo = "znc-clientbuffer";
rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840"; rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840";
sha256 = "1s8bqqlwy9kmcpmavil558rd2b0wigjlzp2lpqpcqrd1cg25g4a7"; sha256 = "1s8bqqlwy9kmcpmavil558rd2b0wigjlzp2lpqpcqrd1cg25g4a7";
}; };
@ -29,7 +30,6 @@ in rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "ZNC module for client specific buffers"; description = "ZNC module for client specific buffers";
homepage = https://github.com/jpnurmi/znc-clientbuffer; homepage = https://github.com/jpnurmi/znc-clientbuffer;
repositories.git = https://github.com/jpnurmi/znc-clientbuffer.git;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ hrdinka ]; maintainers = with maintainers; [ hrdinka ];
}; };
@ -40,8 +40,10 @@ in rec {
version = "git-2014-10-10"; version = "git-2014-10-10";
module_name = "fish"; module_name = "fish";
src = fetchgit { src = fetchFromGitHub {
url = meta.repositories.git; # this fork works with ZNC 1.6
owner = "jarrydpage";
repo = "znc-fish";
rev = "9c580e018a1a08374e814fc06f551281cff827de"; rev = "9c580e018a1a08374e814fc06f551281cff827de";
sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl"; sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
}; };
@ -49,8 +51,6 @@ in rec {
meta = { meta = {
description = "ZNC FiSH module"; description = "ZNC FiSH module";
homepage = https://github.com/dctrwatson/znc-fish; homepage = https://github.com/dctrwatson/znc-fish;
# this fork works with ZNC 1.6
repositories.git = https://github.com/jarrydpage/znc-fish.git;
maintainers = [ stdenv.lib.maintainers.offline ]; maintainers = [ stdenv.lib.maintainers.offline ];
}; };
}; };
@ -60,8 +60,9 @@ in rec {
version = "git-2015-08-04"; version = "git-2015-08-04";
module_name = "playback"; module_name = "playback";
src = fetchgit { src = fetchFromGitHub {
url = meta.repositories.git; owner = "jpnurmi";
repo = "znc-playback";
rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b"; rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b";
sha256 = "0mgfajljy035051b2sx70i8xrb51zw9q2z64kf85zw1lynihzyh4"; sha256 = "0mgfajljy035051b2sx70i8xrb51zw9q2z64kf85zw1lynihzyh4";
}; };
@ -69,7 +70,6 @@ in rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An advanced playback module for ZNC"; description = "An advanced playback module for ZNC";
homepage = https://github.com/jpnurmi/znc-playback; homepage = https://github.com/jpnurmi/znc-playback;
repositories.git = https://github.com/jpnurmi/znc-playback.git;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ hrdinka ]; maintainers = with maintainers; [ hrdinka ];
}; };
@ -80,8 +80,9 @@ in rec {
version = "git-2015-02-22"; version = "git-2015-02-22";
module_name = "privmsg"; module_name = "privmsg";
src = fetchgit { src = fetchFromGitHub {
url = meta.repositories.git; owner = "kylef";
repo = "znc-contrib";
rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517"; rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517";
sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2"; sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2";
}; };
@ -89,27 +90,26 @@ in rec {
meta = { meta = {
description = "ZNC privmsg module"; description = "ZNC privmsg module";
homepage = https://github.com/kylef/znc-contrib; homepage = https://github.com/kylef/znc-contrib;
repositories.git = https://github.com/kylef/znc-contrib.git;
}; };
}; };
push = zncDerivation rec { push = zncDerivation rec {
name = "znc-push-${version}"; name = "znc-push-${version}";
version = "git-2015-12-07"; version = "git-2016-10-12";
module_name = "push"; module_name = "push";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/jreese/znc-push.git"; owner = "jreese";
rev = "717a2b1741eee75456b0862ef76dbb5af906e936"; repo = "znc-push";
sha256 = "1ih1hf11mqgi0cfh6v70v3b93xrw83xcb80psmijcqxi7kwjn404"; rev = "cf08b9e0f483f03c28d72dd78df932cbef141f10";
sha256 = "0xpwjw8csyrg736g1jc1n8d6804x6kbdkrvldzhk9ldj4iwqz7ay";
}; };
meta = { meta = {
description = "Push notification service module for ZNC"; description = "Push notification service module for ZNC";
homepage = https://github.com/jreese/znc-push; homepage = https://github.com/jreese/znc-push;
repositories.git = https://github.com/jreese/znc-push.git;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.offline ]; maintainers = with stdenv.lib.maintainers; [ offline schneefux ];
}; };
}; };

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

@ -7,11 +7,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "R-3.2.3"; name = "R-3.2.4";
src = fetchurl { src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1"; sha256 = "0l6k3l3cy6fa9xkn23zvz5ykpw10s45779x88yz3pzn2x5gl1zds";
}; };
buildInputs = [ bzip2 gfortran libX11 libXmu libXt buildInputs = [ bzip2 gfortran libX11 libXmu libXt

24
pkgs/applications/science/math/gfan/default.nix Normal file
View File

@ -0,0 +1,24 @@
{stdenv, fetchurl, gmp, mpir, cddlib}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gfan";
version = "0.5";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "http://home.math.au.dk/jensen/software/gfan/gfan${version}.tar.gz";
sha256 = "0adk9pia683wf6kn6h1i02b3801jz8zn67yf39pl57md7bqbrsma";
};
preBuild = ''
sed -e 's@static int i;@//&@' -i app_minkowski.cpp
'';
makeFlags = ''PREFIX=$(out)'';
buildInputs = [gmp mpir cddlib];
meta = {
inherit version;
description = ''A software package for computing Gröbner fans and tropical varieties'';
license = stdenv.lib.licenses.gpl2 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html";
};
}

23
pkgs/applications/science/math/maxima/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null, tk ? null, gnuplot ? null }: { stdenv, fetchurl, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null,
tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
}:
let let
name = "maxima"; name = "maxima";
@ -6,9 +8,9 @@ let
searchPath = searchPath =
stdenv.lib.makeBinPath stdenv.lib.makeBinPath
(stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]); (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]);
in in
stdenv.mkDerivation { stdenv.mkDerivation ({
name = "${name}-${version}"; name = "${name}-${version}";
src = fetchurl { src = fetchurl {
@ -16,7 +18,8 @@ stdenv.mkDerivation {
sha256 = "1p6646rvq43hk09msyp0dk50cqpkh07mf4x0bc2fqisqmcv6b1hf"; sha256 = "1p6646rvq43hk09msyp0dk50cqpkh07mf4x0bc2fqisqmcv6b1hf";
}; };
buildInputs = [sbcl texinfo perl python makeWrapper]; buildInputs = stdenv.lib.filter (x: x != null)
[sbcl ecl texinfo perl python makeWrapper];
postInstall = '' postInstall = ''
# Make sure that maxima can find its runtime dependencies. # Make sure that maxima can find its runtime dependencies.
@ -27,7 +30,11 @@ stdenv.mkDerivation {
mkdir -p $out/share/emacs $out/share/doc mkdir -p $out/share/emacs $out/share/doc
ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
ln -s ../maxima/${version}/doc $out/share/doc/maxima ln -s ../maxima/${version}/doc $out/share/doc/maxima
''; ''
+ (stdenv.lib.optionalString ecl-fasl ''
cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/"
'')
;
# Failures in the regression test suite won't abort the build process. We run # Failures in the regression test suite won't abort the build process. We run
# the suite only so that potential errors show up in the build log. See also: # the suite only so that potential errors show up in the build log. See also:
@ -51,4 +58,8 @@ stdenv.mkDerivation {
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ]; maintainers = [ stdenv.lib.maintainers.peti ];
}; };
} } // (stdenv.lib.optionalAttrs ecl-fasl {
preConfigure = ''
sed -e '/c::build-program "binary-ecl\/maxima"/i(c::build-fasl "binary-ecl\/maxima.fasl" :lisp-files obj :ld-flags (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" (find-package "MAXIMA"))))) (if (and x (not (string= x ""))) (list x))))' -i src/maxima.system
'';
}))

24
pkgs/applications/science/math/nauty/default.nix Normal file
View File

@ -0,0 +1,24 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "nauty-${version}";
version = "26r7";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
sha256 = "1indcc1im7s5x89x0xn4699izw1wwars1aanpmf8jibnw66n9dcp";
};
buildInputs = [];
installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty}
cp $(find . -type f -perm -111 \! -name '*.*' ) "$out/bin"
cp [Rr][Ee][Aa][Dd]* COPYRIGHT This* [Cc]hange* "$out/share/doc/nauty"
'';
meta = {
inherit version;
description = ''Programs for computing automorphism groups of graphs and digraphs'';
license = stdenv.lib.licenses.asl20;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "http://pallini.di.uniroma1.it/";
};
}

31
pkgs/applications/science/math/pari/alpha.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, gmp, readline, perl }:
stdenv.mkDerivation rec {
version = "2.8.0.alpha";
name = "pari-${version}";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
sha256 = "1nrjybrqv55p669rmlkghb940hzf63vnpn34sbwhy9zlbw3hg305";
};
buildInputs = [gmp readline];
nativeBuildInputs = [perl];
configureScript = "./Configure";
configureFlags =
"--with-gmp=${gmp.dev} " +
"--with-readline=${readline.dev}";
meta = with stdenv.lib; {
description = "Computer algebra system for high-performance number theory computations";
homepage = "http://pari.math.u-bordeaux.fr/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes raskin ];
platforms = platforms.linux;
inherit version;
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
updateWalker = true;
};
}

21
pkgs/applications/science/math/ratpoints/default.nix Normal file
View File

@ -0,0 +1,21 @@
{stdenv, fetchurl, gmp}:
stdenv.mkDerivation rec {
name = "ratpoints-${version}";
version = "2.1.3";
src = fetchurl {
url = "http://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${version}.tar.gz";
sha256 = "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4";
};
buildInputs = [gmp];
makeFlags = "INSTALL_DIR=$(out)";
preInstall = ''mkdir -p "$out"/{bin,share,lib,include}'';
meta = {
inherit version;
description = ''A program to find rational points on hyperelliptic curves'';
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/";
updateWalker = true;
};
}

41
pkgs/applications/science/math/singular/default.nix
View File

@ -1,30 +1,47 @@
{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils }: { stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig
, asLibsingular ? false
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "singular-${version}"; name = "singular-${version}";
version="3-1-2"; version="3-1-7";
src = fetchurl { src = fetchurl {
url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/${name}.tar.gz"; url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/Singular-${version}.tar.gz";
sha256 = "04f9i1xar0r7qrrbfki1h9rrmx5y2xg4w7rrvlbx05v2dy6s8djv"; sha256 = "1j4mcpnwzdp3h4qspk6ww0m67rmx4s11cy17pvzbpf70lm0jzzh2";
}; };
buildInputs = [ gmp bison perl autoconf ncurses readline coreutils ]; buildInputs = [ gmp perl ncurses readline ];
nativeBuildInputs = [ autoconf bison pkgconfig ];
preConfigure = '' preConfigure = ''
find . -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' find . -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';'
find . -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' find . -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';'
${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''}
''; '';
hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
postInstall = '' # The Makefile actually defaults to `make install` anyway
rm -rf "$out/LIB" buildPhase = "true;";
cp -r Singular/LIB "$out"
installPhase = ''
mkdir -p "$out"
cp -r Singular/LIB "$out/LIB"
make install${stdenv.lib.optionalString asLibsingular "-libsingular"}
binaries="$(find "$out"/* \( -type f -o -type l \) -perm -111 \! -name '*.so' -maxdepth 1)"
ln -s "$out"/*/{include,lib} "$out"
mkdir -p "$out/bin" mkdir -p "$out/bin"
ln -s "$out/"*/Singular "$out/bin" for b in $binaries; do
bbn="$(basename "$b")"
echo -e '#! ${stdenv.shell}\n"'"$b"'" "$@"' > "$out/bin/$bbn"
chmod a+x "$out/bin/$bbn"
done
''; '';
enableParallelBuild = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A CAS for polynomial computations"; description = "A CAS for polynomial computations";
maintainers = with maintainers; maintainers = with maintainers;
@ -32,10 +49,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
homepage = "http://www.singular.uni-kl.de/index.php"; homepage = "http://www.singular.uni-kl.de/index.php";
}; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
passthru = {
updateInfo = {
downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
};
}; };
} }

29
pkgs/applications/science/math/symmetrica/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "symmetrica-${version}";
version = "2.0";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/SYM2_0_tar.gz";
sha256 = "1qhfrbd5ybb0sinl9pad64rscr08qvlfzrzmi4p4hk61xn6phlmz";
name = "symmetrica-2.0.tar.gz";
};
buildInputs = [];
sourceRoot = ".";
installPhase = ''
mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica}
ar crs libsymmetrica.a *.o
ranlib libsymmetrica.a
cp libsymmetrica.a "$out/lib"
cp *.h "$out/include/symmetrica"
cp README *.doc "$out/share/doc/symmetrica"
'';
meta = {
inherit version;
description = ''A collection of routines for representation theory and combinatorics'';
license = stdenv.lib.licenses.publicDomain;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "http://www.symmetrica.de/";
};
}

4
pkgs/applications/video/mpv/default.nix
View File

@ -77,13 +77,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "mpv-${version}"; name = "mpv-${version}";
version = "0.20.0"; version = "0.21.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mpv-player"; owner = "mpv-player";
repo = "mpv"; repo = "mpv";
rev = "v${version}"; rev = "v${version}";
sha256 = "0zp852b505lr2gllqylg2xrc8sgw9b1xjn1c7px36hzddny15c16"; sha256 = "1v1qfppysi0qn40q9z7cx9gs7pcrz2hn1g44iynygvgj29h1gify";
}; };
patchPhase = '' patchPhase = ''

13
pkgs/applications/virtualization/cbfstool/default.nix
View File

@ -2,17 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cbfstool-${version}"; name = "cbfstool-${version}";
version = "git-2015-07-09"; version = "4.5";
src = fetchgit { src = fetchgit {
url = "http://review.coreboot.org/p/coreboot"; url = "http://review.coreboot.org/p/coreboot";
rev = "5d866213f42fd22aed80abb5a91d74f6d485ac3f"; rev = "refs/tags/${version}";
sha256 = "1fki5670pmz1wb0yg0a0hb5cap78mgbvdhj8m2xly2kndwicg40p"; sha256 = "0sc2h440x4sfp1lqnmh3xfgymf7j0rqfx00v6jqf0svfbp8a6cq5";
}; };
buildInputs = [ iasl flex bison ]; nativeBuildInputs = [ flex bison ];
buildInputs = [ iasl ];
hardeningDisable = [ "fortify" ];
buildPhase = '' buildPhase = ''
export LEX=${flex}/bin/flex export LEX=${flex}/bin/flex
@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "CBFS tool"; description = "Management utility for CBFS formatted ROM images";
homepage = http://www.coreboot.org; homepage = http://www.coreboot.org;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.tstrobel ]; maintainers = [ maintainers.tstrobel ];

8
pkgs/applications/window-managers/ratpoison/default.nix
View File

@ -12,11 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains"; sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains";
}; };
outputs = [ "out" "contrib" "doc" "info" ];
buildInputs = buildInputs =
[ pkgconfig perl autoconf automake [ pkgconfig perl autoconf automake
libX11 inputproto libXt libXpm libXft libXtst xextproto libXi libX11 inputproto libXt libXpm libXft libXtst xextproto libXi
fontconfig freetype readline ]; fontconfig freetype readline ];
postInstall = ''
mkdir -p $contrib/{bin,share}
mv $out/bin/rpws $contrib/bin
mv $out/share/ratpoison $contrib/share
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://www.nongnu.org/ratpoison/"; homepage = "http://www.nongnu.org/ratpoison/";
description = "Simple mouse-free tiling window manager"; description = "Simple mouse-free tiling window manager";

25
pkgs/applications/window-managers/sawfish/default.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango { stdenv, fetchurl
, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo , pkgconfig, which, autoreconfHook
, rep-gtk, pango, gdk_pixbuf
, imlib, gettext, texinfo
, libXinerama, libXrandr, libXtst, libICE, libSM
, makeWrapper , makeWrapper
}: }:
@ -8,18 +11,18 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sawfish-${version}"; name = "sawfish-${version}";
version = "1.11.90"; version = "1.12.0";
sourceName = "sawfish_${version}";
src = fetchgit { src = fetchurl {
url = "https://github.com/SawfishWM/sawfish.git"; url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz";
rev = "b121f832571c9aebd228691c32604146e49f5e55"; sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4";
sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc";
}; };
buildInputs = buildInputs = [ pkgconfig which autoreconfHook
[ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama rep-gtk pango gdk_pixbuf imlib gettext texinfo
libXrandr libXtst imlib gettext texinfo makeWrapper libXinerama libXrandr libXtst libICE libSM
]; makeWrapper ];
patchPhase = '' patchPhase = ''
sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in

2
pkgs/build-support/docker/default.nix
View File

@ -438,7 +438,7 @@ rec {
< image/repositories) < image/repositories)
for l in image/*/layer.tar; do for l in image/*/layer.tar; do
ls_tar image/*/layer.tar >> baseFiles ls_tar $l >> baseFiles
done done
fi fi

2
pkgs/build-support/grsecurity/default.nix
View File

@ -21,7 +21,7 @@ assert (kernel.version == grsecPatch.kver);
overrideDerivation (kernel.override { overrideDerivation (kernel.override {
inherit modDirVersion; inherit modDirVersion;
kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []); kernelPatches = lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
extraConfig = '' extraConfig = ''
GRKERNSEC y GRKERNSEC y
PAX y PAX y

6
pkgs/data/fonts/unifont/default.nix
View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "unifont-${version}"; name = "unifont-${version}";
version = "9.0.02"; version = "9.0.03";
ttf = fetchurl { ttf = fetchurl {
url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf"; url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf";
sha256 = "14a254gpfyr2ssmbxqwfvh6166vc4klnx2vgz4nybx52bnr9qfkm"; sha256 = "00j97r658xl33zgi66glgbx2s7j9q52cj4iq7z1rrf3p38xzgbff";
}; };
pcf = fetchurl { pcf = fetchurl {
url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz"; url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz";
sha256 = "07wn2hlx1x22d2nil0zgsrlgy9b2hdhwly37sr70shp8lkba7wn2"; sha256 = "1w3gaz8afc3q7svgm4hmgjhvi9pxkmgsib8sscgi52c7ff0mhq9f";
}; };
buildInputs = [ mkfontscale mkfontdir ]; buildInputs = [ mkfontscale mkfontdir ];

6
pkgs/data/fonts/unifont_upper/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "unifont_upper-${version}"; name = "unifont_upper-${version}";
version = "9.0.01"; version = "9.0.03";
ttf = fetchurl { ttf = fetchurl {
url = "http://unifoundry.com/pub/unifont-9.0.01/font-builds/${name}.ttf"; url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf";
sha256 = "06b7na4vb2fjn0zn14bmarzn6vb3ndkysixc89kmb2cc24kfpix1"; sha256 = "015v39y6nnyz4ld006349jzk9isyaqp4cnvmz005ylfnicl4zwhi";
}; };
phases = "installPhase"; phases = "installPhase";

44
pkgs/development/compilers/ats2/default.nix
View File

@ -1,17 +1,53 @@
{ stdenv, fetchurl, gmp }: { stdenv, fetchurl, gmp
, withEmacsSupport ? true
, withContrib ? true }:
let
versionPkg = "0.2.11" ;
contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
sha256 = "0kc4nx1904745c1rkj9yfbayidw7rks1mwq0lxmvsgghn98dxwjn" ;
};
postInstallContrib = stdenv.lib.optionalString withContrib
''
local contribDir=$out/lib/ats2-postiats-*/ ;
mkdir -p $contribDir ;
tar -xzf "${contrib}" --strip-components 1 -C $contribDir ;
'';
postInstallEmacs = stdenv.lib.optionalString withEmacsSupport
''
local siteLispDir=$out/share/emacs/site-lisp/ats2 ;
mkdir -p $siteLispDir ;
install -m 0644 -v ./utils/emacs/*.el $siteLispDir ;
'';
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ats2-${version}"; name = "ats2-${version}";
version = "0.2.7"; version = versionPkg;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "1w9cncahv0vkqsj4vlfnn7bn61jvgxgjhk7wbppcm3yhb48pkmda"; sha256 = "140xy129fr11bdf4bj6qya9mf0fhnv2x7ksb9j46pf2yzrsrks8g";
}; };
buildInputs = [ gmp ]; buildInputs = [ gmp ];
setupHook = ./setup-hook.sh; setupHook = with stdenv.lib;
let
hookFiles =
[ ./setup-hook.sh ]
++ optional withContrib ./setup-contrib-hook.sh;
in
builtins.toFile "setupHook.sh"
(concatMapStringsSep "\n" builtins.readFile hookFiles);
patches = [ ./installed-lib-directory-version.patch ];
postInstall = postInstallContrib + postInstallEmacs;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Functional programming language with dependent types"; description = "Functional programming language with dependent types";

99
pkgs/development/compilers/ats2/installed-lib-directory-version.patch Normal file
View File

@ -0,0 +1,99 @@
Change the name of the library directory to match the version of the package.
diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
--- ATS2-Postiats-0.2.11/configure 2016-10-13 12:03:20.000000000 -0400
+++ postiats-new/configure 2016-10-23 20:17:29.912579618 -0400
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10.
+# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.11.
#
# Report bugs to <gmpostiats@gmail.com>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='ATS2/Postiats'
PACKAGE_TARNAME='ats2-postiats'
-PACKAGE_VERSION='0.2.10'
-PACKAGE_STRING='ATS2/Postiats 0.2.10'
+PACKAGE_VERSION='0.2.11'
+PACKAGE_STRING='ATS2/Postiats 0.2.11'
PACKAGE_BUGREPORT='gmpostiats@gmail.com'
PACKAGE_URL=''
@@ -1242,7 +1242,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems.
+\`configure' configures ATS2/Postiats 0.2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1304,7 +1304,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";;
+ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.11:";;
esac
cat <<\_ACEOF
@@ -1384,7 +1384,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ATS2/Postiats configure 0.2.10
+ATS2/Postiats configure 0.2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1936,7 +1936,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ATS2/Postiats $as_me 0.2.10, which was
+It was created by ATS2/Postiats $as_me 0.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4226,7 +4226,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ATS2/Postiats $as_me 0.2.10, which was
+This file was extended by ATS2/Postiats $as_me 0.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4288,7 +4288,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ATS2/Postiats config.status 0.2.10
+ATS2/Postiats config.status 0.2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Naur ATS2-Postiats-0.2.11/src/CBOOT/config.h postiats-new/src/CBOOT/config.h
--- ATS2-Postiats-0.2.11/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400
+++ postiats-new/src/CBOOT/config.h 2016-10-23 20:16:34.613836556 -0400
@@ -44,7 +44,7 @@
#define PACKAGE_NAME "ATS2/Postiats"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ATS2/Postiats 0.2.10"
+#define PACKAGE_STRING "ATS2/Postiats 0.2.11"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ats2-postiats"
@@ -53,7 +53,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.2.10"
+#define PACKAGE_VERSION "0.2.11"
/* The size of `void*', as computed by sizeof. */
#define SIZEOF_VOIDP 8

1
pkgs/development/compilers/ats2/setup-contrib-hook.sh Normal file
View File

@ -0,0 +1 @@
export PATSHOMERELOC=@out@/lib/ats2-postiats-@version@

5
pkgs/development/compilers/jhc/default.nix
View File

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ghc ]; buildInputs = [ perl ghc ];
preConfigure = ''
configureFlagsArray+=("CC=cc")
configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc")
'';
meta = { meta = {
description = "Whole-program, globally optimizing Haskell compiler"; description = "Whole-program, globally optimizing Haskell compiler";
homepage = "http://repetae.net/computer/jhc/"; homepage = "http://repetae.net/computer/jhc/";

13
pkgs/development/compilers/llvm/3.7/default.nix
View File

@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: { newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped; clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang; stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};

13
pkgs/development/compilers/llvm/3.8/default.nix
View File

@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: { newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped; clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang; stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};

13
pkgs/development/compilers/llvm/3.9/default.nix
View File

@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin }: { newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped; clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang; stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};

4
pkgs/development/compilers/nim/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }: { stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nim-0.15.0"; name = "nim-0.15.2";
src = fetchurl { src = fetchurl {
url = "http://nim-lang.org/download/${name}.tar.xz"; url = "http://nim-lang.org/download/${name}.tar.xz";
sha256 = "1yv9qvc1r7m0m4gwi8mgnabdjz70mwxf5rmv8xhibcmja1856565"; sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
}; };
buildPhase = "sh build.sh"; buildPhase = "sh build.sh";

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

@ -22,41 +22,41 @@ let
throw "openjdk requires i686-linux or x86_64 linux"; throw "openjdk requires i686-linux or x86_64 linux";
update = "122"; update = "122";
build = "00"; build = "03";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}"; repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m"; paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl { jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "0biy2xpb6krinmpj5pqsz0vryd2m6i819csvqnv88rc3750qh13d"; sha256 = "0s3igii73s9jpq8prpvfhymiadr7vi15cllkxjrks7khx0brcs6m";
}; };
langtools = fetchurl { langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "1wy9n64fvxybpd8lqd2zbiv2z23nfp10bd098lhqw7z46yxbm3ra"; sha256 = "1x9g3z10mskcv08sdgd1vcm1mf4668ww2s4ivx9spf2vdalk9a4x";
}; };
hotspot = fetchurl { hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "1hzliyjaz0dq7l934d16c3ddx6kiszl2hkc2cs0rhb09m7q4zcv7"; sha256 = "1zz0k4grqw57mgcrximq7g7h3c149s1x9b6xcwvvl2f6qn791pn9";
}; };
corba = fetchurl { corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "0576r009my434fgv9m7lwd5bvvgbb182aw8z8fwwbi36mf5j3sr5"; sha256 = "1xi2yi6wplzfnx213w8zpc78rbclig13m7zl2mgz61ay2l2v8znh";
}; };
jdk = fetchurl { jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "1hn40jm2fcs037zx30k1gxw6j24hr50a78zjjaaql73yhhzf74xh"; sha256 = "01r9cwm68dc34qigl3jn0bifmbgf8jgmddr0wi54sn126pn48c2j";
}; };
jaxws = fetchurl { jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "1lbvaw3ck0inz9376qh9nw8d1ys93plfpsn1sp9mmwdjyglvznif"; sha256 = "043zwvnq9zjnb06xfcbi3rd15ji80z79cdar7hdx0d8ifgd75wsb";
}; };
jaxp = fetchurl { jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "11viwry7fj70wgzfbpslb6j1zpqqzicdf8yyqhw3whf7l6wx2bav"; sha256 = "1ydbwpa4v28npdgla7aiwsfk3k4ylj86vz482zq3j7h30i6w9h4v";
}; };
nashorn = fetchurl { nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "057g393kjb9via2a3x3zm7r4g9dslw0nkwn6yppzd8hal325s1wa"; sha256 = "01bpbfwh1ilqn5ls7krmkklsmvl2zhzkqwag49jypiqa0w3vvaih";
}; };
openjdk8 = stdenv.mkDerivation { openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}"; name = "openjdk-8u${update}b${build}";

4
pkgs/development/compilers/ponyc/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec { stdenv.mkDerivation ( rec {
name = "ponyc-${version}"; name = "ponyc-${version}";
version = "0.5.1"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ponylang"; owner = "ponylang";
repo = "ponyc"; repo = "ponyc";
rev = version; rev = version;
sha256 = "14c6qs3cqn9hk2hrq2d5rd4cmwzzz2fcb02dg5q1blq17pj7mcxa"; sha256 = "10miwsyxl589b0n1h3dbbc2qckq8z8a58s0d53asq88w2gpc339q";
}; };
buildInputs = [ llvm makeWrapper which ]; buildInputs = [ llvm makeWrapper which ];

6
pkgs/development/compilers/ponyc/disable-tests.patch
View File

@ -2,15 +2,13 @@ diff --git a/packages/net/_test.pony b/packages/net/_test.pony
index ce26bd7..9a98cc7 100644 index ce26bd7..9a98cc7 100644
--- a/packages/net/_test.pony --- a/packages/net/_test.pony
+++ b/packages/net/_test.pony +++ b/packages/net/_test.pony
@@ -5,11 +5,7 @@ actor Main is TestList @@ -5,9 +5,7 @@ actor Main is TestList
new make() => None new make() => None
fun tag tests(test: PonyTest) => fun tag tests(test: PonyTest) =>
- test(_TestBroadcast) - test(_TestBroadcast)
- test(_TestTCPWritev) - test(_TestTCPWritev)
- ifdef not windows then - test(_TestTCPExpect)
- test(_TestTCPExpect)
- end
+ None + None
class _TestPing is UDPNotify class _TestPing is UDPNotify

6
pkgs/development/compilers/rust/default.nix
View File

@ -7,12 +7,12 @@ in
rec { rec {
rustc = callPackage ./rustc.nix { rustc = callPackage ./rustc.nix {
shortVersion = "1.12.0"; shortVersion = "1.12.1";
isRelease = true; isRelease = true;
forceBundledLLVM = false; forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ]; configureFlags = [ "--release-channel=stable" ];
srcRev = "3191fbae9da539442351f883bdabcad0d72efcb6"; srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd";
srcSha = "1mpw6c5jfxy60g786wl8g0ncwikqfbcj67jrdpj3jacywxsxzlby"; srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr";
patches = [ patches = [
./patches/disable-lockfile-check.patch ./patches/disable-lockfile-check.patch

8
pkgs/development/compilers/solc/default.nix
View File

@ -1,16 +1,20 @@
{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }: { stdenv, fetchFromGitHub, boost, cmake, jsoncpp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.3.6"; version = "0.4.2";
name = "solc-${version}"; name = "solc-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethereum"; owner = "ethereum";
repo = "solidity"; repo = "solidity";
rev = "v${version}"; rev = "v${version}";
sha256 = "1cynqwy8wr63l3l4wv9z6shhcy6lq0q8pbsh3nav0dg9qgj9sg57"; sha256 = "1d5x3psz8a9z9jnm30aspfvrpd9kblr14cn5vyl21p27x2vdlzr4";
}; };
patchPhase = ''
echo >commit_hash.txt af6afb0415761b53721f89c7f65064807f41cbd3
'';
buildInputs = [ boost cmake jsoncpp ]; buildInputs = [ boost cmake jsoncpp ];
meta = { meta = {

4
pkgs/development/interpreters/python/mk-python-derivation.nix
View File

@ -69,13 +69,13 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
doCheck = false; doCheck = false;
doInstallCheck = doCheck; doInstallCheck = doCheck;
postFixup = attrs.postFixup or '' postFixup = ''
wrapPythonPrograms wrapPythonPrograms
'' + lib.optionalString catchConflicts '' '' + lib.optionalString catchConflicts ''
# check if we have two packages with the same name in closure and fail # check if we have two packages with the same name in closure and fail
# this shouldn't happen, something went wrong with dependencies specs # this shouldn't happen, something went wrong with dependencies specs
${python.interpreter} ${./catch_conflicts.py} ${python.interpreter} ${./catch_conflicts.py}
''; '' + attrs.postFixup or '''';
passthru = { passthru = {
inherit python; # The python interpreter inherit python; # The python interpreter

21
pkgs/development/libraries/arb/default.nix Normal file
View File

@ -0,0 +1,21 @@
{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "arb";
version = "2.8.1";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = "${pname}";
rev = "${version}";
sha256 = "15phk71ci9rr32aqznpkd2b993wjahsgliilkg4mnxsr86nwdf6x";
};
buildInputs = [mpir gmp mpfr flint];
configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}";
meta = {
inherit version;
description = ''A library for arbitrary-precision interval arithmetic'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

21
pkgs/development/libraries/arb/git.nix Normal file
View File

@ -0,0 +1,21 @@
{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "arb";
version = "2.9.0pre20161013";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = "${pname}";
rev = "10bc615ce5999caf4723444b2b1219b74781d8a4";
sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl";
};
buildInputs = [mpir gmp mpfr flint];
configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}";
meta = {
inherit version;
description = ''A library for arbitrary-precision interval arithmetic'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

43
pkgs/development/libraries/bootil/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, fetchpatch, premake4 }:
stdenv.mkDerivation rec {
name = "bootil-unstable-2015-12-17";
meta = {
description = "Garry Newman's personal utility library";
homepage = https://github.com/garrynewman/bootil;
# License unsure - see https://github.com/garrynewman/bootil/issues/21
license = stdenv.lib.licenses.free;
maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
platforms = stdenv.lib.platforms.all;
};
src = fetchFromGitHub {
owner = "garrynewman";
repo = "bootil";
rev = "1d3e321fc2be359e2350205b8c7f1cad2164ee0b";
sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg";
};
patches = [ (fetchpatch {
url = https://github.com/garrynewman/bootil/pull/22.patch;
name = "github-pull-request-22.patch";
sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
})];
platform =
if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "macosx"
else abort "unrecognized platform";
buildInputs = [ premake4 ];
configurePhase = "premake4 --file=projects/premake4.lua gmake";
makeFlags = "-C projects/${platform}/gmake";
installPhase = ''
mkdir -p $out/lib
cp lib/${platform}/gmake/libbootil_static.a $out/lib/
cp -r include $out/
'';
}

23
pkgs/development/libraries/cddlib/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchurl, gmp}:
stdenv.mkDerivation rec {
name = "cddlib-${version}";
fileVersion = "094h";
version = "0.94h";
src = fetchurl {
urls = [
"http://archive.ubuntu.com/ubuntu/pool/universe/c/cddlib/cddlib_${fileVersion}.orig.tar.gz"
"ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-${fileVersion}.tar.gz"
];
name = "";
sha256 = "1dasasscwfg793q8fwzgwf64xwj7w62yfvszpr8x8g38jka08vgy";
};
buildInputs = [gmp];
meta = {
inherit version;
description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html";
};
}

23
pkgs/development/libraries/eclib/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
, pari, ntl, gmp}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "eclib";
version = "20160720";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchFromGitHub {
owner = "JohnCremona";
repo = "${pname}";
rev = "${version}";
sha256 = "0qrcd5c8cqhw9f14my6k6013w8li5vdigrjvchkr19n2l8g75j0h";
};
buildInputs = [pari ntl gmp];
nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
meta = {
inherit version;
description = ''Elliptic curve tools'';
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

21
pkgs/development/libraries/fflas-ffpack/1.nix Normal file
View File

@ -0,0 +1,21 @@
{stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "fflas-ffpack";
version = "1.6.0";
src = fetchurl {
url = "http://linalg.org/fflas-ffpack-${version}.tar.gz";
sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9";
};
buildInputs = [autoreconfHook givaro_3_7 openblas gmpxx];
nativeBuildInputs = [pkgconfig];
configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}";
meta = {
inherit version;
description = ''Finite Field Linear Algebra Subroutines'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://linbox-team.github.io/fflas-ffpack/";
};
}

23
pkgs/development/libraries/fflas-ffpack/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "fflas-ffpack";
version = "2.2.2";
src = fetchFromGitHub {
owner = "linbox-team";
repo = "${pname}";
rev = "v${version}";
sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd";
};
buildInputs = [autoreconfHook givaro (liblapack.override {shared = true;}) openblas];
nativeBuildInputs = [pkgconfig];
configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack";
meta = {
inherit version;
description = ''Finite Field Linear Algebra Subroutines'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://linbox-team.github.io/fflas-ffpack/";
};
}

22
pkgs/development/libraries/flint/default.nix Normal file
View File

@ -0,0 +1,22 @@
{stdenv, fetchurl, gmp, mpir, mpfr, openblas, ntl}:
stdenv.mkDerivation rec {
name = "flint-${version}";
version = "2.5.2";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "http://www.flintlib.org/flint-${version}.tar.gz";
sha256 = "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb";
};
buildInputs = [gmp mpir mpfr openblas ntl];
configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-blas=${openblas} --with-ntl=${ntl}";
meta = {
inherit version;
description = ''Fast Library for Number Theory'';
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "http://www.flintlib.org/";
downloadPage = "http://www.flintlib.org/downloads.html";
updateWalker = true;
};
}

23
pkgs/development/libraries/fplll/20160331.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
, gmp, mpfr
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "fplll";
version = "20160331";
src = fetchFromGitHub {
owner = "${pname}";
repo = "${pname}";
rev = "11dea26c2f9396ffb7a7191aa371343f1f74c5c3";
sha256 = "1clxch9hbr30w6s84m2mprxv58adhg5qw6sa2p3jr1cy4r7r59ib";
};
nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
buildInputs = [gmp mpfr];
meta = {
inherit version;
description = ''Lattice algorithms using floating-point arithmetic'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

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