Merge branch 'master' into staging
This commit is contained in:
Daiderd Jordan
commit
bba12a6c90
@ -449,6 +449,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
|
||||
fullName = "Sleepycat License";
|
||||
};
|
||||
|
||||
smail = {
|
||||
shortName = "smail";
|
||||
fullName = "SMAIL General Public License";
|
||||
url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright;
|
||||
};
|
||||
|
||||
tcltk = spdx {
|
||||
spdxId = "TCL";
|
||||
fullName = "TCL/TK License";
|
||||
|
||||
@ -237,6 +237,7 @@
|
||||
KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
|
||||
kierdavis = "Kier Davis <kierdavis@gmail.com>";
|
||||
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
|
||||
knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
|
||||
koral = "Koral <koral@mailoo.org>";
|
||||
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
|
||||
kragniz = "Louis Taylor <louis@kragniz.eu>";
|
||||
|
||||
@ -611,11 +611,37 @@ sub copyFileFromHost {
|
||||
}
|
||||
|
||||
|
||||
my %charToKey = (
|
||||
'!' => "shift-0x02",
|
||||
'@' => "shift-0x03",
|
||||
'#' => "shift-0x04",
|
||||
'$' => "shift-0x05",
|
||||
'%' => "shift-0x06",
|
||||
'^' => "shift-0x07",
|
||||
'&' => "shift-0x08",
|
||||
'*' => "shift-0x09",
|
||||
'(' => "shift-0x0A",
|
||||
')' => "shift-0x0B",
|
||||
'-' => "0x0C", '_' => "shift-0x0C",
|
||||
'=' => "0x0D", '+' => "shift-0x0D",
|
||||
'[' => "0x1A", '{' => "shift-0x1A",
|
||||
']' => "0x1B", '}' => "shift-0x1B",
|
||||
';' => "0x27", ':' => "shift-0x27",
|
||||
'\'' => "0x28", '"' => "shift-0x28",
|
||||
'`' => "0x29", '~' => "shift-0x29",
|
||||
'\\' => "0x2B", '|' => "shift-0x2B",
|
||||
',' => "0x33", '<' => "shift-0x33",
|
||||
'.' => "0x34", '>' => "shift-0x34",
|
||||
'/' => "0x35", '?' => "shift-0x35",
|
||||
' ' => "spc",
|
||||
"\n" => "ret",
|
||||
);
|
||||
|
||||
|
||||
sub sendKeys {
|
||||
my ($self, @keys) = @_;
|
||||
foreach my $key (@keys) {
|
||||
$key = "spc" if $key eq " ";
|
||||
$key = "ret" if $key eq "\n";
|
||||
$key = $charToKey{$key} if exists $charToKey{$key};
|
||||
$self->sendMonitorCommand("sendkey $key");
|
||||
}
|
||||
}
|
||||
|
||||
@ -212,6 +212,7 @@ in {
|
||||
# Allow PulseAudio to get realtime priority using rtkit.
|
||||
security.rtkit.enable = true;
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
})
|
||||
|
||||
(mkIf hasZeroconf {
|
||||
@ -227,31 +228,14 @@ in {
|
||||
target = "pulse/default.pa";
|
||||
source = myConfigFile;
|
||||
};
|
||||
|
||||
systemd.user = {
|
||||
services.pulseaudio = {
|
||||
description = "PulseAudio Server";
|
||||
# NixOS doesn't support "Also" so we bring it in manually
|
||||
wantedBy = [ "default.target" ];
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
ExecStart = binaryNoDaemon;
|
||||
Restart = "on-failure";
|
||||
RestartSec = "500ms";
|
||||
};
|
||||
environment = { DISPLAY = ":${toString config.services.xserver.display}"; };
|
||||
restartIfChanged = true;
|
||||
};
|
||||
|
||||
sockets.pulseaudio = {
|
||||
description = "PulseAudio Socket";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
socketConfig = {
|
||||
Priority = 6;
|
||||
Backlog = 5;
|
||||
ListenStream = "%t/pulse/native";
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
|
||||
@ -232,8 +232,6 @@ in
|
||||
system.boot.loader.kernelFile = "bzImage";
|
||||
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
|
||||
|
||||
boot.consoleLogLevel = mkDefault 7;
|
||||
|
||||
# In stage 1 of the boot, mount the CD as the root FS by label so
|
||||
# that we don't need to know its device. We pass the label of the
|
||||
# root filesystem on the kernel command line, rather than in
|
||||
|
||||
@ -27,7 +27,6 @@ in
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"];
|
||||
boot.consoleLogLevel = 7;
|
||||
|
||||
# FIXME: this probably should be in installation-device.nix
|
||||
users.extraUsers.root.initialHashedPassword = "";
|
||||
|
||||
@ -26,7 +26,6 @@ in
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_rpi;
|
||||
boot.consoleLogLevel = 7;
|
||||
|
||||
# FIXME: this probably should be in installation-device.nix
|
||||
users.extraUsers.root.initialHashedPassword = "";
|
||||
|
||||
@ -30,8 +30,6 @@ with lib;
|
||||
system.boot.loader.kernelFile = "bzImage";
|
||||
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
|
||||
|
||||
boot.consoleLogLevel = mkDefault 7;
|
||||
|
||||
fileSystems."/" =
|
||||
{ fsType = "tmpfs";
|
||||
options = [ "mode=0755" ];
|
||||
|
||||
@ -308,8 +308,13 @@
|
||||
./services/monitoring/munin.nix
|
||||
./services/monitoring/nagios.nix
|
||||
./services/monitoring/prometheus/default.nix
|
||||
./services/monitoring/prometheus/node-exporter.nix
|
||||
./services/monitoring/prometheus/alertmanager.nix
|
||||
./services/monitoring/prometheus/blackbox-exporter.nix
|
||||
./services/monitoring/prometheus/json-exporter.nix
|
||||
./services/monitoring/prometheus/nginx-exporter.nix
|
||||
./services/monitoring/prometheus/node-exporter.nix
|
||||
./services/monitoring/prometheus/snmp-exporter.nix
|
||||
./services/monitoring/prometheus/varnish-exporter.nix
|
||||
./services/monitoring/riemann.nix
|
||||
./services/monitoring/riemann-dash.nix
|
||||
./services/monitoring/riemann-tools.nix
|
||||
|
||||
@ -70,5 +70,11 @@ with lib;
|
||||
# the initrd builder.
|
||||
system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ];
|
||||
|
||||
# Show all debug messages from the kernel but don't log refused packets
|
||||
# because we have the firewall enabled. This makes installs from the
|
||||
# console less cumbersome if the machine has a public IP.
|
||||
boot.consoleLogLevel = mkDefault 7;
|
||||
networking.firewall.logRefusedConnections = mkDefault false;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -67,52 +67,30 @@ options for the <literal>security.acme</literal> module.</para>
|
||||
</section>
|
||||
|
||||
<section><title>Using ACME certificates in Nginx</title>
|
||||
<para>In practice ACME is mostly used for retrieval and renewal of
|
||||
certificates that will be used in a webserver like Nginx. A configuration for
|
||||
Nginx that uses the certificates from ACME for
|
||||
<literal>foo.example.com</literal> will look similar to:
|
||||
<para>NixOS supports fetching ACME certificates for you by setting
|
||||
<literal>enableACME = true;</literal> in a virtualHost config. We
|
||||
first create self-signed placeholder certificates in place of the
|
||||
real ACME certs. The placeholder certs are overwritten when the ACME
|
||||
certs arrive. For <literal>foo.example.com</literal> the config would
|
||||
look like.
|
||||
</para>
|
||||
|
||||
<programlisting>
|
||||
security.acme.certs."foo.example.com" = {
|
||||
webroot = config.security.acme.directory + "/acme-challenge";
|
||||
email = "foo@example.com";
|
||||
user = "nginx";
|
||||
group = "nginx";
|
||||
postRun = "systemctl restart nginx.service";
|
||||
};
|
||||
services.nginx.httpConfig = ''
|
||||
server {
|
||||
server_name foo.example.com;
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
|
||||
location /.well-known/acme-challenge {
|
||||
root /var/www/challenges;
|
||||
}
|
||||
|
||||
location / {
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
server_name foo.example.com;
|
||||
listen 443 ssl;
|
||||
ssl_certificate ${config.security.acme.directory}/foo.example.com/fullchain.pem;
|
||||
ssl_certificate_key ${config.security.acme.directory}/foo.example.com/key.pem;
|
||||
root /var/www/foo.example.com/;
|
||||
}
|
||||
'';
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
"foo.example.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = "/var/www";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
</programlisting>
|
||||
|
||||
<para>Now Nginx will try to use the certificates that will be retrieved by ACME.
|
||||
ACME needs Nginx (or any other webserver) to function and Nginx needs
|
||||
the certificates to actually start. For this reason the ACME module
|
||||
automatically generates self-signed certificates that will be used by Nginx to
|
||||
start. After that Nginx is used by ACME to retrieve the actual ACME
|
||||
certificates. <literal>security.acme.preliminarySelfsigned</literal> can be
|
||||
used to control whether to generate the self-signed certificates.
|
||||
</para>
|
||||
<para>At the moment you still have to restart Nginx after the ACME
|
||||
certs arrive.</para>
|
||||
</section>
|
||||
</chapter>
|
||||
|
||||
@ -0,0 +1,67 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.blackboxExporter;
|
||||
in {
|
||||
options = {
|
||||
services.prometheus.blackboxExporter = {
|
||||
enable = mkEnableOption "prometheus blackbox exporter";
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path to configuration file.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 9115;
|
||||
description = ''
|
||||
Port to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
extraFlags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
Extra commandline options when launching the blackbox exporter.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open port in firewall for incoming connections.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
|
||||
|
||||
systemd.services.prometheus-blackbox-exporter = {
|
||||
description = "Prometheus exporter for blackbox probes";
|
||||
unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "nobody";
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
WorkingDirectory = /tmp;
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
|
||||
-web.listen-address :${toString cfg.port} \
|
||||
-config.file ${cfg.configFile} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.jsonExporter;
|
||||
in {
|
||||
options = {
|
||||
services.prometheus.jsonExporter = {
|
||||
enable = mkEnableOption "prometheus JSON exporter";
|
||||
|
||||
url = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
URL to scrape JSON from.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
Path to configuration file.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 7979;
|
||||
description = ''
|
||||
Port to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
extraFlags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
Extra commandline options when launching the JSON exporter.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open port in firewall for incoming connections.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
|
||||
|
||||
systemd.services.prometheus-json-exporter = {
|
||||
description = "Prometheus exporter for JSON over HTTP";
|
||||
unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "nobody";
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
WorkingDirectory = /tmp;
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
|
||||
--port ${toString cfg.port} \
|
||||
${cfg.url} ${cfg.configFile} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.nginxExporter;
|
||||
in {
|
||||
options = {
|
||||
services.prometheus.nginxExporter = {
|
||||
enable = mkEnableOption "prometheus nginx exporter";
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 9113;
|
||||
description = ''
|
||||
Port to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = types.string;
|
||||
default = "0.0.0.0";
|
||||
description = ''
|
||||
Address to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
scrapeUri = mkOption {
|
||||
type = types.string;
|
||||
default = "http://localhost/nginx_status";
|
||||
description = ''
|
||||
Address to access the nginx status page.
|
||||
Can be enabled with services.nginx.statusPage = true.
|
||||
'';
|
||||
};
|
||||
|
||||
extraFlags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
Extra commandline options when launching the nginx exporter.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open port in firewall for incoming connections.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
|
||||
|
||||
systemd.services.prometheus-nginx-exporter = {
|
||||
after = [ "network.target" "nginx.service" ];
|
||||
description = "Prometheus exporter for nginx metrics";
|
||||
unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "nobody";
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
WorkingDirectory = /tmp;
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \
|
||||
-nginx.scrape_uri '${cfg.scrapeUri}' \
|
||||
-telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -44,10 +44,20 @@ in {
|
||||
Extra commandline options when launching the node exporter.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open port in firewall for incoming connections.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
|
||||
|
||||
systemd.services.prometheus-node-exporter = {
|
||||
description = "Prometheus exporter for machine metrics";
|
||||
unitConfig.Documentation = "https://github.com/prometheus/node_exporter";
|
||||
|
||||
127
nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
Normal file
127
nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
Normal file
@ -0,0 +1,127 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.snmpExporter;
|
||||
mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath);
|
||||
in {
|
||||
options = {
|
||||
services.prometheus.snmpExporter = {
|
||||
enable = mkEnableOption "Prometheus snmp exporter";
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "nobody";
|
||||
description = ''
|
||||
User name under which snmp exporter shall be run.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "nogroup";
|
||||
description = ''
|
||||
Group under which snmp exporter shall be run.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 9116;
|
||||
description = ''
|
||||
Port to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Address to listen on for web interface and telemetry.
|
||||
'';
|
||||
};
|
||||
|
||||
configurationPath = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option.
|
||||
'';
|
||||
example = "./snmp.yml";
|
||||
};
|
||||
|
||||
configuration = mkOption {
|
||||
type = types.nullOr types.attrs;
|
||||
default = {};
|
||||
description = ''
|
||||
Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
|
||||
'';
|
||||
example = ''
|
||||
{
|
||||
"default" = {
|
||||
"version" = 2;
|
||||
"auth" = {
|
||||
"community" = "public";
|
||||
};
|
||||
};
|
||||
};
|
||||
'';
|
||||
};
|
||||
|
||||
logFormat = mkOption {
|
||||
type = types.str;
|
||||
default = "logger:stderr";
|
||||
description = ''
|
||||
Set the log target and format.
|
||||
'';
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.enum ["debug" "info" "warn" "error" "fatal"];
|
||||
default = "info";
|
||||
description = ''
|
||||
Only log messages with the given severity or above.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open port in firewall for incoming connections.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
|
||||
|
||||
assertions = singleton
|
||||
{
|
||||
assertion = (cfg.configurationPath == null) != (cfg.configuration == null);
|
||||
message = "Please ensure you have either 'configuration' or 'configurationPath' set!";
|
||||
};
|
||||
|
||||
systemd.services.prometheus-snmp-exporter = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
script = ''
|
||||
${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
|
||||
-config.file ${mkConfigFile} \
|
||||
-log.format ${cfg.logFormat} \
|
||||
-log.level ${cfg.logLevel} \
|
||||
-web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port}
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
WorkingDirectory = "/tmp";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
# Shamelessly cribbed from nginx-exporter.nix. ~ C.
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.varnishExporter;
|
||||
in {
|
||||
options = {
|
||||
services.prometheus.varnishExporter = {
|
||||
enable = mkEnableOption "prometheus Varnish exporter";
|
||||
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
default = 9131;
|
||||
description = ''
|
||||
Port to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
extraFlags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
Extra commandline options when launching the Varnish exporter.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open port in firewall for incoming connections.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
|
||||
|
||||
systemd.services.prometheus-varnish-exporter = {
|
||||
description = "Prometheus exporter for Varnish metrics";
|
||||
unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.varnish ];
|
||||
script = ''
|
||||
exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
|
||||
-web.listen-address :${toString cfg.port} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
serviceConfig = {
|
||||
User = "nobody";
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
WorkingDirectory = /tmp;
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -120,7 +120,7 @@ in
|
||||
};
|
||||
|
||||
environment.etc."ddclient.conf" = {
|
||||
enable = config.services.ddclient.configFile == /etc/ddclient.conf;
|
||||
enable = config.services.ddclient.configFile == "/etc/ddclient.conf";
|
||||
uid = config.ids.uids.ddclient;
|
||||
mode = "0600";
|
||||
text = ''
|
||||
|
||||
@ -12,11 +12,13 @@ let
|
||||
psk = if networkConfig.psk != null
|
||||
then ''"${networkConfig.psk}"''
|
||||
else networkConfig.pskRaw;
|
||||
priority = networkConfig.priority;
|
||||
in ''
|
||||
network={
|
||||
ssid="${ssid}"
|
||||
${optionalString (psk != null) ''psk=${psk}''}
|
||||
${optionalString (psk == null) ''key_mgmt=NONE''}
|
||||
${optionalString (priority != null) ''priority=${toString priority}''}
|
||||
}
|
||||
'') cfg.networks)}
|
||||
'' else "/etc/wpa_supplicant.conf";
|
||||
@ -68,6 +70,19 @@ in {
|
||||
Mutually exclusive with <varname>psk</varname>.
|
||||
'';
|
||||
};
|
||||
priority = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = null;
|
||||
description = ''
|
||||
By default, all networks will get same priority group (0). If some of the
|
||||
networks are more desirable, this field can be used to change the order in
|
||||
which wpa_supplicant goes through the networks when selecting a BSS. The
|
||||
priority groups will be iterated in decreasing priority (i.e., the larger the
|
||||
priority value, the sooner the network is matched against the scan results).
|
||||
Within each priority group, networks will be selected based on security
|
||||
policy, signal strength, etc.
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
description = ''
|
||||
|
||||
@ -709,13 +709,6 @@ in
|
||||
''}
|
||||
mkdir -m 0700 -p ${mainCfg.logDir}
|
||||
|
||||
${optionalString (mainCfg.documentRoot != null)
|
||||
''
|
||||
# Create the document root directory if does not exists yet
|
||||
mkdir -p ${mainCfg.documentRoot}
|
||||
''
|
||||
}
|
||||
|
||||
# Get rid of old semaphores. These tend to accumulate across
|
||||
# server restarts, eventually preventing it from restarting
|
||||
# successfully.
|
||||
|
||||
@ -34,20 +34,24 @@ if [ -z "$container" ]; then
|
||||
fi
|
||||
|
||||
|
||||
# Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a
|
||||
# Likewise, stage 1 mounts /proc, /dev, /sys and /run, so if we don't have a
|
||||
# stage 1, we need to do that here.
|
||||
if [ ! -e /proc/1 ]; then
|
||||
specialMount() {
|
||||
local device="$1"
|
||||
local mountPoint="$2"
|
||||
local options="$3"
|
||||
local fsType="$4"
|
||||
# We check for each mountpoint separately to avoid esoteric failure modes
|
||||
# if only a subset was mounted by whatever called us.
|
||||
specialMount() {
|
||||
local device="$1"
|
||||
local mountPoint="$2"
|
||||
local options="$3"
|
||||
local fsType="$4"
|
||||
|
||||
mkdir -m 0755 -p "$mountPoint"
|
||||
mount -n -t "$fsType" -o "$options" "$device" "$mountPoint"
|
||||
}
|
||||
source @earlyMountScript@
|
||||
fi
|
||||
if mountpoint -q "$mountpoint"; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
mkdir -m 0755 -p "$mountPoint"
|
||||
mount -n -t "$fsType" -o "$options" "$device" "$mountPoint"
|
||||
}
|
||||
source @earlyMountScript@
|
||||
|
||||
|
||||
echo "booting system configuration $systemConfig" > /dev/kmsg
|
||||
|
||||
@ -171,12 +171,12 @@ rec {
|
||||
|
||||
checkstyle = buildEclipseUpdateSite rec {
|
||||
name = "checkstyle-${version}";
|
||||
version = "7.2.0.201611082205";
|
||||
version = "7.3.0.201612142232";
|
||||
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.2.0/net.sf.eclipsecs-updatesite_${version}.zip";
|
||||
sha256 = "1zngyrh5ckgli0xxm52vm6mzbbvrjslwqcymggfqjhzplpcgwqk1";
|
||||
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip";
|
||||
sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
|
||||
# When updating, please make sure the sources pulled match those upstream by
|
||||
# Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
|
||||
# in the resulting directory
|
||||
url = "http://fossies.org/linux/privat/${name}.tar.bz2";
|
||||
urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
|
||||
in [
|
||||
("http://pkgs.fedoraproject.org/repo/extras/ed"
|
||||
+ "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2")
|
||||
"http://fossies.org/linux/privat/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
|
||||
};
|
||||
|
||||
|
||||
@ -2,45 +2,24 @@
|
||||
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
|
||||
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
|
||||
, gsl, python2, poppler, imagemagick, libwpg, librevenge
|
||||
, libvisio, libcdr, libexif, unzip, automake114x, autoconf
|
||||
, boxMakerPlugin ? false # boxmaker plugin
|
||||
, libvisio, libcdr, libexif, automake114x, cmake
|
||||
}:
|
||||
|
||||
let
|
||||
python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
|
||||
|
||||
boxmaker = fetchurl {
|
||||
# http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403
|
||||
url = "http://www.keppel.demon.co.uk/111000/files/BoxMaker0.91.zip";
|
||||
sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8";
|
||||
};
|
||||
|
||||
stdcxx-patch = fetchpatch {
|
||||
url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3;
|
||||
sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inkscape-0.91";
|
||||
name = "inkscape-0.92.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://inkscape.global.ssl.fastly.net/media/resources/file/"
|
||||
+ "${name}.tar.bz2";
|
||||
sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d";
|
||||
url = "https://inkscape.org/gallery/item/10552/${name}.tar.bz2";
|
||||
sha256 = "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q";
|
||||
};
|
||||
|
||||
patches = [ ./deprecated-scopedptr.patch ];
|
||||
|
||||
postPatch = ''
|
||||
patch -i ${stdcxx-patch} -p 0
|
||||
patchShebangs share/extensions
|
||||
''
|
||||
# Clang gets misdetected, so hardcode the right answer
|
||||
+ stdenv.lib.optionalString stdenv.cc.isClang ''
|
||||
substituteInPlace src/ui/tool/node.h \
|
||||
--replace "#if __cplusplus >= 201103L" "#if true"
|
||||
patchShebangs fix-roff-punct
|
||||
'';
|
||||
|
||||
# Python is used at run-time to execute scripts, e.g., those from
|
||||
@ -51,24 +30,12 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
|
||||
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
|
||||
makeWrapper intltool gsl poppler imagemagick libwpg librevenge
|
||||
libvisio libcdr libexif automake114x autoconf
|
||||
] ++ stdenv.lib.optional boxMakerPlugin unzip;
|
||||
libvisio libcdr libexif automake114x cmake
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
${if boxMakerPlugin then "
|
||||
mkdir -p $out/share/inkscape/extensions/
|
||||
# boxmaker packaged version 0.91 in a directory called 0.85 ?!??
|
||||
unzip ${boxmaker};
|
||||
cp boxmake-upd-0.85/* $out/share/inkscape/extensions/
|
||||
rm -Rf boxmake-upd-0.85
|
||||
"
|
||||
else
|
||||
""
|
||||
}
|
||||
|
||||
# Make sure PyXML modules can be found at run-time.
|
||||
rm "$out/share/icons/hicolor/icon-theme.cache"
|
||||
'';
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
glibmm deprecated ScopedPtr
|
||||
---
|
||||
diff -u src/ui/clipboard.cpp src/ui/clipboard.cpp
|
||||
--- a/src/ui/clipboard.cpp 2015-01-28 04:32:28.162676000 +0100
|
||||
+++ b/src/ui/clipboard.cpp 2016-04-03 09:13:12.360980533 +0200
|
||||
@@ -1402,7 +1402,7 @@
|
||||
|
||||
Glib::ustring target;
|
||||
if (atom_name) {
|
||||
- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
|
||||
+ target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*.
|
||||
}
|
||||
|
||||
listTargets.push_back(target);
|
||||
|
||||
Diff finished. Sun Apr 3 09:13:51 2016
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "hugo-${version}";
|
||||
version = "0.17";
|
||||
version = "0.18.1";
|
||||
|
||||
goPackagePath = "github.com/spf13/hugo";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "spf13";
|
||||
repo = "hugo";
|
||||
rev = "v${version}";
|
||||
sha256 = "1h5d7m019r4zhk7xlcdbn4z3w6x7jq2lcdgq7w377688rk58wbgp";
|
||||
sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
@ -229,8 +229,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/fsync";
|
||||
rev = "eefee59ad7de621617d4ff085cf768aab4b919b1";
|
||||
sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p";
|
||||
rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b";
|
||||
sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -341,4 +341,13 @@
|
||||
sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/bep/gitmap";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/bep/gitmap";
|
||||
rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac";
|
||||
sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@ -4,17 +4,17 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${product}-${version}";
|
||||
product = "pdfpc";
|
||||
version = "4.0.4";
|
||||
version = "4.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "pdfpc";
|
||||
owner = "pdfpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "07wpf3gkgiq7dpgsrv7whk0pzm18cni4s53hd7zz40319jmlaf4q";
|
||||
sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler
|
||||
nativeBuildInputs = [ cmake pkgconfig vala ];
|
||||
buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
|
||||
libpthreadstubs makeWrapper librsvg ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtpass-${version}";
|
||||
version = "1.1.4";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IJHack";
|
||||
repo = "QtPass";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jxb15jn6vv54wb2z52wv9b2mq38xff8akyzwj5xx2332bc9xra2";
|
||||
sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j";
|
||||
};
|
||||
|
||||
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
|
||||
|
||||
@ -5,18 +5,18 @@ let
|
||||
if stdenv.system == "i686-linux" then fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
|
||||
sha256 = "1wi9ikwmc9jfilj8adad3rcb7rmmxkpkfcp2gkfxvdyw6n0mzcnf";
|
||||
sha256 = "0nkbi05pr5kznj4vjqhsrxcqdmjdf2zsbirslxgm4jbh87skl6fm";
|
||||
} else fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
|
||||
sha256 = "074yivz7rz1ac1962dix0aahpyqvsrkizh32kk5hyw5az0vqpcjs";
|
||||
sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
# https://www.rescuetime.com/updates/linux_release_notes.html
|
||||
name = "rescuetime-2.9.10.1255";
|
||||
name = "rescuetime-2.9.11.1285";
|
||||
inherit src;
|
||||
buildInputs = [ dpkg makeWrapper ];
|
||||
unpackPhase = ''
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
{ stdenv, fetchurl, pidgin, xosd
|
||||
{ stdenv, fetchFromGitHub, pidgin, xosd
|
||||
, autoreconfHook } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pidgin-osd-0.1.0";
|
||||
src = fetchurl {
|
||||
url = https://github.com/mbroemme/pidgin-osd/archive/pidgin-osd-0.1.0.tar.gz;
|
||||
sha256 = "11hqfifhxa9gijbnp9kq85k37hvr36spdd79cj9bkkvw4kyrdp3j";
|
||||
name = "pidgin-osd-0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "edanaher";
|
||||
repo = "pidgin-osd";
|
||||
rev = name;
|
||||
sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5";
|
||||
};
|
||||
|
||||
makeFlags = "PIDGIN_LIBDIR=$(out)";
|
||||
|
||||
# autoreconf is run such that it *really* wants all the files, and there's no
|
||||
# default ChangeLog. So make it happy.
|
||||
preAutoreconf = "touch ChangeLog";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/pidgin
|
||||
ln -s $out/pidgin $out/lib/pidgin
|
||||
mv $out/lib/pidgin-osd.{la,so} $out/lib/pidgin
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "2.2.1";
|
||||
version = "2.3.4";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
@ -43,7 +43,7 @@ let
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = "1x08bmkanllv3lpi2s722xs7qia8igf6zxzkc3g7vs5jms3mdrad";
|
||||
sha256 = "01kr7maj8f4yinyri7rs4pmzab9cvp48xfqw3ilirx4mvh8mr1fd";
|
||||
}
|
||||
else
|
||||
throw "Slack is not supported on ${stdenv.system}";
|
||||
|
||||
36
pkgs/applications/networking/insync/default.nix
Normal file
36
pkgs/applications/networking/insync/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ stdenv, fetchurl, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "insync-${version}";
|
||||
version = "1.3.13.36129";
|
||||
src = fetchurl {
|
||||
url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
|
||||
sha256 = "18d8ww529nvhwcl5k31qmkzb83k9753ics0dw64w202r8vwbm3cd";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -a client $out/client
|
||||
makeWrapper $out/client/insync-portable $out/bin/insync --set LC_TIME C
|
||||
'';
|
||||
|
||||
meta = {
|
||||
platforms = ["x86_64-linux"];
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
maintainers = [ stdenv.lib.maintainers.benley ];
|
||||
homepage = https://www.insynchq.com;
|
||||
description = "Google Drive sync and backup with multiple account support";
|
||||
longDescription = ''
|
||||
Insync is a commercial application that syncs your Drive files to your
|
||||
computer. It has more advanced features than Google's official client
|
||||
such as multiple account support, Google Doc conversion, symlink support,
|
||||
and built in sharing.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,20 +1,23 @@
|
||||
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "0.8.21";
|
||||
version = "1.0.0";
|
||||
name = "irssi-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ];
|
||||
sha256 = "0fxacadhdzl3n0231mqjv2gcmj1fj85azhbbsk0fq7xmf1da7ha2";
|
||||
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
|
||||
sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ncurses glib openssl perl libintlOrEmpty ];
|
||||
|
||||
NIX_LDFLAGS = ncurses.ldflags;
|
||||
|
||||
configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes";
|
||||
configureFlags = [
|
||||
"--with-proxy"
|
||||
"--with-bot"
|
||||
"--with-perl=yes"
|
||||
"--enable-true-color"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://irssi.org;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.23.2";
|
||||
version = "0.23.4";
|
||||
name = "notmuch-${version}";
|
||||
|
||||
passthru = {
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://notmuchmail.org/releases/${name}.tar.gz";
|
||||
sha256 = "1g4p5hsrqqbqk6s2w756als60wppvjgpyq104smy3w9vshl7bzgd";
|
||||
sha256 = "0fs5crf8v3jghc8jnm61cv7wxhclcg88hi5894d8fma9kkixcv8h";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
|
||||
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
|
||||
, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core
|
||||
, openssl
|
||||
, openssl, gsettings_desktop_schemas
|
||||
# The themes here are soft dependencies; only icons are missing without them.
|
||||
, hicolor_icon_theme, adwaita-icon-theme
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.2.0-rcgit.15";
|
||||
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "remmina";
|
||||
desktopName = "Remmina";
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake pkgconfig wrapGAppsHook
|
||||
buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas
|
||||
glib gtk3 gettext libxkbfile libgnome_keyring libX11
|
||||
freerdp_git libssh libgcrypt gnutls
|
||||
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
let
|
||||
version = "1.2.7";
|
||||
version = "1.3.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "money-manager-ex-${version}";
|
||||
@ -10,14 +10,9 @@ in
|
||||
src = fetchgit {
|
||||
url = "https://github.com/moneymanagerex/moneymanagerex.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0d6jcsj3m3b9mj68vfwr7dn67dws11p0pdys3spyyiv1464vmywi";
|
||||
sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export CFLAGS="-I`pwd`/include"
|
||||
export CXXFLAGS="$CFLAGS"
|
||||
'';
|
||||
|
||||
buildInputs = [ sqlite wxGTK30 gettext ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gfortran, sqlite }:
|
||||
{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sherpa-${version}";
|
||||
@ -9,10 +9,20 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran sqlite ];
|
||||
buildInputs = [ gfortran sqlite lhapdf rivet ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--with-sqlite3=${sqlite.dev}"
|
||||
"--enable-hepmc2=${hepmc}"
|
||||
"--enable-fastjet=${fastjet}"
|
||||
"--enable-lhapdf=${lhapdf}"
|
||||
"--enable-rivet=${rivet}"
|
||||
];
|
||||
|
||||
CXXFLAGS = "-std=c++11"; # needed for rivet on OSX
|
||||
|
||||
meta = {
|
||||
description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
||||
dconf
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-keyfile-settings" ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/mousepad" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.20.3";
|
||||
version = "0.20.4";
|
||||
name = "crystal-${version}-1";
|
||||
arch =
|
||||
{
|
||||
@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz";
|
||||
sha256 =
|
||||
{
|
||||
"x86_64-linux" = "c656dc8092a6161262f527df441aaab4ea9dd9a836a013f7155c6378b26b8cd7";
|
||||
"i686-linux" = "85edfa1dda5e712341869bab87f6de0f7c6860e2a04dec2f00e8dc6aa1418611";
|
||||
"x86_64-darwin" = "0088972c5cad9543f262976ae6c8ee1dbcbefdee3a8bedae851998bfa7098637";
|
||||
"x86_64-linux" = "cdc11c30235f8bd3b89e1fc13b56838f99d585715fb66563d6599026f5393e37";
|
||||
"i686-linux" = "93e7df2bea3220728987a49a2f93d1c615e2ccae63843e0259a5d891c53a0b80";
|
||||
"x86_64-darwin" = "3fd291a4a5c9eccdea933a9df25446c90d80660a17e89f83503fcb5b6deba03e";
|
||||
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
|
||||
sha256 = "5372ba2a35d885345207047a51b9389f9190fd12389847e7f7298618bcf59ad6";
|
||||
sha256 = "fd099f278b71bbb5cad1927c93933d1feba554fbf8f6f4ab9165f535765f5e31";
|
||||
};
|
||||
|
||||
# crystal on Darwin needs libiconv to build
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nim-${version}";
|
||||
version = "0.15.2";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nim-lang.org/download/${name}.tar.xz";
|
||||
sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
|
||||
sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
let
|
||||
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
|
||||
in
|
||||
|
||||
rec {
|
||||
rustc = callPackage ./rustc.nix {
|
||||
shortVersion = "1.14";
|
||||
@ -16,6 +15,7 @@ rec {
|
||||
|
||||
patches = [
|
||||
./patches/disable-lockfile-check-stable.patch
|
||||
./patches/darwin-disable-fragile-tcp-tests.patch
|
||||
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
|
||||
|
||||
inherit targets;
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
From 0becb0b7cff0176279fc9f94c91299d788a43941 Mon Sep 17 00:00:00 2001
|
||||
From: Moritz Ulrich <moritz@tarn-vedra.de>
|
||||
Date: Sun, 8 Jan 2017 10:28:17 +0100
|
||||
Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin
|
||||
|
||||
---
|
||||
src/libstd/net/tcp.rs | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
|
||||
index 0e7c5b0671..189c31b958 100644
|
||||
--- a/src/libstd/net/tcp.rs
|
||||
+++ b/src/libstd/net/tcp.rs
|
||||
@@ -1022,7 +1022,10 @@ mod tests {
|
||||
|
||||
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
|
||||
// no longer has rounding errors.
|
||||
- #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
|
||||
+ #[cfg_attr(any(target_os = "bitrig",
|
||||
+ target_os = "netbsd",
|
||||
+ target_os = "openbsd",
|
||||
+ target_os = "macos"), ignore)]
|
||||
#[test]
|
||||
fn timeouts() {
|
||||
let addr = next_test_ip4();
|
||||
@@ -1101,6 +1104,7 @@ mod tests {
|
||||
assert_eq!(false, t!(stream.nodelay()));
|
||||
}
|
||||
|
||||
+ #[cfg_attr(target_os = "macos", ignore)]
|
||||
#[test]
|
||||
fn ttl() {
|
||||
let ttl = 100;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -58,6 +58,8 @@ self: super: {
|
||||
rev = drv.version;
|
||||
};
|
||||
})).overrideScope (self: super: {
|
||||
# https://github.com/bitemyapp/esqueleto/issues/8
|
||||
esqueleto = self.esqueleto_2_4_3;
|
||||
# https://github.com/yesodweb/yesod/issues/1324
|
||||
yesod-persistent = self.yesod-persistent_1_4_1_1;
|
||||
# https://github.com/prowdsponsor/esqueleto/issues/137
|
||||
@ -1140,4 +1142,8 @@ self: super: {
|
||||
|
||||
# https://github.com/krisajenkins/elm-export/pull/22
|
||||
elm-export = doJailbreak super.elm-export;
|
||||
|
||||
turtle_1_3_0 = super.turtle_1_3_0.overrideScope (self: super: {
|
||||
optparse-applicative = self.optparse-applicative_0_13_0_0;
|
||||
});
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ self: super: {
|
||||
xhtml = null;
|
||||
|
||||
# jailbreak-cabal can use the native Cabal library.
|
||||
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
|
||||
jailbreak-cabal = super.jailbreak-cabal_1_3_2.override { Cabal = null; };
|
||||
|
||||
# haddock: No input file(s).
|
||||
nats = dontHaddock super.nats;
|
||||
|
||||
@ -2015,6 +2015,7 @@ extra-packages:
|
||||
- containers < 0.5 # required to build alex with GHC 6.12.3
|
||||
- control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x
|
||||
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
|
||||
- esqueleto < 2.5 # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8
|
||||
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
|
||||
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
|
||||
- haddock < 2.17 # required on GHC 7.10.x
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchgit, mlton }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ceptre-2016-01-01";
|
||||
name = "ceptre-2016-11-27";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/chrisamaphone/interactive-lp;
|
||||
rev = "b3d21489d4994f03d2982de273eea90bc7fba5d0";
|
||||
sha256 = "1qpyasr3jg4i2x547yq1dzksvjagvnrmkdd00s108wvw9npc2jj1";
|
||||
rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
|
||||
sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mlton ];
|
||||
|
||||
@ -18,11 +18,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.3";
|
||||
version = "4.2.0";
|
||||
name = "octave-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/${name}.tar.xz";
|
||||
sha256 = "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw";
|
||||
url = "mirror://gnu/octave/${name}.tar.gz";
|
||||
sha256 = "0rsmg5i3b5yfvkvrl9mqvn3f2n1a6vqg45phpja1qlzkh8vsffs4";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }:
|
||||
{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, nspr, icu, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "31.5.0";
|
||||
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ];
|
||||
buildInputs = [ libffi readline nspr icu ];
|
||||
nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
|
||||
{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "38.2.1.rc0";
|
||||
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ];
|
||||
buildInputs = [ libffi readline icu zlib nspr ];
|
||||
nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||
|
||||
|
||||
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
||||
] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
CoreGraphics
|
||||
CoreText
|
||||
ApplicationServices
|
||||
Carbon
|
||||
]);
|
||||
|
||||
@ -56,9 +57,6 @@ stdenv.mkDerivation rec {
|
||||
++ optionals xcbSupport [ libxcb xcbutil ]
|
||||
++ optional gobjectSupport glib
|
||||
++ optional glSupport mesa_noglu
|
||||
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
ApplicationServices
|
||||
])
|
||||
; # TODO: maybe liblzo but what would it be for here?
|
||||
|
||||
configureFlags = if stdenv.isDarwin then [
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
{ stdenv, cmake, fetchzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gmock-${version}";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://googlemock.googlecode.com/files/gmock-${version}.zip";
|
||||
sha256 = "04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
buildPhase = ''
|
||||
# avoid building gtest
|
||||
make gmock gmock_main
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp -v libgmock.a libgmock_main.a $out/lib
|
||||
cp -v -r ../include $out
|
||||
cp -v -r ../src $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Google mock: Google's framework for writing C++ mock classes";
|
||||
homepage = https://code.google.com/p/googlemock/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = [ stdenv.lib.maintainers.auntie ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
|
||||
passthru = { source = src; };
|
||||
}
|
||||
@ -1,32 +1,60 @@
|
||||
{ fetchurl, stdenv, curl,
|
||||
netcdf, jasper, openjpeg }:
|
||||
{ fetchurl, stdenv,
|
||||
cmake, netcdf, gfortran, jasper, libpng,
|
||||
enablePython ? false, pythonPackages }:
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
name = "grib-api-${version}";
|
||||
version = "1.14.4";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.4-Source.tar.gz;
|
||||
sha256 = "1w8z9y79wakhwv1r4rb4dwlh9pbyw367klcm6laxz91hhvfrpfq8";
|
||||
url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
|
||||
sha256 = "07cj9mw5bb249lxx1m9nmfdqb8b2a8cm7s6x62cdwca3sp16dv6a";
|
||||
};
|
||||
|
||||
buildInputs = [ netcdf
|
||||
preConfigure = ''
|
||||
# Fix "no member named 'inmem_' in 'jas_image_t'"
|
||||
substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" ""
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake
|
||||
netcdf
|
||||
gfortran
|
||||
jasper
|
||||
openjpeg
|
||||
curl # Used for downloading during make test
|
||||
libpng
|
||||
] ++ stdenv.lib.optionals enablePython [
|
||||
pythonPackages.python
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
|
||||
"-DENABLE_PNG=ON"
|
||||
"-DENABLE_FORTRAN=ON"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Only do tests that don't require downloading 120MB of testdata
|
||||
# We fix the darwin checkPhase, which searches for libgrib_api.dylib
|
||||
# in /nix/store by setting DYLD_LIBRARY_PATH
|
||||
checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
|
||||
substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
|
||||
'' + ''
|
||||
ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
|
||||
'';
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
|
||||
license = licenses.asl20;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
description = "ECMWF Library for the GRIB file format";
|
||||
longDescription = ''
|
||||
The ECMWF GRIB API is an application program interface accessible from C,
|
||||
FORTRAN and Python programs developed for encoding and decoding WMO FM-92
|
||||
GRIB edition 1 and edition 2 messages.
|
||||
'';
|
||||
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
{ stdenv, cmake, callPackage }:
|
||||
let
|
||||
source = callPackage ./source.nix { };
|
||||
in
|
||||
{ stdenv, cmake, fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtest-${source.version}";
|
||||
name = "gtest-${version}";
|
||||
version = "1.8.0";
|
||||
|
||||
src = source;
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
@ -17,9 +20,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp -v libgtest.a libgtest_main.a $out/lib
|
||||
cp -v -r ../include $out
|
||||
cp -v -r ../src $out
|
||||
cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
|
||||
ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
|
||||
mkdir -p $out/include
|
||||
cp -v -r ../googlemock/include/gmock $out/include
|
||||
cp -v -r ../googletest/include/gtest $out/include
|
||||
mkdir -p $out/src
|
||||
cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -27,8 +34,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://code.google.com/p/googletest/;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ zoomulator ];
|
||||
maintainers = with maintainers; [ zoomulator ivan-tkatchev ];
|
||||
};
|
||||
|
||||
passthru = { inherit source; };
|
||||
}
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
{ fetchurl, stdenv, unzip, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtest-src-${version}";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://googletest.googlecode.com/files/gtest-${version}.zip";
|
||||
sha256 = "03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
buildCommand = ''
|
||||
unpackPhase
|
||||
cd gtest-${version}
|
||||
mkdir $out
|
||||
cp -r * $out
|
||||
'';
|
||||
|
||||
passthru = { inherit version; };
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
|
||||
, bzip2, libcroco, libintlOrEmpty
|
||||
, bzip2, libcroco, libintlOrEmpty, darwin
|
||||
, withGTK ? false, gtk3 ? null
|
||||
, gobjectIntrospection ? null, enableIntrospection ? false }:
|
||||
|
||||
@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
ApplicationServices
|
||||
]);
|
||||
|
||||
configureFlags = [ "--enable-introspection=auto" ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lirc-0.9.3";
|
||||
name = "lirc-0.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lirc/${name}.tar.bz2";
|
||||
@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preBuild = "patchShebangs .";
|
||||
|
||||
buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ];
|
||||
nativeBuildInputs = [ pkgconfig help2man ];
|
||||
|
||||
buildInputs = [ alsaLib xlibsWrapper python3 libxslt ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-driver=devinput"
|
||||
|
||||
26
pkgs/development/libraries/loki/default.nix
Normal file
26
pkgs/development/libraries/loki/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "loki-${version}";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/loki-lib/Loki/Loki%20${version}/loki-${version}.tar.gz";
|
||||
sha256 = "1xhwna961fl4298ac5cc629x5030zlw31vx4h8zws290amw5860g";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
substituteInPlace Makefile.common --replace /usr $out
|
||||
make build-shared
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms";
|
||||
homepage = http://loki-lib.sourceforge.net;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ boost lhapdf root yoda ];
|
||||
|
||||
CXXFLAGS="-std=c++11"; # for yoda
|
||||
|
||||
configureFlags = [
|
||||
"--with-yoda=${yoda}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fastnlo, rivet, sherpa }:
|
||||
{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mcgrid-${version}";
|
||||
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ fastnlo rivet ];
|
||||
propagatedNativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace mcgrid.pc.in \
|
||||
|
||||
33
pkgs/development/libraries/physics/rivet/darwin.patch
Normal file
33
pkgs/development/libraries/physics/rivet/darwin.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh
|
||||
index 05f06ca..59af7de 100644
|
||||
--- a/include/Rivet/Tools/osdir.hh
|
||||
+++ b/include/Rivet/Tools/osdir.hh
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
/// @cond OSDIR
|
||||
|
||||
-#if defined(unix) || defined(__unix) || defined(__unix__)
|
||||
+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
|
||||
#define OSLINK_OSDIR_POSIX
|
||||
#elif defined(_WIN32)
|
||||
#define OSLINK_OSDIR_WINDOWS
|
||||
@@ -32,18 +32,7 @@
|
||||
#include <string>
|
||||
|
||||
#if defined(OSLINK_OSDIR_NOTSUPPORTED)
|
||||
-
|
||||
-namespace oslink
|
||||
-{
|
||||
- class directory
|
||||
- {
|
||||
- public:
|
||||
- directory(const std::string&) { }
|
||||
- operator void*() const { return (void*)0; }
|
||||
- std::string next() { return ""; }
|
||||
- };
|
||||
-}
|
||||
-
|
||||
+#error Platform misdetected or oslink is not implemented
|
||||
#elif defined(OSLINK_OSDIR_POSIX)
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
pythonPath = []; # python wrapper support
|
||||
|
||||
patches = [
|
||||
./darwin.patch # configure relies on impure sw_vers to -Dunix
|
||||
];
|
||||
|
||||
latex = texlive.combine { inherit (texlive)
|
||||
scheme-basic
|
||||
collection-pstricks
|
||||
|
||||
@ -18,8 +18,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
rm -rf gmock
|
||||
cp -r ${gmock.source} gmock
|
||||
cp -r ${gmock.src}/googlemock gmock
|
||||
cp -r ${gmock.src}/googletest googletest
|
||||
chmod -R a+w gmock
|
||||
chmod -R a+w googletest
|
||||
ln -s ../googletest gmock/gtest
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/google/protobuf/testing/googletest.cc \
|
||||
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
rm -rf gtest
|
||||
cp -r ${gtest.source} gtest
|
||||
cp -r ${gtest.src}/googletest gtest
|
||||
chmod -R a+w gtest
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/google/protobuf/testing/googletest.cc \
|
||||
|
||||
@ -1,18 +1,23 @@
|
||||
{ stdenv, fetchurl, qt4, qmake4Hook }:
|
||||
{ stdenv, fetchurl, unzip
|
||||
, qt4 ? null, qmake4Hook ? null
|
||||
, withQt5 ? false, qtbase ? null, qmakeHook ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla";
|
||||
version = "2.9";
|
||||
version = "2.9.4";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
|
||||
sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
|
||||
url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip";
|
||||
sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
|
||||
nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
cd Qt4Qt5
|
||||
@ -23,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
qscintilla.pro
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Qt port of the Scintilla text editing library";
|
||||
longDescription = ''
|
||||
QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
|
||||
@ -40,7 +45,8 @@ stdenv.mkDerivation rec {
|
||||
background colours and multiple fonts.
|
||||
'';
|
||||
homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
|
||||
license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = with licenses; [ gpl2 gpl3 ]; # and commercial
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
urls =
|
||||
[ "http://www.zlib.net/${name}.tar.gz" # old versions vanish from here
|
||||
[ "http://www.zlib.net/fossils/${name}.tar.gz" # stable archive path
|
||||
"mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
|
||||
];
|
||||
sha256 = "05w0jwsqib44jz5jazh7cqz311z4g7znnzn6w6v8g1z4iilryzld";
|
||||
|
||||
@ -3,15 +3,13 @@
|
||||
# TODO: Look at the hardcoded paths to kernel, modules etc.
|
||||
stdenv.mkDerivation rec {
|
||||
name = "elfutils-${version}";
|
||||
version = "0.165";
|
||||
version = "0.168";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2";
|
||||
sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57";
|
||||
url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
|
||||
sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq";
|
||||
};
|
||||
|
||||
patches = [ ./glibc-2.21.patch ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
|
||||
@ -68,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://fedorahosted.org/elfutils/;
|
||||
homepage = https://sourceware.org/elfutils/;
|
||||
description = "A set of utilities to handle ELF objects";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl3;
|
||||
|
||||
@ -1,164 +0,0 @@
|
||||
From b9d70fb9fb0bd0bf84eb2302cba1691aea74c42e Mon Sep 17 00:00:00 2001
|
||||
From: Mark Wielaard <mjw@redhat.com>
|
||||
Date: Wed, 13 Jan 2016 17:16:48 +0100
|
||||
Subject: [PATCH] libelf: Add ELF compression types and defines to libelf.h for
|
||||
older glibc.
|
||||
|
||||
Older glibc elf.h might not define the new ELF compression defines and
|
||||
types. If not just define them in libelf.h directly to make the libelf
|
||||
headers work on older glibc systems.
|
||||
|
||||
Also include a testcase to check the libelf headers build against the
|
||||
system elf.h.
|
||||
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810885
|
||||
|
||||
Signed-off-by: Mark Wielaard <mjw@redhat.com>
|
||||
---
|
||||
libelf/ChangeLog | 5 +++++
|
||||
libelf/libelf.h | 28 ++++++++++++++++++++++++++++
|
||||
tests/ChangeLog | 8 ++++++++
|
||||
tests/Makefile.am | 9 +++++++--
|
||||
tests/system-elf-libelf-test.c | 35 +++++++++++++++++++++++++++++++++++
|
||||
5 files changed, 83 insertions(+), 2 deletions(-)
|
||||
create mode 100644 tests/system-elf-libelf-test.c
|
||||
|
||||
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
|
||||
index 3a1fe91..aabf6f6 100644
|
||||
--- a/libelf/ChangeLog
|
||||
+++ b/libelf/ChangeLog
|
||||
@@ -1,3 +1,8 @@
|
||||
+2016-01-13 Mark Wielaard <mjw@redhat.com>
|
||||
+
|
||||
+ * libelf.h: Check SHF_COMPRESSED is defined. If not define it and the
|
||||
+ associated ELF compression types/defines.
|
||||
+
|
||||
2015-11-26 Mark Wielaard <mjw@redhat.com>
|
||||
|
||||
* elf_compress.c (__libelf_decompress_elf): New function, extracted
|
||||
diff --git a/libelf/libelf.h b/libelf/libelf.h
|
||||
index 364e776..c0d6389 100644
|
||||
--- a/libelf/libelf.h
|
||||
+++ b/libelf/libelf.h
|
||||
@@ -35,6 +35,34 @@
|
||||
/* Get the ELF types. */
|
||||
#include <elf.h>
|
||||
|
||||
+#ifndef SHF_COMPRESSED
|
||||
+ /* Older glibc elf.h might not yet define the ELF compression types. */
|
||||
+ #define SHF_COMPRESSED (1 << 11) /* Section with compressed data. */
|
||||
+
|
||||
+ /* Section compression header. Used when SHF_COMPRESSED is set. */
|
||||
+
|
||||
+ typedef struct
|
||||
+ {
|
||||
+ Elf32_Word ch_type; /* Compression format. */
|
||||
+ Elf32_Word ch_size; /* Uncompressed data size. */
|
||||
+ Elf32_Word ch_addralign; /* Uncompressed data alignment. */
|
||||
+ } Elf32_Chdr;
|
||||
+
|
||||
+ typedef struct
|
||||
+ {
|
||||
+ Elf64_Word ch_type; /* Compression format. */
|
||||
+ Elf64_Word ch_reserved;
|
||||
+ Elf64_Xword ch_size; /* Uncompressed data size. */
|
||||
+ Elf64_Xword ch_addralign; /* Uncompressed data alignment. */
|
||||
+ } Elf64_Chdr;
|
||||
+
|
||||
+ /* Legal values for ch_type (compression algorithm). */
|
||||
+ #define ELFCOMPRESS_ZLIB 1 /* ZLIB/DEFLATE algorithm. */
|
||||
+ #define ELFCOMPRESS_LOOS 0x60000000 /* Start of OS-specific. */
|
||||
+ #define ELFCOMPRESS_HIOS 0x6fffffff /* End of OS-specific. */
|
||||
+ #define ELFCOMPRESS_LOPROC 0x70000000 /* Start of processor-specific. */
|
||||
+ #define ELFCOMPRESS_HIPROC 0x7fffffff /* End of processor-specific. */
|
||||
+#endif
|
||||
|
||||
/* Known translation types. */
|
||||
typedef enum
|
||||
diff --git a/tests/ChangeLog b/tests/ChangeLog
|
||||
index 366aea9..234ae56 100644
|
||||
--- a/tests/ChangeLog
|
||||
+++ b/tests/ChangeLog
|
||||
@@ -1,3 +1,11 @@
|
||||
+2016-01-13 Mark Wielaard <mjw@redhat.com>
|
||||
+
|
||||
+ * system-elf-libelf-test.c: New test.
|
||||
+ * Makefile.am (TESTS): Add system-elf-libelf-test, if !STANDALONE.
|
||||
+ (check_PROGRAMS): Likewise.
|
||||
+ (system_elf_libelf_test_CPPFLAGS): New variable.
|
||||
+ (system_elf_libelf_test_LDADD): Likewise.
|
||||
+
|
||||
2016-01-08 Mark Wielaard <mjw@redhat.com>
|
||||
|
||||
* elfputzdata.c (main): Fix parentheses in strncmp test.
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index d09a6d7..7b9e108 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -136,8 +136,8 @@ export ELFUTILS_DISABLE_DEMANGLE = 1
|
||||
endif
|
||||
|
||||
if !STANDALONE
|
||||
-check_PROGRAMS += msg_tst md5-sha1-test
|
||||
-TESTS += msg_tst md5-sha1-test
|
||||
+check_PROGRAMS += msg_tst md5-sha1-test system-elf-libelf-test
|
||||
+TESTS += msg_tst md5-sha1-test system-elf-libelf-test
|
||||
endif
|
||||
|
||||
if LZMA
|
||||
@@ -473,6 +473,11 @@ elfgetzdata_LDADD = $(libelf)
|
||||
elfputzdata_LDADD = $(libelf)
|
||||
zstrptr_LDADD = $(libelf)
|
||||
|
||||
+# We want to test the libelf header against the system elf.h header.
|
||||
+# Don't include any -I CPPFLAGS.
|
||||
+system_elf_libelf_test_CPPFLAGS =
|
||||
+system_elf_libelf_test_LDADD = $(libelf)
|
||||
+
|
||||
if GCOV
|
||||
check: check-am coverage
|
||||
.PHONY: coverage
|
||||
diff --git a/tests/system-elf-libelf-test.c b/tests/system-elf-libelf-test.c
|
||||
new file mode 100644
|
||||
index 0000000..7dfe498
|
||||
--- /dev/null
|
||||
+++ b/tests/system-elf-libelf-test.c
|
||||
@@ -0,0 +1,35 @@
|
||||
+/* Explicit test compiling with system elf.h header plus libelf header.
|
||||
+
|
||||
+ Copyright (C) 2016 Red Hat, Inc.
|
||||
+ This file is part of elfutils.
|
||||
+
|
||||
+ This file is free software; you can redistribute it and/or modify
|
||||
+ it under the terms of the GNU General Public License as published by
|
||||
+ the Free Software Foundation; either version 3 of the License, or
|
||||
+ (at your option) any later version.
|
||||
+
|
||||
+ elfutils is distributed in the hope that it will be useful, but
|
||||
+ WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ GNU General Public License for more details.
|
||||
+
|
||||
+ You should have received a copy of the GNU General Public License
|
||||
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#include <elf.h>
|
||||
+#include <stddef.h>
|
||||
+#include "../libelf/libelf.h"
|
||||
+
|
||||
+int
|
||||
+main (void)
|
||||
+{
|
||||
+ /* Trivial test, this is really a compile test anyway. */
|
||||
+ if (elf_version (EV_CURRENT) == EV_NONE)
|
||||
+ return -1;
|
||||
+
|
||||
+ /* This will obviously fail. It is just to check that Elf32_Chdr and
|
||||
+ elf32_getchdr are available (both at compile time and runtime). */
|
||||
+ Elf32_Chdr *chdr = elf32_getchdr (NULL);
|
||||
+
|
||||
+ return chdr == NULL ? 0 : -1;
|
||||
+}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "global-${version}";
|
||||
version = "6.5.5";
|
||||
version = "6.5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/global/${name}.tar.gz";
|
||||
sha256 = "0yyg91qw8399lnxfai4bxkh9yq71qdwp9kvadgzp05cdqni44nxw";
|
||||
sha256 = "018m536k5y6lks1a6gqn3bsp7r8zk017znqj9kva1nm8d7x9lbqj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool makeWrapper ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
|
||||
, guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc
|
||||
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
|
||||
, rpm, dpkg, cdrkit, fetchpatch }:
|
||||
, rpm, dpkg, cdrkit, fetchpatch, pixz }:
|
||||
|
||||
with stdenv;
|
||||
|
||||
@ -61,21 +61,17 @@ let
|
||||
};
|
||||
in releaseTools.nixBuild rec {
|
||||
name = "hydra-${version}";
|
||||
version = "2016-04-15";
|
||||
version = "2016-12-09";
|
||||
|
||||
inherit stdenv;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "177bf25d648092826a75369191503a3f2bb763a4";
|
||||
sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl";
|
||||
rev = "de55303197d997c4fc5503b52b1321ae9528583d";
|
||||
sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly";
|
||||
};
|
||||
|
||||
patches = [(fetchpatch {
|
||||
name = "cmath.diff";
|
||||
url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337
|
||||
sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0";
|
||||
})];
|
||||
|
||||
buildInputs =
|
||||
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
|
||||
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
|
||||
@ -96,7 +92,7 @@ in releaseTools.nixBuild rec {
|
||||
];
|
||||
|
||||
hydraPath = lib.makeBinPath (
|
||||
[ libxslt sqlite subversion openssh nixUnstable coreutils findutils
|
||||
[ sqlite subversion openssh nixUnstable coreutils findutils pixz
|
||||
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
|
||||
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
|
||||
|
||||
@ -108,7 +104,7 @@ in releaseTools.nixBuild rec {
|
||||
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
|
||||
|
||||
preHook = ''
|
||||
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH
|
||||
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
|
||||
PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
|
||||
'';
|
||||
|
||||
|
||||
67
pkgs/development/tools/tora/default.nix
Normal file
67
pkgs/development/tools/tora/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, ecm, makeQtWrapper
|
||||
, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
|
||||
|
||||
let
|
||||
qscintillaLib = (qscintilla.override { withQt5 = true; });
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "tora-${version}";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tora-tool";
|
||||
repo = "tora";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
cmake ecm makeQtWrapper
|
||||
boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i \
|
||||
's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \
|
||||
src/widgets/toglobalsetting.cpp
|
||||
|
||||
sed -i \
|
||||
's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \
|
||||
extlibs/libermodel/dotgraph.cpp
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWANT_INTERNAL_LOKI=0"
|
||||
"-DWANT_INTERNAL_QSCINTILLA=0"
|
||||
# cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name
|
||||
"-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include"
|
||||
"-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so"
|
||||
"-DENABLE_DB2=0"
|
||||
"-DENABLE_ORACLE=0"
|
||||
"-DENABLE_TERADATA=0"
|
||||
"-DQT5_BUILD=1"
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
# these libraries are only searched for at runtime so we need to force-link them
|
||||
NIX_LDFLAGS = [
|
||||
"-lgvc"
|
||||
"-lmysqlclient"
|
||||
"-lecpg"
|
||||
"-lssl"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapQtProgram $out/bin/tora \
|
||||
--prefix PATH : ${lib.getBin graphviz}/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tora SQL tool";
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@ -3,10 +3,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "xlockmore-5.49";
|
||||
name = "xlockmore-5.50";
|
||||
src = fetchurl {
|
||||
url = "http://sillycycle.com/xlock/${name}.tar.xz";
|
||||
sha256 = "0n2pxm1qxg39h3qkqhbck312cmq7gbpj7hpv210y40kx9fj6biq3";
|
||||
sha256 = "0a9sargn36b5lxil777p35z8m5jr744h9xmc021057aq8kgp4pv3";
|
||||
curlOpts = "--user-agent 'Mozilla/5.0'";
|
||||
};
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "android-udev-rules-${version}";
|
||||
version = "20161014";
|
||||
version = "20170109";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "M0Rf30";
|
||||
repo = "android-udev-rules";
|
||||
rev = version;
|
||||
sha256 = "0xc7wslxf7xsvfbd83wsw4nikmpq1zfd607y2p2r3j1vkw1yak08";
|
||||
sha256 = "1fxr6iyb70swmmp46xvx8iz9h6xj7x6q9yfdsl958zd63j8sjzjr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "linuxconsoletools-${version}";
|
||||
version = "1.4.9";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
|
||||
sha256 = "0rwv2fxn12bblp096m9jy1lhngz26lv6g6zs4cgfg4frikwn977s";
|
||||
sha256 = "0il1m8pgw8f6b8qid035ixamv0w5fgh9pinx5vw4ayxn03nyzlnf";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgs, lib, glibc, augeas, bind, c-ares,
|
||||
{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares,
|
||||
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen,
|
||||
python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
|
||||
pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ augeas bind c-ares cyrus_sasl ding-libs libnl libunistring nss
|
||||
buildInputs = [ augeas dnsutils c-ares cyrus_sasl ding-libs libnl libunistring nss
|
||||
samba libnfsidmap doxygen python python3 popt
|
||||
talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos
|
||||
cifs_utils glib keyutils dbus fakeroot libxslt libxml2
|
||||
|
||||
@ -136,4 +136,14 @@
|
||||
sha256 = "0h98a8kiw2qkqfavysm1v16kf4cs4h39j583wapif4p0qx3bbm89";
|
||||
};
|
||||
};
|
||||
|
||||
# For an example usage, see https://easyengine.io/wordpress-nginx/tutorials/single-site/fastcgi-cache-with-purging/
|
||||
fastcgi-cache-purge = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "FRiCKLE";
|
||||
repo = "ngx_cache_purge";
|
||||
rev = "2.3";
|
||||
sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
25
pkgs/servers/monitoring/prometheus/json-exporter.nix
Normal file
25
pkgs/servers/monitoring/prometheus/json-exporter.nix
Normal file
@ -0,0 +1,25 @@
|
||||
# This file was generated by go2nix.
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "prometheus-json-exporter-${version}";
|
||||
version = "unstable-2016-09-13";
|
||||
rev = "d45e5ebdb08cb734ad7a8683966032af1d91a76c";
|
||||
|
||||
goPackagePath = "github.com/kawamuray/prometheus-json-exporter";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "kawamuray";
|
||||
repo = "prometheus-json-exporter";
|
||||
sha256 = "0v3as7gakdqpsir97byknsrqxxxkq66hp23j4cscs45hsdb24pi9";
|
||||
};
|
||||
|
||||
goDeps = ./json-exporter_deps.nix;
|
||||
|
||||
meta = {
|
||||
description = "A prometheus exporter which scrapes remote JSON by JSONPath";
|
||||
homepage = "https://github.com/kawamuray/prometheus-json-exporter";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
111
pkgs/servers/monitoring/prometheus/json-exporter_deps.nix
Normal file
111
pkgs/servers/monitoring/prometheus/json-exporter_deps.nix
Normal file
@ -0,0 +1,111 @@
|
||||
# This file was generated by go2nix.
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/Sirupsen/logrus";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Sirupsen/logrus";
|
||||
rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f";
|
||||
sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/beorn7/perks";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/beorn7/perks";
|
||||
rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
|
||||
sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
|
||||
sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kawamuray/jsonpath";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kawamuray/jsonpath";
|
||||
rev = "5c448ebf973557834ef870e788b0b2d95ac68d12";
|
||||
sha256 = "1i1id1i85rf09rldp03h0ibyi6zg0fz9p9l5qj7i8dfs6h6y8f0a";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kawamuray/prometheus-exporter-harness";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kawamuray/prometheus-exporter-harness";
|
||||
rev = "97eeea7b8b0619ea2a065d75c0f0f5909327afa6";
|
||||
sha256 = "12al8irf8jb6p2xmm4wbh0wjqsyrdywynr4w122wxxnsx2n56xyv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/matttproud/golang_protobuf_extensions";
|
||||
rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
|
||||
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_golang";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_golang";
|
||||
rev = "575f371f7862609249a1be4c9145f429fe065e32";
|
||||
sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_model";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_model";
|
||||
rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
|
||||
sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/common";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/common";
|
||||
rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3";
|
||||
sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/procfs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/procfs";
|
||||
rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5";
|
||||
sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
|
||||
sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0";
|
||||
sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam";
|
||||
};
|
||||
}
|
||||
]
|
||||
26
pkgs/servers/monitoring/prometheus/varnish-exporter.nix
Normal file
26
pkgs/servers/monitoring/prometheus/varnish-exporter.nix
Normal file
@ -0,0 +1,26 @@
|
||||
# This file was generated by go2nix.
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "prometheus_varnish_exporter-${version}";
|
||||
version = "1.2";
|
||||
rev = "0f0e3e2";
|
||||
|
||||
goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "jonnenauha";
|
||||
repo = "prometheus_varnish_exporter";
|
||||
sha256 = "15vw3jqzm2nad81j14spib5v7q2jpibclzrnkd688003vkizlwyn";
|
||||
};
|
||||
|
||||
goDeps = ./varnish-exporter_deps.nix;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
|
||||
description = "Varnish exporter for Prometheus";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ MostAwesomeDude ];
|
||||
};
|
||||
}
|
||||
66
pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
Normal file
66
pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
Normal file
@ -0,0 +1,66 @@
|
||||
# This file was generated by go2nix.
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/beorn7/perks";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/beorn7/perks";
|
||||
rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
|
||||
sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
|
||||
sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/matttproud/golang_protobuf_extensions";
|
||||
rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
|
||||
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_golang";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_golang";
|
||||
rev = "575f371f7862609249a1be4c9145f429fe065e32";
|
||||
sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_model";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_model";
|
||||
rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
|
||||
sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/common";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/common";
|
||||
rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3";
|
||||
sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/procfs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/procfs";
|
||||
rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5";
|
||||
sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sonarr-${version}";
|
||||
version = "2.0.0.4427";
|
||||
version = "2.0.0.4472";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
|
||||
sha256 = "066jhvz57hxrcgn902z25a21sj87wiqz224fjzpk1lpxrylv4ac2";
|
||||
sha256 = "0sz03z057pyai151lxsdsgxlv6kvrnd1xxw7i1ss7b79l6xgmpw8";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,22 +1,20 @@
|
||||
{ stdenv, fetchgit, autoconf, automake, perl, libX11 }:
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffcast-${version}";
|
||||
version = "2.5.0";
|
||||
rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/lolilolicon/FFcast;
|
||||
sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lolilolicon";
|
||||
repo = "FFcast";
|
||||
rev = "${version}";
|
||||
sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf automake perl libX11 ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ perl libX11 ];
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-xrectsel" ];
|
||||
configureFlags = [ "--disable-xrectsel" ];
|
||||
|
||||
postBuild = ''
|
||||
make DESTDIR="$out" install
|
||||
|
||||
28
pkgs/tools/X11/xrectsel/default.nix
Normal file
28
pkgs/tools/X11/xrectsel/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xrectsel-${version}";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lolilolicon";
|
||||
repo = "xrectsel";
|
||||
rev = "${version}";
|
||||
sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
postBuild = ''
|
||||
make DESTDIR="$out" install
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Print the geometry of a rectangular screen region";
|
||||
homepage = https://github.com/lolilolicon/xrectsel;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.guyonvarch ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "disorderfs-${version}";
|
||||
version = "0.4.2";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
|
||||
sha256 = "1qr52lzynd5b5ancrn0g1ah95w7iikxgqsmixlacn2vlh8n9jym5";
|
||||
sha256 = "0nnxk0qqww16ra52mi5giw50zpssvan62nkig5dcxvgcvv51akik";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig asciidoc ];
|
||||
|
||||
buildInputs = [ fuse attr ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clipster-unstable-${version}";
|
||||
version = "2016-09-12";
|
||||
version = "2016-12-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrichar1";
|
||||
repo = "clipster";
|
||||
rev = "6526a849a0af4c392f4e8e5b18aacdda9c1a8e80";
|
||||
sha256 = "0illdajp5z50h7lvglv0p72cpv4c592xmpamrg8kkjpg693bp873";
|
||||
rev = "7a3511d89dbbb4157118eec15f1e9e6fd0ad1a6b";
|
||||
sha256 = "005akgk1wn3z5vxfjii202zzwz85zydimfgm69ml68imj5vbhkg1";
|
||||
};
|
||||
|
||||
pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]);
|
||||
|
||||
28
pkgs/tools/misc/debianutils/default.nix
Normal file
28
pkgs/tools/misc/debianutils/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
checksums = {
|
||||
"4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "4.8.1";
|
||||
name = "debianutils-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
|
||||
sha256 = checksums."${version}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Miscellaneous utilities specific to Debian";
|
||||
longDescription = ''
|
||||
This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly.
|
||||
|
||||
The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which
|
||||
'';
|
||||
downloadPage = https://packages.debian.org/sid/debianutils;
|
||||
license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ];
|
||||
maintainers = [];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "entr-${version}";
|
||||
version = "3.5";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://entrproject.org/code/${name}.tar.gz";
|
||||
sha256 = "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73";
|
||||
sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{
|
||||
kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
|
||||
ecm, kdoctools,
|
||||
baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework
|
||||
baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "peruse";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
unarr = fetchFromGitHub {
|
||||
owner = "zeniko";
|
||||
repo = "unarr";
|
||||
@ -18,15 +18,17 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${name}.tar.xz";
|
||||
sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j";
|
||||
sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ecm kdoctools ];
|
||||
|
||||
propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ];
|
||||
propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
|
||||
|
||||
pathsToLink = [ "/etc/xdg/peruse.knsrc"];
|
||||
|
||||
preConfigure = ''
|
||||
rmdir src/qtquick/karchive-rar/external/unarr
|
||||
rm -rf src/qtquick/karchive-rar/external/unarr
|
||||
ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
|
||||
'';
|
||||
|
||||
@ -39,5 +41,5 @@ let
|
||||
|
||||
in kdeWrapper {
|
||||
inherit unwrapped;
|
||||
targets = [ "bin/peruse" ];
|
||||
targets = [ "bin/peruse" "bin/perusecreator" ];
|
||||
}
|
||||
|
||||
@ -15,11 +15,11 @@ with stdenv.lib;
|
||||
buildPythonApplication rec {
|
||||
|
||||
name = "youtube-dl-${version}";
|
||||
version = "2017.01.02";
|
||||
version = "2017.01.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
|
||||
sha256 = "140de01ea879cdc50bc34240802d5c10231baf448d7a664e6efeb9d5efb74d5b";
|
||||
sha256 = "ac2942d001003575858ff044dd1c1c264ab08527efa1af7036f773ea82b25fd6";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "axel-${version}";
|
||||
version = "2.11";
|
||||
version = "2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
|
||||
sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky";
|
||||
sha256 = "12sa5whd5mjn1idd83hbhm0rmsh5bvhhgvv03fk5cgxynwkbprr8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
name = "ferm-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ferm.foo-projects.org/download/${version}/ferm-${version}.tar.gz";
|
||||
sha256 = "0jx63fhjw5y1ahgdbn4hgd7sq6clxl80dr8a2hkryibfbwz3vs4x";
|
||||
url = "http://ferm.foo-projects.org/download/2.3/ferm-${version}.tar.gz";
|
||||
sha256 = "1scdnd2jk4787jyr6fxav2598g0x7hjic5b8bj77j8s0hki48m4a";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ipset ebtables iptables makeWrapper ];
|
||||
|
||||
@ -1,15 +1,21 @@
|
||||
{ stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
name = "pdf2djvu-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
|
||||
sha256 = "1a1gwr6yzbiximbpgg4rc69dq8g3jmxwcbcwqk0fhfbgzj1j4w65";
|
||||
url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz";
|
||||
sha256 = "0fr8b44rsqll2m6qnh9id1lfc980k7rj3aq975mwba4y57rwnlnc";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ djvulibre poppler fontconfig libjpeg ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's#\$djvulibre_bin_path#${djvulibre.bin}/bin#g' configure
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Creates djvu files from PDF files";
|
||||
|
||||
@ -1,23 +1,30 @@
|
||||
{ fetchurl, stdenv, python2Packages, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rubber-1.3";
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "rubber-${version}";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/rubber/trunk/1.3/+download/rubber-1.3.tar.gz";
|
||||
sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh";
|
||||
url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz";
|
||||
sha256 = "1d7hq19vpb3l31grldbxg8lx1qdd18f5f3gqw96q0lhf58agcjl2";
|
||||
};
|
||||
|
||||
buildInputs = [ python2Packages.python texinfo ];
|
||||
nativeBuildInputs = [ python2Packages.wrapPython ];
|
||||
propagatedBuildInputs = [ texinfo ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace configure --replace which "type -P"
|
||||
# I couldn't figure out how to pass the proper parameter to disable pdf generation, so we
|
||||
# use sed to change the default
|
||||
preBuild = ''
|
||||
sed -i -r 's/pdf\s+= True/pdf = False/g' setup.py
|
||||
'';
|
||||
|
||||
postInstall = "wrapPythonPrograms";
|
||||
# the check scripts forces python2. If we need to use python3 at some point, we should use
|
||||
# the correct python
|
||||
checkPhase = ''
|
||||
sed -i 's|python=python2|python=${python2Packages.python.interpreter}|' tests/run.sh
|
||||
cd tests && ${stdenv.shell} run.sh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Wrapper for LaTeX and friends";
|
||||
longDescription = ''
|
||||
Rubber is a program whose purpose is to handle all tasks related
|
||||
@ -28,9 +35,9 @@ stdenv.mkDerivation rec {
|
||||
produce PostScript documents is also included, as well as usage
|
||||
of pdfLaTeX to produce PDF documents.
|
||||
'';
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/;
|
||||
maintainers = [ stdenv.lib.maintainers.ttuegel ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = https://launchpad.net/rubber;
|
||||
maintainers = with maintainers; [ ttuegel peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1369,6 +1369,8 @@ in
|
||||
|
||||
dcfldd = callPackage ../tools/system/dcfldd { };
|
||||
|
||||
debianutils = callPackage ../tools/misc/debianutils { };
|
||||
|
||||
debian-devscripts = callPackage ../tools/misc/debian-devscripts {
|
||||
inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
|
||||
};
|
||||
@ -2068,7 +2070,7 @@ in
|
||||
gt5 = callPackage ../tools/system/gt5 { };
|
||||
|
||||
gtest = callPackage ../development/libraries/gtest {};
|
||||
gmock = callPackage ../development/libraries/gmock {};
|
||||
gmock = gtest;
|
||||
gbenchmark = callPackage ../development/libraries/gbenchmark {};
|
||||
|
||||
gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
|
||||
@ -2673,6 +2675,8 @@ in
|
||||
|
||||
logstalgia = callPackage ../tools/graphics/logstalgia {};
|
||||
|
||||
loki = callPackage ../development/libraries/loki { };
|
||||
|
||||
longview = callPackage ../servers/monitoring/longview { };
|
||||
|
||||
lout = callPackage ../tools/typesetting/lout { };
|
||||
@ -3577,7 +3581,10 @@ in
|
||||
|
||||
remind = callPackage ../tools/misc/remind { };
|
||||
|
||||
remmina = callPackage ../applications/networking/remote/remmina { adwaita-icon-theme = gnome3.adwaita-icon-theme; };
|
||||
remmina = callPackage ../applications/networking/remote/remmina {
|
||||
adwaita-icon-theme = gnome3.adwaita-icon-theme;
|
||||
gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas;
|
||||
};
|
||||
|
||||
renameutils = callPackage ../tools/misc/renameutils { };
|
||||
|
||||
@ -7592,7 +7599,7 @@ in
|
||||
|
||||
hwloc = callPackage ../development/libraries/hwloc {};
|
||||
|
||||
hydra = callPackage ../development/tools/misc/hydra {};
|
||||
hydra = callPackage ../development/tools/misc/hydra { stdenv = overrideCC stdenv gcc6; };
|
||||
|
||||
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
|
||||
|
||||
@ -9200,6 +9207,10 @@ in
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla {
|
||||
withQt5 = true;
|
||||
};
|
||||
|
||||
qtkeychain = callPackage ../development/libraries/qtkeychain {
|
||||
withQt5 = true;
|
||||
};
|
||||
@ -10512,6 +10523,7 @@ in
|
||||
prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { };
|
||||
prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
|
||||
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
|
||||
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
|
||||
prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
|
||||
prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
|
||||
prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
|
||||
@ -10519,6 +10531,7 @@ in
|
||||
prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
|
||||
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
|
||||
prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
|
||||
prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
|
||||
|
||||
psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
|
||||
|
||||
@ -14922,6 +14935,8 @@ in
|
||||
|
||||
dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
|
||||
|
||||
insync = callPackage ../applications/networking/insync { };
|
||||
|
||||
lightdm = qt5.callPackage ../applications/display-managers/lightdm {
|
||||
qt4 = null;
|
||||
withQt5 = false;
|
||||
@ -15703,6 +15718,8 @@ in
|
||||
#TODO: 'pil' is not available for python3, yet
|
||||
xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
|
||||
|
||||
xrectsel = callPackage ../tools/X11/xrectsel { };
|
||||
|
||||
xrestop = callPackage ../tools/X11/xrestop { };
|
||||
|
||||
xsd = callPackage ../development/libraries/xsd { };
|
||||
@ -17946,6 +17963,8 @@ in
|
||||
|
||||
zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
|
||||
|
||||
tora = qt5.callPackage ../development/tools/tora {};
|
||||
|
||||
xulrunner = firefox-unwrapped;
|
||||
|
||||
nitrokey-app = callPackage ../tools/security/nitrokey-app { };
|
||||
|
||||
@ -8443,7 +8443,7 @@ let self = _self // overrides; _self = with self; {
|
||||
mod_perl2 = buildPerlPackage {
|
||||
name = "mod_perl-2.0.9";
|
||||
src = fetchurl {
|
||||
url = http://apache.mirror.iphh.net/perl/mod_perl-2.0.9.tar.gz;
|
||||
url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.9.tar.gz;
|
||||
sha256 = "0azmir4hbb825mfmcxwa1frhnhhf82rl8xf6mmgwkhbinxmg4q02";
|
||||
};
|
||||
makeMakerFlags = "MP_AP_DESTDIR=$out";
|
||||
@ -8451,6 +8451,7 @@ let self = _self // overrides; _self = with self; {
|
||||
doCheck = false; # would try to start Apache HTTP server
|
||||
meta = {
|
||||
description = "Embed a Perl interpreter in the Apache HTTP server";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
};
|
||||
};
|
||||
Mojolicious = buildPerlPackage rec {
|
||||
@ -9555,17 +9556,17 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
};
|
||||
|
||||
NetHTTP = buildPerlPackage {
|
||||
name = "Net-HTTP-6.09";
|
||||
NetHTTP = buildPerlPackage rec {
|
||||
name = "Net-HTTP-6.12";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz;
|
||||
sha256 = "52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d";
|
||||
url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz";
|
||||
sha256 = "8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6";
|
||||
};
|
||||
propagatedBuildInputs = [ URI ];
|
||||
meta = {
|
||||
homepage = https://github.com/libwww-perl/Net-HTTP;
|
||||
description = "Low-level HTTP connection (client)";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
{ runCommand, fetchFromGitHub, git }:
|
||||
|
||||
let
|
||||
version = "2016-12-28";
|
||||
rev = "3399254d4a021d07736944b339a8794eddcda517";
|
||||
sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9";
|
||||
version = "2017-01-08";
|
||||
rev = "5ca2f329d51b9466d9bda79172e0135edaf15f30";
|
||||
sha256 = "19h3zyx83va00ssagqsk9h0c83ir9wqhn192xvk5k44m9648jvsh";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user