swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse source 
Hydra nixpkgs: ?compare=1504357
This commit is contained in:
Vladimír Čunát 2019-02-09 10:15:17 +01:00
parent 6ae1cc2e62 baf6ba553f
commit 7f9e3b8206
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
197 changed files with 5804 additions and 1612 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
maintainers/maintainer-list.nix
View file

@ -241,6 +241,11 @@
email = "nix-commits@lists.science.uu.nl";
name = "Nix Committers";
};
allonsy = {
email = "linuxbash8@gmail.com";
github = "allonsy";
name = "Alec Snyder";
};
alunduil = {
email = "alunduil@gmail.com";
github = "alunduil";
@ -1305,6 +1310,11 @@
github = "edef1c";
name = "edef";
};
embr = {
email = "hi@liclac.eu";
github = "liclac";
name = "embr";
};
ederoyd46 = {
email = "matt@ederoyd.co.uk";
github = "ederoyd46";
@ -4176,6 +4186,11 @@
github = "shlevy";
name = "Shea Levy";
};
shou = {
email = "x+g@shou.io";
github = "Shou";
name = "Benedict Aas";
};
siddharthist = {
email = "langston.barrett@gmail.com";
github = "siddharthist";

1
nixos/doc/manual/default.nix
View file

@ -265,6 +265,7 @@ in rec {
xsltproc \
${manualXsltprocOptions} \
--stringparam target.database.document "${olinkDB}/olinkdb.xml" \
--stringparam id.warnings "1" \
--nonet --output $dst/ \
${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${manual-combined}/manual-combined.xml

24
nixos/doc/manual/release-notes/rl-1903.xml
View file

@ -378,6 +378,23 @@
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>)
</para>
</listitem>
<listitem>
<para>
<literal>matrix-synapse</literal> has been updated to version 0.99. It will
<link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no longer generate a self-signed certificate on first launch</link>
and will be <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the last version to accept self-signed certificates</link>.
As such, it is now recommended to use a proper certificate verified by a
root CA (for example Let's Encrypt).
</para>
</listitem>
<listitem>
<para>
<literal>mailutils</literal> now works by default when
<literal>sendmail</literal> is not in a setuid wrapper. As a consequence,
the <literal>sendmailPath</literal> argument, having lost its main use, has
been removed.
</para>
</listitem>
</itemizedlist>
</section>
@ -491,6 +508,13 @@
the Redmine 3.x series.
</para>
</listitem>
<listitem>
<para>
The <link linkend="opt-services.grafana.enable">Grafana module</link> now supports declarative
<link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource and dashboard</link>
provisioning.
</para>
</listitem>
</itemizedlist>
</section>
</section>

2
nixos/lib/testing.nix
View file

@ -3,7 +3,7 @@
# Use a minimal kernel?
, minimal ? false
# Ignored
, config ? null
, config ? {}
# Modules to add to each VM
, extraConfigurations ? [] }:

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

@ -101,6 +101,7 @@
./programs/gnupg.nix
./programs/gphoto2.nix
./programs/iftop.nix
./programs/iotop.nix
./programs/java.nix
./programs/kbdlight.nix
./programs/less.nix

17
nixos/modules/programs/iotop.nix Normal file
View file

@ -0,0 +1,17 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.programs.iotop;
in {
options = {
programs.iotop.enable = mkEnableOption "iotop + setcap wrapper";
};
config = mkIf cfg.enable {
security.wrappers.iotop = {
source = "${pkgs.iotop}/bin/iotop";
capabilities = "cap_net_admin+p";
};
};
}

20
nixos/modules/services/mail/roundcube.nix
View file

@ -25,6 +25,20 @@ in
description = "Hostname to use for the nginx vhost";
};
package = mkOption {
type = types.package;
default = pkgs.roundcube;
example = literalExample ''
roundcube.withPlugins (plugins: [ plugins.persistent_login ])
'';
description = ''
The package which contains roundcube's sources. Can be overriden to create
an environment which contains roundcube and third-party plugins.
'';
};
database = {
username = mkOption {
type = types.str;
@ -86,7 +100,7 @@ in
forceSSL = mkDefault true;
enableACME = mkDefault true;
locations."/" = {
root = pkgs.roundcube;
root = cfg.package;
index = "index.php";
extraConfig = ''
location ~* \.php$ {
@ -140,12 +154,12 @@ in
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
fi
PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
-f ${pkgs.roundcube}/SQL/postgres.initial.sql \
-f ${cfg.package}/SQL/postgres.initial.sql \
-h ${cfg.database.host} ${cfg.database.dbname}
touch /var/lib/roundcube/db-created
fi
${pkgs.php}/bin/php ${pkgs.roundcube}/bin/update.sh
${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
'';
serviceConfig.Type = "oneshot";
};

2
nixos/modules/services/misc/docker-registry.nix
View file

@ -18,7 +18,7 @@ let
delete.enabled = cfg.enableDelete;
};
http = {
addr = ":${builtins.toString cfg.port}";
addr = "${cfg.listenAddress}:${builtins.toString cfg.port}";
headers.X-Content-Type-Options = ["nosniff"];
};
health.storagedriver = {

11
nixos/modules/services/misc/matrix-synapse.nix
View file

@ -651,12 +651,16 @@ in {
services.postgresql.enable = mkIf usePostgresql (mkDefault true);
systemd.services.matrix-synapse = {
systemd.services.matrix-synapse =
let
python = (pkgs.python3.withPackages (ps: with ps; [ (ps.toPythonModule cfg.package) ]));
in
{
description = "Synapse Matrix homeserver";
after = [ "network.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
${cfg.package}/bin/homeserver \
${python.interpreter} -m synapse.app.homeserver \
--config-path ${configFile} \
--keys-directory ${cfg.dataDir} \
--generate-keys
@ -687,10 +691,11 @@ in {
WorkingDirectory = cfg.dataDir;
PermissionsStartOnly = true;
ExecStart = ''
${cfg.package}/bin/homeserver \
${python.interpreter} -m synapse.app.homeserver \
${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
--keys-directory ${cfg.dataDir}
'';
ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID";
Restart = "on-failure";
};
};

4
nixos/modules/services/misc/weechat.xml
View file

@ -8,7 +8,7 @@
<link xlink:href="https://weechat.org/">WeeChat</link> is a fast and
extensible IRC client.
</para>
<section>
<section xml:id="module-services-weechat-basic-usage">
<title>Basic Usage</title>
<para>
@ -35,7 +35,7 @@
in the state directory <literal>/var/lib/weechat</literal>.
</para>
</section>
<section>
<section xml:id="module-services-weechat-reattach">
<title>Re-attaching to WeeChat</title>
<para>

184
nixos/modules/services/monitoring/grafana.nix
View file

@ -50,6 +50,158 @@ let
SMTP_FROM_ADDRESS = cfg.smtp.fromAddress;
} // cfg.extraOptions;
datasourceConfiguration = {
apiVersion = 1;
datasources = cfg.provision.datasources;
};
datasourceFile = pkgs.writeText "datasource.yaml" (builtins.toJSON datasourceConfiguration);
dashboardConfiguration = {
apiVersion = 1;
providers = cfg.provision.dashboards;
};
dashboardFile = pkgs.writeText "dashboard.yaml" (builtins.toJSON dashboardConfiguration);
provisionConfDir = pkgs.runCommand "grafana-provisioning" { } ''
mkdir -p $out/{datasources,dashboards}
ln -sf ${datasourceFile} $out/datasources/datasource.yaml
ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml
'';
# Get a submodule without any embedded metadata:
_filter = x: filterAttrs (k: v: k != "_module") x;
# http://docs.grafana.org/administration/provisioning/#datasources
grafanaTypes.datasourceConfig = types.submodule {
options = {
name = mkOption {
type = types.str;
description = "Name of the datasource. Required";
};
type = mkOption {
type = types.enum ["graphite" "prometheus" "cloudwatch" "elasticsearch" "influxdb" "opentsdb" "mysql" "mssql" "postgres" "loki"];
description = "Datasource type. Required";
};
access = mkOption {
type = types.enum ["proxy" "direct"];
default = "proxy";
description = "Access mode. proxy or direct (Server or Browser in the UI). Required";
};
orgId = mkOption {
type = types.int;
default = 1;
description = "Org id. will default to orgId 1 if not specified";
};
url = mkOption {
type = types.str;
description = "Url of the datasource";
};
password = mkOption {
type = types.nullOr types.str;
default = null;
description = "Database password, if used";
};
user = mkOption {
type = types.nullOr types.str;
default = null;
description = "Database user, if used";
};
database = mkOption {
type = types.nullOr types.str;
default = null;
description = "Database name, if used";
};
basicAuth = mkOption {
type = types.nullOr types.bool;
default = null;
description = "Enable/disable basic auth";
};
basicAuthUser = mkOption {
type = types.nullOr types.str;
default = null;
description = "Basic auth username";
};
basicAuthPassword = mkOption {
type = types.nullOr types.str;
default = null;
description = "Basic auth password";
};
withCredentials = mkOption {
type = types.bool;
default = false;
description = "Enable/disable with credentials headers";
};
isDefault = mkOption {
type = types.bool;
default = false;
description = "Mark as default datasource. Max one per org";
};
jsonData = mkOption {
type = types.nullOr types.attrs;
default = null;
description = "Datasource specific configuration";
};
secureJsonData = mkOption {
type = types.nullOr types.attrs;
default = null;
description = "Datasource specific secure configuration";
};
version = mkOption {
type = types.int;
default = 1;
description = "Version";
};
editable = mkOption {
type = types.bool;
default = false;
description = "Allow users to edit datasources from the UI.";
};
};
};
# http://docs.grafana.org/administration/provisioning/#dashboards
grafanaTypes.dashboardConfig = types.submodule {
options = {
name = mkOption {
type = types.str;
default = "default";
description = "Provider name";
};
orgId = mkOption {
type = types.int;
default = 1;
description = "Organization ID";
};
folder = mkOption {
type = types.str;
default = "";
description = "Add dashboards to the speciied folder";
};
type = mkOption {
type = types.str;
default = "file";
description = "Dashboard provider type";
};
disableDeletion = mkOption {
type = types.bool;
default = false;
description = "Disable deletion when JSON file is removed";
};
updateIntervalSeconds = mkOption {
type = types.int;
default = 10;
description = "How often Grafana will scan for changed dashboards";
};
options = {
path = mkOption {
type = types.path;
description = "Path grafana will watch for dashboards";
};
};
};
};
in {
options.services.grafana = {
enable = mkEnableOption "grafana";
@ -175,6 +327,22 @@ in {
};
};
provision = {
enable = mkEnableOption "provision";
datasources = mkOption {
description = "Grafana datasources configuration";
default = [];
type = types.listOf grafanaTypes.datasourceConfig;
apply = x: map _filter x;
};
dashboards = mkOption {
description = "Grafana dashboard configuration";
default = [];
type = types.listOf grafanaTypes.dashboardConfig;
apply = x: map _filter x;
};
};
security = {
adminUser = mkOption {
description = "Default admin username.";
@ -313,10 +481,15 @@ in {
};
config = mkIf cfg.enable {
warnings = optional (
cfg.database.password != opt.database.password.default ||
cfg.security.adminPassword != opt.security.adminPassword.default
) "Grafana passwords will be stored as plaintext in the Nix store!";
warnings = flatten [
(optional (
cfg.database.password != opt.database.password.default ||
cfg.security.adminPassword != opt.security.adminPassword.default
) "Grafana passwords will be stored as plaintext in the Nix store!")
(optional (
any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) cfg.provision.datasources
) "Datasource passwords will be stored as plaintext in the Nix store!")
];
environment.systemPackages = [ cfg.package ];
@ -359,6 +532,9 @@ in {
${optionalString (cfg.smtp.passwordFile != null) ''
export GF_SMTP_PASSWORD="$(cat ${escapeShellArg cfg.smtp.passwordFile})"
''}
${optionalString cfg.provision.enable ''
export GF_PATHS_PROVISIONING=${provisionConfDir};
''}
exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}
'';
serviceConfig = {

2
nixos/modules/services/networking/syncthing.nix
View file

@ -122,7 +122,7 @@ in {
systemd.packages = [ pkgs.syncthing ];
users = mkIf (cfg.user == defaultUser) {
users = mkIf (cfg.systemService && cfg.user == defaultUser) {
users."${defaultUser}" =
{ group = cfg.group;
home = cfg.dataDir;

3
nixos/modules/services/networking/unifi.nix
View file

@ -121,11 +121,12 @@ in
};
networking.firewall = mkIf cfg.openPorts {
# https://help.ubnt.com/hc/en-us/articles/204910084-UniFi-Change-Default-Ports-for-Controller-and-UAPs
# https://help.ubnt.com/hc/en-us/articles/218506997
allowedTCPPorts = [
8080 # Port for UAP to inform controller.
8880 # Port for HTTP portal redirect, if guest portal is enabled.
8843 # Port for HTTPS portal redirect, ditto.
6789 # Port for UniFi mobile speed test.
];
allowedUDPPorts = [
3478 # UDP port used for STUN.

2
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View file

@ -33,7 +33,7 @@ let
avoid_warnings=1
'' + optional isAarch64 ''
# Boot in 64-bit mode.
arm_control=0x200
arm_64bit=1
'' + (if cfg.uboot.enable then ''
kernel=u-boot-rpi.bin
'' else ''

1
nixos/tests/all-tests.nix
View file

@ -164,6 +164,7 @@ in
opensmtpd = handleTest ./opensmtpd.nix {};
openssh = handleTest ./openssh.nix {};
osquery = handleTest ./osquery.nix {};
osrm-backend = handleTest ./osrm-backend.nix {};
ostree = handleTest ./ostree.nix {};
pam-oath-login = handleTest ./pam-oath-login.nix {};
pam-u2f = handleTest ./pam-u2f.nix {};

138
nixos/tests/hydra/default.nix
View file

@ -1,77 +1,91 @@
import ../make-test.nix ({ pkgs, ...} :
{ system ? builtins.currentSystem
, config ? { }
, pkgs ? import ../../.. { inherit system config; }
}:
let
trivialJob = pkgs.writeTextDir "trivial.nix" ''
{ trivial = builtins.derivation {
name = "trivial";
system = "x86_64-linux";
builder = "/bin/sh";
args = ["-c" "echo success > $out; exit 0"];
};
}
'';
createTrivialProject = pkgs.stdenv.mkDerivation {
name = "create-trivial-project";
unpackPhase = ":";
buildInputs = [ pkgs.makeWrapper ];
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
postFixup = ''
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
'';
};
trivialJob = pkgs.writeTextDir "trivial.nix" ''
{ trivial = builtins.derivation {
name = "trivial";
system = "x86_64-linux";
builder = "/bin/sh";
args = ["-c" "echo success > $out; exit 0"];
};
}
'';
in {
name = "hydra-init-localdb";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ pstn lewo ma27 ];
createTrivialProject = pkgs.stdenv.mkDerivation {
name = "create-trivial-project";
unpackPhase = ":";
buildInputs = [ pkgs.makeWrapper ];
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
postFixup = ''
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
'';
};
machine =
{ pkgs, ... }:
callTest = f: f { inherit system pkgs; };
{
virtualisation.memorySize = 1024;
time.timeZone = "UTC";
hydraPkgs = {
inherit (pkgs) nixStable nixUnstable;
};
environment.systemPackages = [ createTrivialProject pkgs.jq ];
services.hydra = {
enable = true;
tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix:
callTest (import ../make-test.nix ({ pkgs, lib, ... }:
{
name = "hydra-with-${name}";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ pstn lewo ma27 ];
};
#Hydra needs those settings to start up, so we add something not harmfull.
hydraURL = "example.com";
notificationSender = "example@example.com";
};
nix = {
buildMachines = [{
hostName = "localhost";
systems = [ "x86_64-linux" ];
}];
machine = { pkgs, ... }:
{
virtualisation.memorySize = 1024;
time.timeZone = "UTC";
binaryCaches = [];
};
};
environment.systemPackages = [ createTrivialProject pkgs.jq ];
services.hydra = {
enable = true;
testScript =
''
# let the system boot up
$machine->waitForUnit("multi-user.target");
# test whether the database is running
$machine->succeed("systemctl status postgresql.service");
# test whether the actual hydra daemons are running
$machine->succeed("systemctl status hydra-queue-runner.service");
$machine->succeed("systemctl status hydra-init.service");
$machine->succeed("systemctl status hydra-evaluator.service");
$machine->succeed("systemctl status hydra-send-stats.service");
#Hydra needs those settings to start up, so we add something not harmfull.
hydraURL = "example.com";
notificationSender = "example@example.com";
$machine->succeed("hydra-create-user admin --role admin --password admin");
package = pkgs.hydra.override { inherit nix; };
};
nix = {
buildMachines = [{
hostName = "localhost";
systems = [ "x86_64-linux" ];
}];
# create a project with a trivial job
$machine->waitForOpenPort(3000);
binaryCaches = [];
};
};
# make sure the build as been successfully built
$machine->succeed("create-trivial-project.sh");
testScript = ''
# let the system boot up
$machine->waitForUnit("multi-user.target");
# test whether the database is running
$machine->succeed("systemctl status postgresql.service");
# test whether the actual hydra daemons are running
$machine->succeed("systemctl status hydra-queue-runner.service");
$machine->succeed("systemctl status hydra-init.service");
$machine->succeed("systemctl status hydra-evaluator.service");
$machine->succeed("systemctl status hydra-send-stats.service");
$machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq');
'';
})
$machine->succeed("hydra-create-user admin --role admin --password admin");
# create a project with a trivial job
$machine->waitForOpenPort(3000);
# make sure the build as been successfully built
$machine->succeed("create-trivial-project.sh");
$machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq');
'';
})));
in
tests

50
nixos/tests/matrix-synapse.nix
View file

@ -1,4 +1,32 @@
import ./make-test.nix ({ pkgs, ... } : {
import ./make-test.nix ({ pkgs, ... } : let
runWithOpenSSL = file: cmd: pkgs.runCommand file {
buildInputs = [ pkgs.openssl ];
} cmd;
ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048";
ca_pem = runWithOpenSSL "ca.pem" ''
openssl req \
-x509 -new -nodes -key ${ca_key} \
-days 10000 -out $out -subj "/CN=snakeoil-ca"
'';
key = runWithOpenSSL "matrix_key.pem" "openssl genrsa -out $out 2048";
csr = runWithOpenSSL "matrix.csr" ''
openssl req \
-new -key ${key} \
-out $out -subj "/CN=localhost" \
'';
cert = runWithOpenSSL "matrix_cert.pem" ''
openssl x509 \
-req -in ${csr} \
-CA ${ca_pem} -CAkey ${ca_key} \
-CAcreateserial -out $out \
-days 365
'';
in {
name = "matrix-synapse";
meta = with pkgs.stdenv.lib.maintainers; {
@ -8,23 +36,31 @@ import ./make-test.nix ({ pkgs, ... } : {
nodes = {
# Since 0.33.0, matrix-synapse doesn't allow underscores in server names
serverpostgres = args: {
services.matrix-synapse.enable = true;
services.matrix-synapse.database_type = "psycopg2";
services.matrix-synapse = {
enable = true;
database_type = "psycopg2";
tls_certificate_path = "${cert}";
tls_private_key_path = "${key}";
};
};
serversqlite = args: {
services.matrix-synapse.enable = true;
services.matrix-synapse.database_type = "sqlite3";
services.matrix-synapse = {
enable = true;
database_type = "sqlite3";
tls_certificate_path = "${cert}";
tls_private_key_path = "${key}";
};
};
};
testScript = ''
startAll;
$serverpostgres->waitForUnit("matrix-synapse.service");
$serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
$serverpostgres->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/");
$serverpostgres->requireActiveUnit("postgresql.service");
$serversqlite->waitForUnit("matrix-synapse.service");
$serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
$serversqlite->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/");
$serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
'';

53
nixos/tests/osrm-backend.nix Normal file
View file

@ -0,0 +1,53 @@
import ./make-test.nix ({ pkgs, lib, ... }:
let
port = 5000;
in {
name = "osrm-backend";
meta.maintainers = [ lib.maintainers.erictapen ];
machine = { config, pkgs, ... }:{
services.osrm = {
enable = true;
inherit port;
dataFile = let
filename = "monaco";
osrm-data = pkgs.stdenv.mkDerivation {
name = "osrm-data";
buildInputs = [ pkgs.osrm-backend ];
# This is a pbf file of monaco, downloaded at 2019-01-04 from
# http://download.geofabrik.de/europe/monaco-latest.osm.pbf
# as apparently no provider of OSM files guarantees immutability,
# this is hosted as a gist on GitHub.
src = pkgs.fetchgit {
url = "https://gist.github.com/erictapen/01e39f73a6c856eac53ba809a94cdb83";
rev = "9b1ff0f24deb40e5cf7df51f843dbe860637b8ce";
sha256 = "1scqhmrfnpwsy5i2a9jpggqnvfgj4hv9p4qyvc79321pzkbv59nx";
};
buildCommand = ''
cp $src/${filename}.osm.pbf .
${pkgs.osrm-backend}/bin/osrm-extract -p ${pkgs.osrm-backend}/share/osrm/profiles/car.lua ${filename}.osm.pbf
${pkgs.osrm-backend}/bin/osrm-partition ${filename}.osrm
${pkgs.osrm-backend}/bin/osrm-customize ${filename}.osrm
mkdir -p $out
cp ${filename}* $out/
'';
};
in "${osrm-data}/${filename}.osrm";
};
environment.systemPackages = [ pkgs.jq ];
};
testScript = let
query = "http://localhost:${toString port}/route/v1/driving/7.41720,43.73304;7.42463,43.73886?steps=true";
in ''
$machine->waitForUnit("osrm.service");
$machine->waitForOpenPort(${toString port});
$machine->succeed("curl --silent '${query}' | jq .waypoints[0].name | grep -F 'Boulevard Rainier III'");
$machine->succeed("curl --silent '${query}' | jq .waypoints[1].name | grep -F 'Avenue de la Costa'");
'';
})

4
nixos/tests/roundcube.nix
View file

@ -10,6 +10,8 @@ import ./make-test.nix ({ pkgs, ...} : {
enable = true;
hostName = "roundcube";
database.password = "notproduction";
package = pkgs.roundcube.withPlugins (plugins: [ plugins.persistent_login ]);
plugins = [ "persistent_login" ];
};
services.nginx.virtualHosts.roundcube = {
forceSSL = false;
@ -23,6 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : {
$roundcube->waitForUnit("postgresql.service");
$roundcube->waitForUnit("phpfpm-roundcube.service");
$roundcube->waitForUnit("nginx.service");
$roundcube->succeed("curl -sSfL http://roundcube/");
$roundcube->succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'");
'';
})

4
pkgs/applications/audio/cmus/default.nix
View file

@ -100,13 +100,13 @@ in
stdenv.mkDerivation rec {
name = "cmus-${version}";
version = "2.7.1";
version = "2.8.0";
src = fetchFromGitHub {
owner = "cmus";
repo = "cmus";
rev = "v${version}";
sha256 = "0xd96py21bl869qlv1353zw7xsgq6v5s8szr0ldr63zj5fgc2ps5";
sha256 = "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar";
};
patches = [ ./option-debugging.patch ];

4
pkgs/applications/audio/lsp-plugins/default.nix
View file

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.1.4";
version = "1.1.5";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "sadko4u";
repo = "${pname}";
rev = "${name}";
sha256 = "0vb8ax0w4d2a153wxrhkpi21fxsv7c24k57vhfgmm1lqwv6pbl69";
sha256 = "0xcxm47j7mz5vprjqqhi95gz62syp4y737h7cssxd3flqkgar7xr";
};
nativeBuildInputs = [ pkgconfig php expat ];

4
pkgs/applications/audio/mopidy/iris.nix
View file

@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.31.8";
version = "3.32.4";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "16rrvby6rdiz53minfqsbgmymnc4agi2iwp0pf5ahsaxp1xq0cqy";
sha256 = "16b3dkxland4mjzjs2rz5gbqjapzzmap4d1mfhbrj2ch3plmdy7g";
};
propagatedBuildInputs = [

6
pkgs/applications/audio/pulseaudio-modules-bt/default.nix
View file

@ -23,13 +23,13 @@ let
in stdenv.mkDerivation rec {
name = "pulseaudio-modules-bt-${version}";
version = "unstable-2018-11-01";
version = "unstable-2019-01-05";
src = fetchFromGitHub {
owner = "EHfive";
repo = "pulseaudio-modules-bt";
rev = "a2f62fcaa702bb883c07d074ebca8d7135520ab8";
sha256 = "1fhg7q9064zikhy0xxldn4fvh49pc47mgikcbd9yhsk66gcn6zj3";
rev = "4b0cde160c96f40d860fef267a6ded49ae045be0";
sha256 = "15jw5nf2dhqqdwzyh2x5kdkrq7f3qn140gw6gmspcai9kplhk24w";
fetchSubmodules = true;
};

4
pkgs/applications/audio/x42-plugins/default.nix
View file

@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20181103";
version = "20190105";
name = "x42-plugins-${version}";
src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
sha256 = "085d6qjj7nl22f0xamqdrnfxwi8zrfwgkwm1svm73bjkdv270438";
sha256 = "1bb7k3ly4qa05zgkbpm7d3x9cjch1fklgh279m6hp0ac3hhncdxp";
};
nativeBuildInputs = [ pkgconfig ];

6
pkgs/applications/editors/android-studio/default.nix
View file

@ -8,9 +8,9 @@ let
inherit (gnome2) GConf gnome_vfs;
};
stableVersion = {
version = "3.3.0.20"; # "Android Studio 3.3"
build = "182.5199772";
sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw";
version = "3.3.1.0"; # "Android Studio 3.3.1"
build = "182.5264788";
sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42";
};
betaVersion = {
version = "3.4.0.12"; # "Android Studio 3.4 Beta 3"

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

@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
patches = [
./clean-env.patch
./tramp-detect-wrapped-gvfsd.patch
];
postPatch = lib.optionalString srcRepo ''

14
pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index f370abba31..f2806263a9 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -164,7 +164,8 @@ tramp-gvfs-enabled
(and (featurep 'dbusbind)
(tramp-compat-funcall 'dbus-get-unique-name :system)
(tramp-compat-funcall 'dbus-get-unique-name :session)
- (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
+ (tramp-compat-process-running-p "gvfs-fuse-daemon")
(tramp-compat-process-running-p "gvfsd-fuse"))))
"Non-nil when GVFS is available.")

66
pkgs/applications/editors/jetbrains/default.nix
View file

@ -250,145 +250,145 @@ in
clion = buildClion rec {
name = "clion-${version}";
version = "2018.3.3"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "1pffxq69ihdc55lsy2q56vlanpgyks0g82n40b29j4m66flmxbkl"; /* updated by script */
sha256 = "1zglpw9vc3ybdmwymi0c2m6anhcmx9jcqi69gnn06n9f4x1v6gwn"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
};
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2018.2.5"; /* updated by script */
version = "2018.3.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "0ls3qas8z0d1ynn6hh42qipa5br2g2497wf3pgcw3q0m3kp6wida"; /* updated by script */
sha256 = "0vj1cgmg33626i38x9wmh5hqr1lf0x3m23gzq30rp4q4cbi38806"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip 2018.2";
update-channel = "DataGrip RELEASE";
};
goland = buildGoland rec {
name = "goland-${version}";
version = "2018.3.2"; /* updated by script */
version = "2018.3.3"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "0vnw6zc23dibpk1z7yg1lrgjznqc7508g1azybml878h6yykm5a4"; /* updated by script */
sha256 = "065z8084xkv6w8m7pq98rgls1avzrqm23mrxdq5172rs5p1c5r9f"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand Release";
update-channel = "GoLand RELEASE";
};
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2018.3.3"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "1c9x3m7dknqr6yxqnn2ch3akwm6yskpmy32hcbjg7s87g1n6gy8m"; /* updated by script */
sha256 = "0j5yc7n04jlyyghmwllpfvcd2g6k1syjp07xb1ljyx7rm4jcf8q6"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA Release";
update-channel = "IntelliJ IDEA RELEASE";
};
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2018.3.3"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
sha256 = "1dj39hs63xba2jfk3sd2yiq7vk7758axrc5549krfd1aaawl4sl8"; /* updated by script */
sha256 = "0s3r3h1zcwkfqhsfb224fgy62fdhnd4gjgk2h6pyhq1frnh3x5bg"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA Release";
update-channel = "IntelliJ IDEA RELEASE";
};
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2018.2.6"; /* updated by script */
version = "2018.3.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0z627q9mcxlz8a92dndnaz2qa9dkaapimsfqkvc0i8ab88yw75v1"; /* updated by script */
sha256 = "0znhw83h46a3haspwcin5xjf3ask8ijxla778p9vdbi9xs0zqx39"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm 2018.2";
update-channel = "PhpStorm RELEASE";
};
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2018.3.3"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0dnjkq1qbxc05cxafi5hw6pw9wya0w44ni32b34sclq26xr6blvj"; /* updated by script */
sha256 = "11kzzwkp206l466ii6vm6iqmhpx0s594vh37x2lwwsgmg6qzz6vq"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm Release";
update-channel = "PyCharm RELEASE";
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2018.3.3"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0z6qjc3qh58ds338rlfzi9446y3sghpnccaachkja2q59f97dfma"; /* updated by script */
sha256 = "1m8lzghs6g57fwcv6bpmnf21d4w2k10gsmi0i2wv2j8ff4hcy7ij"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm Release";
update-channel = "PyCharm RELEASE";
};
rider = buildRider rec {
name = "rider-${version}";
version = "2018.3.1"; /* updated by script */
version = "2018.3.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "0ghk819ik28y9b61vb2h463zbvvq1n2wl778czkakc4qjba2qnks"; /* updated by script */
sha256 = "1ffzbp2xca2z8g0wlkvmqr0j2f2dnqafpnvzk9zd5asfhhbyrhg5"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider 2018.3";
update-channel = "Rider RELEASE";
};
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2018.2.6"; /* updated by script */
version = "2018.3.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0xbmj7d1ccq2qf1jsvch1zxdrypkvzxdfkr431c8fnabh993yxx1"; /* updated by script */
sha256 = "1zjcdsr91y07dhqmhqy2yq6c0rhsxg2m52fz14hhmphddlwvhzny"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine 2018.2";
update-channel = "RubyMine RELEASE";
};
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2018.3.3"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0q8njbrll7qgijnxqic2mpca2jb2plpd677xdj5v72mm66mvxmss"; /* updated by script */
sha256 = "11l39yy8qdrr89y9x3i9acp0am4xb86z6v7wg1kc9fd5p13jr2xs"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm Release";
update-channel = "WebStorm RELEASE";
};
}

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, ApplicationServices
}:
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ zlib fontconfig freetype ghostscript
libpng libtiff libxml2 libheif
libpng libtiff libxml2 libheif djvulibre
]
++ lib.optionals (!stdenv.hostPlatform.isMinGW)
[ openexr librsvg openjpeg ]

4
pkgs/applications/graphics/ImageMagick/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
, ApplicationServices
}:
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ zlib fontconfig freetype ghostscript
libpng libtiff libxml2 libheif libde265
libpng libtiff libxml2 libheif libde265 djvulibre
]
++ lib.optionals (!stdenv.hostPlatform.isMinGW)
[ openexr librsvg openjpeg ]

6
pkgs/applications/misc/albert/default.nix
View file

@ -4,13 +4,13 @@
mkDerivation rec {
pname = "albert";
version = "0.15.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
sha256 = "063z9yq6bsxcsqsw1n93ks5dzhzv6i252mjz1d5mxhxvgmqlfk0v";
sha256 = "04sr35fqz66i24lv7r2p9qfqxs55i8xpj7aam0v9yakcr33lf55a";
fetchSubmodules = true;
};
@ -25,7 +25,7 @@ mkDerivation rec {
postPatch = ''
sed -i "/QStringList dirs = {/a \"$out/libs\"," \
lib/albertcore/src/core/albert.cpp
src/app/main.cpp
'';
preBuild = ''

1
pkgs/applications/misc/apvlv/default.nix
View file

@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch";
sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi";
})
./fix-build-with-poppler-0.73.0.patch
];
installPhase = ''

13
pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/ApvlvPdf.cc b/src/ApvlvPdf.cc
index 765b112..83d133f 100644
--- a/src/ApvlvPdf.cc
+++ b/src/ApvlvPdf.cc
@@ -29,7 +29,7 @@
#include "ApvlvPdf.h"
#ifndef POPPLER_WITH_GDK
-#include <goo/gtypes.h>
+#include <goo/gfile.h>
static void
copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,

28
pkgs/applications/misc/cardpeek/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook,
glib, gtk3, pcsclite, lua5_2, curl, readline }:
let
version = "0.8.4";
in
stdenv.mkDerivation {
name = "cardpeek-${version}";
src = fetchFromGitHub {
owner = "L1L1";
repo = "cardpeek";
rev = "cardpeek-${version}";
sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://github.com/L1L1/cardpeek;
description = "A tool to read the contents of ISO7816 smart cards";
license = licenses.gpl3Plus;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ embr ];
};
}

4
pkgs/applications/misc/copyq/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "CopyQ-${version}";
version = "3.7.2";
version = "3.7.3";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
sha256 = "1f2q9lzs5z31rl689ai2hig4nrj8cg9g25hhsrj6r85q9vkwkqjs";
sha256 = "1nxxxq0lfs4r673i70dh2xwdn3chcjl913bkz14kyna29i6n1nwm";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/misc/dmenu/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
stdenv.mkDerivation rec {
name = "dmenu-4.8";
name = "dmenu-4.9";
src = fetchurl {
url = "https://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy";
sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk";
};
buildInputs = [ libX11 libXinerama zlib libXft ];

22
pkgs/applications/misc/fff/default.nix
View file

@ -1,24 +1,26 @@
{ stdenv, fetchFromGitHub, makeWrapper, xdg_utils, file, coreutils }:
{ stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }:
stdenv.mkDerivation rec {
pname = "fff";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "dylanaraps";
repo = pname;
rev = version;
sha256 = "0pqxqg1gnl3kgqma5vb0wcy4n9xbm0dp7g7dxl60cwcyqvd4vm3i";
sha256 = "0s5gi5ghwax5gc886pvbpcmsbmzhxzywajwzjsdxwjyd1v1iynwh";
};
pathAdd = stdenv.lib.makeSearchPath "bin" [ xdg_utils file coreutils ];
buildInputs = [ makeWrapper ];
pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]);
installPhase = ''
install -D fff "$out/bin/fff"
install -D README.md "$out/share/doc/fff/README.md"
install -D fff.1 "$out/share/man/man1/fff.1"
wrapProgram $out/bin/fff --prefix PATH : ${pathAdd}
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bashInteractive ];
dontBuild = true;
makeFlags = [ "PREFIX=$(out)" ];
postInstall = ''
wrapProgram "$out/bin/fff" --prefix PATH : $pathAdd
'';
meta = with stdenv.lib; {

4
pkgs/applications/misc/font-manager/default.nix
View file

@ -49,10 +49,6 @@ stdenv.mkDerivation rec {
patchShebangs meson_post_install.py
'';
postInstall = ''
rm $out/share/applications/mimeinfo.cache
'';
meta = {
homepage = https://fontmanager.github.io/;
description = "Simple font management for GTK+ desktop environments";

96
pkgs/applications/misc/k2pdfopt/default.nix
View file

@ -6,19 +6,29 @@
, enableJPEG2K ? true, jasper
, enableDJVU ? true, djvulibre
, enableGOCR ? false, gocr # Disabled by default due to crashes
, enableTesseract ? true, leptonica, tesseract
, enableTesseract ? true, leptonica, tesseract4
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "k2pdfopt-${version}";
version = "2.42";
version = "2.51a";
src = fetchzip {
url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip";
sha256 = "1zag4jmkr0qrcpqqb5davmvdrabhdyz87q4zz0xpfkl6xw2dn9bk";
};
src = (fetchzip {
url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip";
sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9";
});
# Note: the v2.51a zip contains only files to be replaced in the v2.50 zip.
v251a_src = (fetchzip {
url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip";
sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6";
});
postUnpack = ''
cp -r ${v251a_src}/* $sourceRoot
'';
patches = [ ./k2pdfopt.patch ];
@ -27,65 +37,43 @@ stdenv.mkDerivation rec {
buildInputs =
let
mupdf_modded = mupdf.overrideAttrs (attrs: {
name = "mupdf-1.10a";
version = "1.10a";
src = fetchurl {
url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
};
# Excluded the pdf-*.c files, since they mostly just broke the #includes
prePatch = ''
cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/
cp ${src}/mupdf_mod/font-win32.c source/pdf/
'';
# Patches from previous 1.10a version in nixpkgs
patches = [
# Compatibility with new openjpeg
./load-jpx.patch
(fetchurl {
name = "CVE-2017-5896.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27";
sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693";
})
(fetchpatch {
name = "mupdf-1.10a-shared_libs-1.patch";
url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch";
sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab";
})
];
# Override this since the jpeg directory was renamed libjpeg in mupdf 1.11
preConfigure = ''
# Don't remove mujs because upstream version is incompatible
rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
'';
postPatch = let
# OpenJPEG version is hardcoded in package source
openJpegVersion = with stdenv;
lib.concatStringsSep "." (lib.lists.take 2
(lib.splitString "." (lib.getVersion openjpeg)));
in ''
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
'';
});
leptonica_modded = leptonica.overrideAttrs (attrs: {
name = "leptonica-1.74.4";
# Modified source files apply to this particular version of leptonica
version = "1.74.4";
src = fetchurl {
url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz";
sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9";
};
prePatch = ''
cp ${src}/leptonica_mod/* src/
cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/
'';
patches = [];
});
tesseract_modded = tesseract.override {
tesseractBase = tesseract.tesseractBase.overrideAttrs (_: {
tesseract_modded = tesseract4.override {
tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
prePatch = ''
cp ${src}/tesseract_mod/{ambigs.cpp,ccutil.h,ccutil.cpp} ccutil/
cp ${src}/tesseract_mod/dawg.cpp api/
cp ${src}/tesseract_mod/{imagedata.cpp,tessdatamanager.cpp} ccstruct/
cp ${src}/tesseract_mod/openclwrapper.h opencl/
cp ${src}/tesseract_mod/{tessedit.cpp,thresholder.cpp} ccmain/
cp ${src}/tesseract_mod/tess_lang_mod_edge.h cube/
cp ${src}/tesseract_mod/tesscapi.cpp api/
cp ${src}/include_mod/{tesseract.h,leptonica.h} api/
cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/
cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/
cp ${src}/tesseract_mod/genericvector.h src/ccutil/
cp ${src}/tesseract_mod/input.cpp src/lstm/
cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/
cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/
cp ${src}/tesseract_mod/params.cpp src/ccutil/
cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/
cp ${src}/tesseract_mod/tesscapi.cpp src/api/
cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/
cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/
cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/
'';
patches = [ ./tesseract.patch ];
});

29
pkgs/applications/misc/k2pdfopt/load-jpx.patch
View file

@ -1,29 +0,0 @@
--- a/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c
@@ -484,12 +484,16 @@
/* Without the definition of OPJ_STATIC, compilation fails on windows
* due to the use of __stdcall. We believe it is required on some
* linux toolchains too. */
+#ifdef __cplusplus
+extern "C"
+{
#define OPJ_STATIC
#ifndef _MSC_VER
#define OPJ_HAVE_STDINT_H
#endif
+#endif
-#include <openjpeg.h>
+#include <openjpeg-__OPENJPEG__VERSION__/openjpeg.h>
/* OpenJPEG does not provide a safe mechanism to intercept
* allocations. In the latest version all allocations go
@@ -971,4 +975,8 @@
fz_drop_pixmap(ctx, img);
}
+#ifdef __cplusplus
+}
+#endif
+
#endif /* HAVE_LURATECH */

6
pkgs/applications/misc/k2pdfopt/tesseract.patch
View file

@ -1,7 +1,7 @@
diff --git a/api/Makefile.am b/api/Makefile.am
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index d8c1e54..46ead13 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
if VISIBILITY
libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS

6
pkgs/applications/misc/kitty/default.nix
View file

@ -45,6 +45,12 @@ buildPythonApplication rec {
cp -r linux-package/{bin,share,lib} $out
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}"
runHook postInstall
# ZSH completions need to be invoked with `source`:
# https://github.com/kovidgoyal/kitty/blob/8ceb941051b89b7c50850778634f0b6137aa5e6e/docs/index.rst#zsh
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
"$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish"
"$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash"
'';
postInstall = ''

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

@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
Name: mupdf
Description: Library for rendering PDF documents
Version: ${version}
Libs: -L$out/lib -lmupdf -lmupdfthird
Libs: -L$out/lib -lmupdf -lmupdf-third
Cflags: -I$dev/include
EOF

8
pkgs/applications/misc/pdfpc/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
version = "4.3.1_0";
version = "4.3.2";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
repo = product;
owner = product;
rev = "v${version}";
sha256 = "04bvgpdy3l030jd1f87a94lz4lky29skpak3k0bzazsajwpywprd";
sha256 = "15y6g92fp6x6dwwhrhkfny5z20w7pq9c8w19fh2vzff9aa6m2h9z";
};
nativeBuildInputs = [

29
pkgs/applications/misc/qolibri/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase
, qtmultimedia, qttools, qtwebengine }:
stdenv.mkDerivation rec {
name = "qolibri-${version}";
version = "2018-11-14";
src = fetchFromGitHub {
owner = "ludios";
repo = "qolibri";
rev = "133a1c33e74d931ad54407f70d84a0016d96981f";
sha256 = "16ifix0q8ww4l3xflgxr9j81c0lzlnkjr8fj961x3nxz7288pdg2";
};
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [
libeb lzo qtbase qtmultimedia qttools qtwebengine
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://github.com/ludios/qolibri;
description = "EPWING reader for viewing Japanese dictionaries";
platforms = platforms.linux;
maintainers = with maintainers; [ ivan ];
license = licenses.gpl2;
};
}

36
pkgs/applications/misc/xsuspender/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig
, glib, libwnck3, procps }:
with lib;
stdenv.mkDerivation rec {
name = "xsuspender-${version}";
version = "1.1";
src = fetchFromGitHub {
owner = "kernc";
repo = "xsuspender";
rev = version;
sha256 = "03lbga68dxg89d227sdwk1f5xj4r1pmj0qh2kasi2cqh8ll7qv4b";
};
outputs = [ "out" "man" "doc" ];
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [ glib libwnck3 ];
enableParallelBuilding = true;
postInstall = ''
wrapProgram $out/bin/xsuspender \
--prefix PATH : "${makeBinPath [ procps ]}"
'';
meta = {
description = "Auto-suspend inactive X11 applications.";
homepage = "https://kernc.github.io/xsuspender/";
license = licenses.wtfpl;
maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/browsers/brave/default.nix
View file

@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [
in stdenv.mkDerivation rec {
pname = "brave";
version = "0.58.21";
version = "0.59.34";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "0mml8zjpm8gjw3krppr57y4p10ky975v0s4wyyx7ixr1lzk2qp11";
sha256 = "1i14y01387q0h12w6h780v9d98qygmx0w0vbygy4w9x9aj5nnask";
};
dontConfigure = true;

794
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

File diff suppressed because it is too large Load diff

794
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

File diff suppressed because it is too large Load diff

10
pkgs/applications/networking/instant-messengers/dino/default.nix
View file

@ -11,16 +11,17 @@
, gpgme
, pcre
, qrencode
, icu
}:
stdenv.mkDerivation rec {
name = "dino-unstable-2018-11-29";
name = "dino-unstable-2019-02-06";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "680d28360c781ff29e810821801cfaba0493c526";
sha256 = "1w08xc842p2nggdxf0dwqw8izhwsrqah10w3s0v1i7dp33yhycln";
rev = "864196d2acef3db047160b9da5803805067276c3";
sha256 = "10nyq9marclzbkxisackp402gimgs7gb0llgjm922c593c5h39cq";
fetchSubmodules = true;
};
@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
wrapGAppsHook
gettext
];
buildInputs = [
@ -54,7 +56,7 @@ stdenv.mkDerivation rec {
epoxy
at-spi2-core
dbus
gettext
icu
];
enableParallelBuilding = true;

45
pkgs/applications/networking/instant-messengers/signal-cli/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ stdenv, lib, fetchurl, makeWrapper, jre_headless }:
stdenv.mkDerivation rec {
name = "signal-cli-${version}";
version = "0.6.2";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
sha256 = "050nizf7v10jlrwr8f4awzi2368qr01pzpvl2qkrwhdk25r505yr";
};
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
cp -r lib $out/lib
cp bin/signal-cli $out/bin/signal-cli
wrapProgram $out/bin/signal-cli \
--prefix PATH : ${lib.makeBinPath [ jre_headless ]} \
--set JAVA_HOME ${jre_headless}
'';
# Execution in the macOS (10.13) sandbox fails with
# dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
# Referenced from: /nix/store/5ghc2l65p8jcjh0bsmhahd5m9k5p8kx0-zulu1.8.0_121-8.20.0.5/bin/java
# Reason: no suitable image found. Did find:
# /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat()
# /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat()
# /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version
doInstallCheck = stdenv.isLinux;
installCheckPhase = ''
export PATH=$PATH:$out/bin
# --help returns non-0 exit code even when working
signal-cli --version
'';
meta = with lib; {
homepage = https://github.com/AsamK/signal-cli;
description = "Command-line and dbus interface for communicating with the Signal messaging service";
license = licenses.gpl3;
maintainers = with maintainers; [ ivan ];
platforms = platforms.all;
};
}

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -56,11 +56,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.20.0";
version = "1.21.1";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1w75g7i7hf9b3yilnd6ivhd4xgp4z000x9wnrqcba2dgbr5pz7c7";
sha256 = "1vs42kvaacsx8smaqpn1q9i0pb5wcca22a9s4467286b5n0lfc4r";
};
phases = [ "unpackPhase" "installPhase" ];

27
pkgs/applications/networking/irc/glowing-bear/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ fetchFromGitHub, stdenv }:
stdenv.mkDerivation rec {
name = "glowing-bear-${version}";
version = "0.7.1";
src = fetchFromGitHub {
rev = version;
owner = "glowing-bear";
repo = "glowing-bear";
sha256 = "0gwrf67l3i3nl7zy1miljz6f3vv6zzc3g9as06by548f21cizzjb";
};
installPhase = ''
mkdir $out
cp index.html min.js serviceworker.js webapp.manifest.json $out
cp -R 3rdparty assets css directives js $out
'';
meta = with stdenv.lib; {
description = "A web client for Weechat";
homepage = https://github.com/glowing-bear/glowing-bear;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ delroth ];
platforms = platforms.unix;
};
}

44
pkgs/applications/networking/soulseek/nicotine-plus/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ stdenv, fetchFromGitHub, python27Packages, geoip }:
with stdenv.lib;
python27Packages.buildPythonApplication rec {
pname = "nicotine-plus";
version = "1.4.1";
src = fetchFromGitHub {
owner = "Nicotine-Plus";
repo = "nicotine-plus";
rev = "4e057d64184885c63488d4213ade3233bd33e67b";
sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c";
};
propagatedBuildInputs = with python27Packages; [
pygtk
miniupnpc
mutagen
notify
(GeoIP.override { inherit geoip; })
];
# Insert real docs directory.
# os.getcwd() is not needed
postPatch = ''
substituteInPlace ./pynicotine/gtkgui/frame.py \
--replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')"
'';
postFixup = ''
mkdir -p $out/doc/
mv ./doc/NicotinePlusGuide $out/doc/
mv $out/bin/nicotine $out/bin/nicotine-plus
'';
meta = {
description = "A graphical client for the SoulSeek peer-to-peer system";
homepage = https://www.nicotine-plus.org;
license = licenses.gpl3;
maintainers = with maintainers; [ klntsky ];
platforms = platforms.unix;
};
}

14
pkgs/applications/networking/syncthing/default.nix
View file

@ -63,19 +63,19 @@ in {
done
'' + lib.optionalString (stdenv.isLinux) ''
mkdir -p $out/lib/systemd/{system,user}
mkdir -p $bin/lib/systemd/{system,user}
substitute etc/linux-systemd/system/syncthing-resume.service \
$out/lib/systemd/system/syncthing-resume.service \
$bin/lib/systemd/system/syncthing-resume.service \
--replace /usr/bin/pkill ${procps}/bin/pkill
substitute etc/linux-systemd/system/syncthing@.service \
$out/lib/systemd/system/syncthing@.service \
--replace /usr/bin/syncthing $out/bin/syncthing
$bin/lib/systemd/system/syncthing@.service \
--replace /usr/bin/syncthing $bin/bin/syncthing
substitute etc/linux-systemd/user/syncthing.service \
$out/lib/systemd/user/syncthing.service \
--replace /usr/bin/syncthing $out/bin/syncthing
$bin/lib/systemd/user/syncthing.service \
--replace /usr/bin/syncthing $bin/bin/syncthing
'';
};
@ -99,7 +99,7 @@ in {
substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
$out/lib/systemd/system/strelaysrv.service \
--replace /usr/bin/strelaysrv $out/bin/strelaysrv
--replace /usr/bin/strelaysrv $bin/bin/strelaysrv
'';
};
}

14
pkgs/applications/office/ledger/default.nix
View file

@ -3,14 +3,13 @@
stdenv.mkDerivation rec {
name = "ledger-${version}";
version = "3.1.1";
version = "3.1.2";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger";
rev = "v${version}";
sha256 = "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp";
fetchSubmodules = true;
rev = version;
sha256 = "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc";
};
buildInputs = [
@ -32,13 +31,6 @@ stdenv.mkDerivation rec {
make doc
'';
# Skip byte-compiling of emacs-lisp files because this is currently
# broken in ledger...
postInstall = ''
mkdir -p $out/share/emacs/site-lisp/
cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/
'';
meta = with stdenv.lib; {
homepage = https://ledger-cli.org/;
description = "A double-entry accounting system with a command-line reporting interface";

20
pkgs/applications/office/trilium/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, p7zip, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }:
{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }:
let
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.";
@ -13,15 +13,23 @@ let
in stdenv.mkDerivation rec {
name = "trilium-${version}";
version = "0.27.4";
version = "0.28.3";
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.7z";
sha256 = "1qb11axaifw5xjycrc6qsyd8h36rgjd7rjql8895v8agckf3g2c1";
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "0bg7fzb0drw6692hcskiwwd4d9s9547cqp3m1s4qj0y7ca3wrx8r";
};
# Fetch from source repo, no longer included in release.
# (they did special-case icon.png but we want the scalable svg)
# Use the version here to ensure we get any changes.
trilium_svg = fetchurl {
url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg";
sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg";
};
nativeBuildInputs = [
p7zip /* for unpacking */
autoPatchelfHook
makeWrapper
];
@ -36,7 +44,7 @@ in stdenv.mkDerivation rec {
cp -r ./* $out/share/trilium
ln -s $out/share/trilium/trilium $out/bin/trilium
ln -s $out/share/trilium/resources/app/src/public/images/trilium.svg $out/share/icons/hicolor/scalable/apps/trilium.svg
ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg
cp ${desktopItem}/share/applications/* $out/share/applications
'';

24
pkgs/applications/science/biology/cmtk/default.nix Normal file
View file

@ -0,0 +1,24 @@
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
name = "cmtk-3.3.1";
src = fetchurl {
name = "cmtk-source.tar.gz";
url = "https://www.nitrc.org/frs/download.php/8198/CMTK-3.3.1-Source.tar.gz//?i_agree=1&download_now=1";
sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs";
};
buildInputs = [cmake];
meta = with stdenv.lib; {
description = "Computational Morphometry Toolkit ";
longDescription = ''A software toolkit for computational morphometry of
biomedical images, CMTK comprises a set of command line tools and a
back-end general-purpose library for processing and I/O'';
maintainers = with maintainers; [ tbenst ];
platforms = platforms.all;
license = licenses.gpl3;
homepage = https://www.nitrc.org/projects/cmtk/;
};
}

1725
pkgs/applications/science/misc/rink/cargo-lock.patch Normal file
View file

File diff suppressed because it is too large Load diff

29
pkgs/applications/science/misc/rink/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, gmp, ncurses }:
rustPlatform.buildRustPackage rec {
version = "0.4.4";
name = "rink-${version}";
src = fetchFromGitHub {
owner = "tiffany352";
repo = "rink-rs";
rev = "v${version}";
sha256 = "0rvck5ahg7s51fdlr2ch698cwnyc6qp84zhfgs3wkszj9r5j470k";
};
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "0xmmxm7zwmq7w0pspx17glg4mjgh9l61w0h2k7n97x6p35i198d1";
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ openssl gmp ncurses ];
# Some tests fail and/or attempt to use internet servers.
doCheck = false;
meta = with stdenv.lib; {
description = "Unit-aware calculator";
homepage = http://rink.tiffnix.com;
license = with licenses; [ mpl20 gpl3 ];
maintainers = [ maintainers.sb0 ];
};
}

6
pkgs/applications/version-management/cvs-fast-export/default.nix
View file

@ -7,7 +7,7 @@ with stdenv; with lib;
mkDerivation rec {
name = "cvs-fast-export-${meta.version}";
meta = {
version = "1.32";
version = "1.45";
description = "Export an RCS or CVS history as a fast-import stream";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dfoxfranke ];
@ -16,8 +16,8 @@ mkDerivation rec {
};
src = fetchurl {
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.32.tar.gz";
sha256 = "5bfb9a5650517d337a96a598795b50bc40ce12172854a6581267e7be3dbcfb97";
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.45.tar.gz";
sha256 = "19pxg6p0pcgyd2fbnh3wy1kazv6vcfi5lzc2whhdi1w9kj4r9c4z";
};
buildInputs = [

4
pkgs/applications/video/obs-studio/linuxbrowser.nix
View file

@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
name = "obs-linuxbrowser-${version}";
version = "0.5.2";
version = "0.6.0";
src = fetchFromGitHub {
owner = "bazukas";
repo = "obs-linuxbrowser";
rev = version;
sha256 = "1vwgdgcmab5442wh2rjww6lzij9g2c5ccnv79rs7vx3rdl8wqg4f";
sha256 = "000ngkiwfjjl25v4hz6lh6mdkf119pnq0qv3jwdmmp6fpd0dxcgh";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];

8
pkgs/applications/virtualization/podman/default.nix
View file

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig
, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp
, go-md2man
}:
buildGoPackage rec {
@ -15,9 +16,11 @@ buildGoPackage rec {
goPackagePath = "github.com/containers/libpod";
outputs = [ "bin" "out" "man" ];
# Optimizations break compilation of libseccomp c bindings
hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig go-md2man ];
buildInputs = [
btrfs-progs libseccomp gpgme lvm2
@ -26,11 +29,12 @@ buildGoPackage rec {
buildPhase = ''
pushd $NIX_BUILD_TOP/go/src/${goPackagePath}
patchShebangs .
make binaries
make binaries docs
'';
installPhase = ''
install -Dm555 bin/podman $bin/bin/podman
MANDIR=$man/share/man make install.man
'';
meta = with stdenv.lib; {

3
pkgs/applications/virtualization/qemu/default.nix
View file

@ -14,6 +14,7 @@
, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
, usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen
, cephSupport ? false, ceph
, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer
, smbdSupport ? false, samba
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
++ optionals usbredirSupport [ usbredir ]
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ]
++ optionals cephSupport [ ceph ]
++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ]
++ optionals smbdSupport [ samba ];
@ -117,6 +119,7 @@ stdenv.mkDerivation rec {
++ optional stdenv.isLinux "--enable-linux-aio"
++ optional gtkSupport "--enable-gtk"
++ optional xenSupport "--enable-xen"
++ optional cephSupport "--enable-rbd"
++ optional openGLSupport "--enable-opengl"
++ optional virglSupport "--enable-virglrenderer"
++ optional smbdSupport "--smbd=${samba}/bin/smbd";

4
pkgs/applications/window-managers/dwm/default.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, libX11, libXinerama, libXft, patches ? []}:
let
name = "dwm-6.1";
name = "dwm-6.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "https://dl.suckless.org/dwm/${name}.tar.gz";
sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2";
sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p";
};
buildInputs = [ libX11 libXinerama libXft ];

4
pkgs/data/misc/osinfo-db/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec {
name = "osinfo-db-20181203";
name = "osinfo-db-20181214";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
sha256 = "1wimbj3hqp3ni91l7drj24i7z7xxfdpn6svf1szk9qd93cxc65q2";
sha256 = "18ym54wvhvjk66fqpsfvfd5b7d7743dvfqrcq91w1n71r20fkhcd";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

8
pkgs/data/themes/plano/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }:
stdenv.mkDerivation rec {
name = "plano-theme-${version}";
version = "3.30-2";
pname = "plano-theme";
version = "3.30-3";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = "plano-theme";
repo = pname;
rev = "v${version}";
sha256 = "06yagpb0dpb8nzh3lvs607rzg6y5l6skl4mjcmbxayapsqka45hj";
sha256 = "1rb9whr5r2pj6fmwa9g0vdrfki3dqldnx85mpyq07jvxkipcdq6g";
};
buildInputs = [ gdk_pixbuf gtk_engines ];

10
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View file

@ -23,15 +23,19 @@ stdenv.mkDerivation rec {
];
configureFlags = [
"--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=$$out/lib/pkcs11/"
"--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/"
];
postPatch = ''
patchShebangs build
'';
doCheck = !stdenv.isi686; # https://github.com/NixOS/nixpkgs/issues/51121
# Tends to fail non-deterministically.
# - https://github.com/NixOS/nixpkgs/issues/55293
# - https://github.com/NixOS/nixpkgs/issues/51121
doCheck = false;
# In 3.20.1, tests do not support Python 3
checkInputs = [ dbus python2 ];

4
pkgs/development/compilers/fasm/bin.nix
View file

@ -3,11 +3,11 @@
stdenvNoCC.mkDerivation rec {
name = "fasm-bin-${version}";
version = "1.73.06";
version = "1.73.08";
src = fetchurl {
url = "https://flatassembler.net/fasm-${version}.tgz";
sha256 = "02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6";
sha256 = "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997";
};
installPhase = ''

16
pkgs/development/compilers/rust/bootstrap.nix
View file

@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
version = "1.31.0";
version = "1.30.1";
# fetch hashes by running `print-hashes.sh 1.31.0`
# fetch hashes by running `print-hashes.sh 1.30.0`
hashes = {
i686-unknown-linux-gnu = "46333e8feec55bc1f99fd03028370f6163ef1e33e483da0389a9c424ec9634ed";
x86_64-unknown-linux-gnu = "c8a2016109ffdc12a488660edc5f30c1643729efc15abe311ebb187437e506bf";
armv7-unknown-linux-gnueabihf = "60bb75649b457ad971e94dd14c666b59deeee2176b14ae0f98e2fa435c172c1e";
aarch64-unknown-linux-gnu = "4e68c70aba58004d9e86c2b4463e88466affee51242349a038b456cf6f4be5c9";
i686-apple-darwin = "ec8d08eeea97d78d37430e9b32511e87854aad502f4e3e77e806788246b36e6f";
x86_64-apple-darwin = "5d4035e3cecb7df13e728bcff125b52b43b126e91f8311c66b143f353362606f";
i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf";
x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e";
armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b";
aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874";
i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083";
x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94";
};
platform =

8
pkgs/development/compilers/rust/cargo.nix
View file

@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec {
inherit version src patches;
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
preBuild = "pushd src/tools/cargo";
cargoVendorDir = "src/vendor";
preBuild = "cd src; pushd tools/cargo";
postBuild = "popd";
passthru.rustc = rustc;
@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
LIBGIT2_SYS_USE_PKG_CONFIG = 1;
LIBGIT2_SYS_USE_PKG_CONFIG=1;
# fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
RUSTC_BOOTSTRAP = 1;
RUSTC_BOOTSTRAP=1;
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# CFURLSetResourcePropertyForKey is defined in the headers but there's no

11
pkgs/development/compilers/rust/default.nix
View file

@ -7,11 +7,11 @@
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
version = "1.32.0";
cargoVersion = "1.32.0";
version = "1.31.0";
cargoVersion = "1.31.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac";
sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs";
};
in rec {
rustc = callPackage ./rustc.nix {
@ -22,6 +22,11 @@ in rec {
# Re-evaluate if this we need to disable this one
#./patches/stdsimd-disable-doctest.patch
# Fails on hydra - not locally; the exact reason is unknown.
# Comments in the test suggest that some non-reproducible environment
# variables such $RANDOM can make it fail.
./patches/disable-test-inherit-env.patch
];
withBundledLLVM = false;

10
pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch Normal file
View file

@ -0,0 +1,10 @@
--- rustc-1.26.2-src.org/src/libstd/process.rs 2018-06-01 21:40:11.000000000 +0100
+++ rustc-1.26.2-src/src/libstd/process.rs 2018-06-08 07:50:23.023828658 +0100
@@ -1745,6 +1745,7 @@
}
#[test]
+ #[ignore]
fn test_inherit_env() {
use env;

8
pkgs/development/compilers/rust/rustc.nix
View file

@ -1,6 +1,6 @@
{ stdenv, targetPackages, removeReferencesTo
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
, llvm, ncurses, darwin, rustPlatform, git, cmake, curl
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
, which, libffi, gdb
, version
, withBundledLLVM ? false
@ -20,6 +20,8 @@ let
llvmShared = llvm.override { enableSharedLibraries = true; };
prefixedJemalloc = jemalloc.override { stripPrefix = false; };
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
in
@ -60,6 +62,7 @@ stdenv.mkDerivation {
configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
"--enable-vendor"
"--jemalloc-root=${prefixedJemalloc}/lib"
"--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
++ optional (targets != []) "--target=${target}";
@ -82,6 +85,7 @@ stdenv.mkDerivation {
patchShebangs src/etc
${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
rm -rf src/jemalloc
# Fix the configure script to not require curl as we won't use it
sed -i configure \
@ -93,7 +97,7 @@ stdenv.mkDerivation {
# https://github.com/rust-lang/rust/issues/39522
echo removing gdb-version-sensitive tests...
find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,generic-enum-with-different-disr-sizes.rs}
rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs}
# Useful debugging parameter
# export VERBOSE=1

6
pkgs/development/compilers/solc/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
let
version = "0.5.2";
rev = "1df8f40cd2fd7b47698d847907b8ca7b47eb488d";
sha256 = "009kjyb3r2p64wpdzfcmqr9swm5haaixbzvsbw1nd4wipwbp66y0";
version = "0.5.3";
rev = "10d17f245839f208ec5085309022a32cd2502f55";
sha256 = "1jq41pd3nj534cricy1nq6wgk4wlwg239387n785aswpwd705jbb";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
jsoncpp = fetchzip {
url = jsoncppURL;

2
pkgs/development/coq-modules/iris/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
};
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
};
}

2
pkgs/development/coq-modules/metalib/default.nix
View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
};
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
};
}

2
pkgs/development/coq-modules/stdpp/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation {
};
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
};
}

3
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -153,9 +153,6 @@ self: super: builtins.intersectAttrs super {
gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
# Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build
taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; }));
# Add necessary reference to gtk3 package
gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;

4
pkgs/development/interpreters/groovy/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.5.5";
version = "2.5.6";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2";
sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn";
};
buildInputs = [ unzip makeWrapper ];

8
pkgs/development/interpreters/php/default.nix
View file

@ -253,16 +253,16 @@ in {
};
php72 = generic {
version = "7.2.14";
sha256 = "15v5gbdxi6jkgdflpj5rqqzzfvwdb55hls4azh71xgy793934qgm";
version = "7.2.15";
sha256 = "0m05dmad138qfxcb2z4czf9pfv1746g9yzlch48kjikajhb7cgn9";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};
php73 = generic {
version = "7.3.1";
sha256 = "13iqfkz9rmx9vy106lvw1nbk88qgwdkvxam0l5s14r7jsw62pvxg";
version = "7.3.2";
sha256 = "1p8amf91i6lrrphd6ypfh3kic64bpqf04dxp7dj1xxnjrgd50vwl";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "appstream-${version}";
version = "0.12.4";
version = "0.12.5";
src = fetchFromGitHub {
owner = "ximion";
repo = "appstream";
rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
sha256 = "1ag00w13fqvv584svcml7cykvgy0mi709qsm5mgy2ygy9d8r2vfw";
sha256 = "1h68raflp04r79c58vyy3mmcixs5bqffm2d1js7mxfypmi4mvv6r";
};
nativeBuildInputs = [

38
pkgs/development/libraries/hunspell/dictionaries.nix
View file

@ -250,6 +250,35 @@ let
};
};
mkDictFromLibreOffice =
{ shortName
, shortDescription
, dictFileName
, license
, readmeFile ? "README_${dictFileName}.txt"
, sourceRoot ? dictFileName }:
mkDict rec {
name = "hunspell-dict-${shortName}-libreoffice-${version}";
version = "6.2.0.3";
inherit dictFileName readmeFile;
src = fetchFromGitHub {
owner = "LibreOffice";
repo = "dictionaries";
rev = "libreoffice-${version}";
sha256 = "0rw9ahhynia5wsgyd67lrhinqqn1s1rizgiykb3palbyk0lv72xj";
};
buildPhase = ''
cp -a ${sourceRoot}/* .
'';
meta = with stdenv.lib; {
homepage = https://wiki.documentfoundation.org/Development/Dictionaries;
description = "Hunspell dictionary for ${shortDescription} from LibreOffice";
license = license;
maintainers = with maintainers; [ vlaci ];
platforms = platforms.all;
};
};
in {
/* ENGLISH */
@ -510,6 +539,15 @@ in {
];
};
/* HUNGARIAN */
hu-hu = mkDictFromLibreOffice {
shortName = "hu-hu";
dictFileName = "hu_HU";
shortDescription = "Hungarian (Hungary)";
license = with stdenv.lib.licenses; [ mpl20 lgpl3 ];
};
/* SWEDISH */
sv-se = mkDictFromDSSO rec {

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

@ -2,13 +2,13 @@
libidn2, libunistring, nghttp2 }:
stdenv.mkDerivation rec {
version = "7.62.0";
version = "7.63.0";
name = "libgnurl-${version}";
src = fetchurl {
url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
sha256 = "15b5fn4na9vzmzp4i0jf7al9v3q0abx51g1sgkrdsvdxhypwji1v";
sha256 = "15y4yjy67n3c57kp0yszklcrz2nickrvjvd6laizs6kdbpixjdfl";
};
nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];

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

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "libiio-${version}";
version = "0.16";
version = "0.17";
src = fetchFromGitHub {
owner = "analogdevicesinc";
repo = "libiio";
rev = "refs/tags/v${version}";
sha256 = "1j27kyizdwawskwg1va894qaw3z5dx5s6cla1rd0ngr9kls88q2h";
sha256 = "15lghy0zlq667abs1ggbvmb1qiw7vzhhzkw8dm9vzix4ffma2igg";
};
outputs = [ "out" "lib" "dev" "python" ];

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

@ -48,7 +48,7 @@ in rec {
};
libtoxcore_0_2 = generic {
version = "0.2.8";
sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm";
version = "0.2.9";
sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j";
};
}

5
pkgs/development/libraries/libvirt/default.nix
View file

@ -7,6 +7,7 @@
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
, enableXen ? false, xen ? null
, enableIscsi ? false, openiscsi
, enableCeph ? false, ceph
}:
with stdenv.lib;
@ -45,6 +46,8 @@ in stdenv.mkDerivation rec {
xen
] ++ optionals enableIscsi [
openiscsi
] ++ optionals enableCeph [
ceph
] ++ optionals stdenv.isDarwin [
libiconv gmp
];
@ -85,6 +88,8 @@ in stdenv.mkDerivation rec {
"--with-storage-zfs"
] ++ optionals enableIscsi [
"--with-storage-iscsi"
] ++ optionals enableCeph [
"--with-storage-rbd"
] ++ optionals stdenv.isDarwin [
"--with-init-script=none"
];

4
pkgs/development/libraries/mlt/qt-5.nix
View file

@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
name = "mlt-${version}";
version = "6.10.0";
version = "6.12.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr";
sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w";
};
buildInputs = [

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
name = "openvdb-${version}";
version = "5.2.0";
version = "6.0.0";
src = fetchFromGitHub {
owner = "dreamworksanimation";
repo = "openvdb";
rev = "v${version}";
sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5";
sha256 = "07m012a966l821f09jmrrhs25cs2rcmhlxcicywibllaac10wk5k";
};
outputs = [ "out" ];

28
pkgs/development/libraries/physics/hepmc3/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, cmake, coreutils, root }:
stdenv.mkDerivation rec {
name = "hepmc3-${version}";
version = "3.1.0";
src = fetchurl {
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz";
sha256 = "12kzdqdbq7md0nn58jvilhh00yddfir65f0q2026k0ym37bfwdyd";
};
buildInputs = [ cmake root ];
postInstall = ''
substituteInPlace "$out"/bin/HepMC3-config \
--replace 'greadlink' '${coreutils}/bin/readlink'
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation";
license = licenses.gpl3;
homepage = http://hepmc.web.cern.ch/hepmc/;
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
};
}

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }:
let version = "8.3.0";
let version = "8.4.0";
in
stdenv.mkDerivation rec {
name = "qpdf-${version}";
src = fetchurl {
url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
sha256 = "1xwiqf6xkl9glpardak97ycy5f2bwjf8x0hwvf0acsxqj03a3hj6";
sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r";
};
nativeBuildInputs = [ perl ];

4
pkgs/development/libraries/vte/ng.nix
View file

@ -2,13 +2,13 @@
vte.overrideAttrs (oldAttrs: rec {
name = "vte-ng-${version}";
version = "0.50.2.a";
version = "0.54.2.a";
src = fetchFromGitHub {
owner = "thestinger";
repo = "vte-ng";
rev = version;
sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf";
sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags";
};
preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh";

4
pkgs/development/python-modules/aws-sam-translator/default.nix
View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
version = "1.8.0";
version = "1.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "bdf9ba476a9a7726fe93746670ccae257955352d98b231f32e9529f01db7ef3b";
sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d";
};
# Tests are not included in the PyPI package

4
pkgs/development/python-modules/beancount/default.nix
View file

@ -4,14 +4,14 @@
, pytest, requests }:
buildPythonPackage rec {
version = "2.2.0";
version = "2.2.1";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1j3fyyqnr5gq71rmkb9q3im8pqppa134zzhmmp4hk4b274g18w31";
sha256 = "0xrgmqv0wsc0makm5i6jwng99yp3rvm30v2xqmcah60fgjymkjzb";
};
# No tests in archive

4
pkgs/development/python-modules/braintree/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
version = "3.50.0";
version = "3.51.0";
src = fetchPypi {
inherit pname version;
sha256 = "d1d7a6854b623f2c616451fa474113ac7fb8a2cbeb7dfad36dd3312113484030";
sha256 = "1aavalwxcpql416f0n6wxq2h5jpvbx5jq4y4nz2wsppgjbsxylcc";
};
propagatedBuildInputs = [ requests ];

20
pkgs/development/python-modules/buildbot/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests,
txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint,
flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
let
withPlugins = plugins: buildPythonPackage {
@ -24,11 +24,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "1.5.0";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "d02a717222bcdc98205624c7d6b0b2ae24653170f2971946f26bf8cadea4fd52";
sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7";
};
propagatedBuildInputs = [
@ -43,6 +43,7 @@ let
txaio
autobahn
pyjwt
pyyaml
# tls
twisted.extras.tls
@ -71,13 +72,16 @@ let
./skip_test_linux_distro.patch
];
LC_ALL = "en_US.UTF-8";
postPatch = ''
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
'';
# TimeoutErrors on slow machines -> aarch64
doCheck = !stdenv.isAarch64;
postPatch = ''
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
preCheck = ''
export LC_ALL="en_US.UTF-8"
export PATH="$out/bin:$PATH"
'';
passthru = {

4
pkgs/development/python-modules/buildbot/pkg.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "buildbot-pkg";
version = "1.4.0";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "06f4jvczbg9km0gfmcd1ljplf5w8za27i9ap9jnyqgh3j77smd7a";
sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3";
};
postPatch = ''

10
pkgs/development/python-modules/buildbot/plugins.nix
View file

@ -10,7 +10,7 @@
src = fetchPypi {
inherit pname version format;
sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v";
sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl";
};
meta = with lib; {
@ -27,7 +27,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r";
sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824";
};
propagatedBuildInputs = [ buildbot-pkg ];
@ -47,7 +47,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7";
sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz";
};
propagatedBuildInputs = [ buildbot-pkg ];
@ -67,7 +67,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd";
sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5";
};
propagatedBuildInputs = [ buildbot-pkg ];
@ -87,7 +87,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz";
sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d";
};
propagatedBuildInputs = [ buildbot-pkg ];

4
pkgs/development/python-modules/buildbot/worker.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage (rec {
pname = "buildbot-worker";
version = "1.4.0";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy";
sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39";
};
propagatedBuildInputs = [ twisted future ];

25
pkgs/development/python-modules/cfn-flip/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }:
buildPythonPackage rec {
pname = "cfn-flip";
version = "1.1.0.post1";
src = fetchPypi {
pname = "cfn_flip";
inherit version;
sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck";
};
propagatedBuildInputs = [ six pyyaml click ];
nativeBuildInputs = [ pytestrunner ];
# No tests in Pypi
doCheck = false;
meta = with lib; {
description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats";
homepage = https://github.com/awslabs/aws-cfn-template-flip;
license = licenses.asl20;
maintainers = with maintainers; [ psyanticy ];
};
}

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