diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ba6a3501e38..1027ccc9cba 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -47,8 +47,8 @@
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp
-# NixOS modules
-/nixos/modules @Infinisil
+# New NixOS modules
+/nixos/modules/module-list.nix @Infinisil
# Python-related code and docs
/maintainers/scripts/update-python-libraries @FRidh
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4f6e9b1084f..cd264bd5a77 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -157,6 +157,11 @@
github = "aespinosa";
name = "Allan Espinosa";
};
+ aethelz = {
+ email = "aethelz@protonmail.com";
+ github = "aethelz";
+ name = "Eugene";
+ };
aflatter = {
email = "flatter@fastmail.fm";
github = "aflatter";
@@ -930,6 +935,11 @@
github = "chris-martin";
name = "Chris Martin";
};
+ chrisaw = {
+ email = "home@chrisaw.com";
+ github = "cawilliamson";
+ name = "Christopher A. Williamson";
+ };
chrisjefferson = {
email = "chris@bubblescope.net";
github = "chrisjefferson";
@@ -2663,6 +2673,11 @@
github = "league";
name = "Christopher League";
};
+ leahneukirchen = {
+ email = "leah@vuxu.org";
+ github = "leahneukirchen";
+ name = "Leah Neukirchen";
+ };
lebastr = {
email = "lebastr@gmail.com";
github = "lebastr";
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index b16297da7ce..ead8f3abd8b 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -91,6 +91,17 @@
the module for some time and so was removed as cleanup.
+
+
+ The module has been removed, see
+ instead for a free software fork of Emby.
+
+ See the Jellyfin documentation:
+
+ Migrating from Emby to Jellyfin
+
+
+
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index e78673514e3..cd6bb9019b1 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -266,7 +266,7 @@
caddy = 239;
taskd = 240;
factorio = 241;
- emby = 242;
+ # emby = 242; # unusued, removed 2019-05-01
graylog = 243;
sniproxy = 244;
nzbget = 245;
@@ -567,7 +567,7 @@
caddy = 239;
taskd = 240;
factorio = 241;
- emby = 242;
+ # emby = 242; # unused, removed 2019-05-01
sniproxy = 244;
nzbget = 245;
mosquitto = 246;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 56c44a43c6e..05b4b729639 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -392,9 +392,9 @@
./services/misc/dysnomia.nix
./services/misc/disnix.nix
./services/misc/docker-registry.nix
- ./services/misc/emby.nix
./services/misc/errbot.nix
./services/misc/etcd.nix
+ ./services/misc/ethminer.nix
./services/misc/exhibitor.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index fc8a424190f..11b6215794e 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -382,8 +382,10 @@ in
| xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}"
'' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
echo Importing znapzend zetup ${config} for dataset ${dataset}
- ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}
- '') files);
+ ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config} &
+ '') files) + ''
+ wait
+ '';
serviceConfig = {
ExecStart = let
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index c101e7375af..c2f458c0379 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -18,7 +18,11 @@ let
database ${cfg.database}
suffix ${cfg.suffix}
rootdn ${cfg.rootdn}
- rootpw ${cfg.rootpw}
+ ${if (cfg.rootpw != null) then ''
+ rootpw ${cfg.rootpw}
+ '' else ''
+ include ${cfg.rootpwFile}
+ ''}
directory ${cfg.dataDir}
${cfg.extraDatabaseConfig}
'');
@@ -106,10 +110,23 @@ in
};
rootpw = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
+ default = null;
description = ''
Password for the root user.
This setting will be ignored if configDir is set.
+ Using this option will store the root password in plain text in the
+ world-readable nix store. To avoid this the rootpwFile can be used.
+ '';
+ };
+
+ rootpwFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Password file for the root user.
+ The file should contain the string rootpw followed by the password.
+ e.g.: rootpw mysecurepassword
'';
};
@@ -140,9 +157,9 @@ in
include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema
include ${pkgs.openldap.out}/etc/schema/nis.schema
- database bdb
- suffix dc=example,dc=org
- rootdn cn=admin,dc=example,dc=org
+ database bdb
+ suffix dc=example,dc=org
+ rootdn cn=admin,dc=example,dc=org
# NOTE: change after first start
rootpw secret
directory /var/db/openldap
@@ -218,6 +235,12 @@ in
###### implementation
config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.rootpwFile != null || cfg.rootpw != null;
+ message = "Either services.openldap.rootpw or services.openldap.rootpwFile must be set";
+ }
+ ];
environment.systemPackages = [ openldap ];
diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
deleted file mode 100644
index 0ad4a3f7376..00000000000
--- a/nixos/modules/services/misc/emby.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.emby;
-in
-{
- options = {
- services.emby = {
- enable = mkEnableOption "Emby Media Server";
-
- user = mkOption {
- type = types.str;
- default = "emby";
- description = "User account under which Emby runs.";
- };
-
- group = mkOption {
- type = types.str;
- default = "emby";
- description = "Group under which emby runs.";
- };
-
- dataDir = mkOption {
- type = types.path;
- default = "/var/lib/emby/ProgramData-Server";
- description = "Location where Emby stores its data.";
- };
- };
- };
-
- config = mkIf cfg.enable {
- systemd.services.emby = {
- description = "Emby Media Server";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
- preStart = ''
- if [ -d ${cfg.dataDir} ]
- then
- for plugin in ${cfg.dataDir}/plugins/*
- do
- echo "Correcting permissions of plugin: $plugin"
- chmod u+w $plugin
- done
- else
- echo "Creating initial Emby data directory in ${cfg.dataDir}"
- mkdir -p ${cfg.dataDir}
- chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
- fi
- '';
-
- serviceConfig = {
- Type = "simple";
- User = cfg.user;
- Group = cfg.group;
- PermissionsStartOnly = "true";
- ExecStart = "${pkgs.emby}/bin/emby -programdata ${cfg.dataDir}";
- Restart = "on-failure";
- };
- };
-
- users.users = mkIf (cfg.user == "emby") {
- emby = {
- group = cfg.group;
- uid = config.ids.uids.emby;
- };
- };
-
- users.groups = mkIf (cfg.group == "emby") {
- emby = {
- gid = config.ids.gids.emby;
- };
- };
- };
-}
diff --git a/nixos/modules/services/misc/ethminer.nix b/nixos/modules/services/misc/ethminer.nix
new file mode 100644
index 00000000000..2958cf21447
--- /dev/null
+++ b/nixos/modules/services/misc/ethminer.nix
@@ -0,0 +1,115 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.ethminer;
+ poolUrl = escapeShellArg "stratum1+tcp://${cfg.wallet}@${cfg.pool}:${toString cfg.stratumPort}/${cfg.rig}/${cfg.registerMail}";
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.ethminer = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable ethminer ether mining.";
+ };
+
+ recheckInterval = mkOption {
+ type = types.int;
+ default = 2000;
+ description = "Interval in milliseconds between farm rechecks.";
+ };
+
+ toolkit = mkOption {
+ type = types.enum [ "cuda" "opencl" ];
+ default = "cuda";
+ description = "Cuda or opencl toolkit.";
+ };
+
+ apiPort = mkOption {
+ type = types.int;
+ default = -3333;
+ description = "Ethminer api port. minus sign puts api in read-only mode.";
+ };
+
+ wallet = mkOption {
+ type = types.str;
+ example = "0x0123456789abcdef0123456789abcdef01234567";
+ description = "Ethereum wallet address.";
+ };
+
+ pool = mkOption {
+ type = types.str;
+ example = "eth-us-east1.nanopool.org";
+ description = "Mining pool address.";
+ };
+
+ stratumPort = mkOption {
+ type = types.port;
+ default = 9999;
+ description = "Stratum protocol tcp port.";
+ };
+
+ rig = mkOption {
+ type = types.str;
+ default = "mining-rig-name";
+ description = "Mining rig name.";
+ };
+
+ registerMail = mkOption {
+ type = types.str;
+ example = "email%40example.org";
+ description = "Url encoded email address to register with pool.";
+ };
+
+ maxPower = mkOption {
+ type = types.int;
+ default = 115;
+ description = "Miner max watt usage.";
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ systemd.services.ethminer = {
+ path = [ pkgs.cudatoolkit ];
+ description = "ethminer ethereum mining service";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ DynamicUser = true;
+ ExecStartPost = optional (cfg.toolkit == "cuda") "+${getBin config.boot.kernelPackages.nvidia_x11}/bin/nvidia-smi -pl ${toString cfg.maxPower}";
+ };
+
+ environment = {
+ LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib";
+ };
+
+ script = ''
+ ${pkgs.ethminer}/bin/.ethminer-wrapped \
+ --farm-recheck ${toString cfg.recheckInterval} \
+ --report-hashrate \
+ --${cfg.toolkit} \
+ --api-port ${toString cfg.apiPort} \
+ --pool ${poolUrl}
+ '';
+
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix
index 149026d2018..827cf6322cf 100644
--- a/nixos/modules/services/monitoring/grafana-reporter.nix
+++ b/nixos/modules/services/monitoring/grafana-reporter.nix
@@ -52,7 +52,7 @@ in {
wantedBy = ["multi-user.target"];
after = ["network.target"];
serviceConfig = let
- args = lib.concatSepString " " [
+ args = lib.concatStringsSep " " [
"-proto ${cfg.grafana.protocol}://"
"-ip ${cfg.grafana.addr}:${toString cfg.grafana.port}"
"-port :${toString cfg.port}"
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 65df93a00da..0046dcd366f 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -70,6 +70,8 @@ in
systemd.services."softether-init" = {
description = "SoftEther VPN services initial task";
+ after = [ "keys.target" ];
+ wants = [ "keys.target" ];
wantedBy = [ "network.target" ];
serviceConfig = {
Type = "oneshot";
diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix
index 1ad8855b86d..46bff6954cd 100644
--- a/nixos/modules/services/networking/znc/default.nix
+++ b/nixos/modules/services/networking/znc/default.nix
@@ -47,11 +47,11 @@ let
# Baz=baz
# Qux=qux
#
- set = concatMap (subname: [
+ set = concatMap (subname: optionals (value.${subname} != null) ([
"<${name} ${subname}>"
] ++ map (line: "\t${line}") (toLines value.${subname}) ++ [
""
- ]) (filter (v: v != null) (attrNames value));
+ ])) (filter (v: v != null) (attrNames value));
}.${builtins.typeOf value};
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 61b751bb518..6f4852c3ba1 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -81,7 +81,7 @@ let
${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) ''
BridgeRelay 1
- ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
+ ServerTransportPlugin ${concatStringsSep "," cfg.relay.bridgeTransports} exec ${obfs4}/bin/obfs4proxy managed
ExtORPort auto
${optionalString (cfg.relay.role == "private-bridge") ''
ExtraInfoStatistics 0
@@ -355,7 +355,7 @@ in
Regular bridge. Works like a regular relay, but
doesn't list you in the public relay directory and
- hides your Tor node behind obfsproxy.
+ hides your Tor node behind obfs4proxy.
@@ -424,6 +424,13 @@ in
'';
};
+ bridgeTransports = mkOption {
+ type = types.listOf types.str;
+ default = ["obfs4"];
+ example = ["obfs2" "obfs3" "obfs4" "scramblesuit"];
+ description = "List of pluggable transports";
+ };
+
nickname = mkOption {
type = types.str;
default = "anonymous";
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 3a154ab75ba..c486d6c8613 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -16,11 +16,11 @@ let
} // (optionalAttrs vhostConfig.enableACME {
sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem";
sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem";
- sslTrustedCertificate = "${acmeDirectory}/${serverName}/full.pem";
+ sslTrustedCertificate = "${acmeDirectory}/${serverName}/fullchain.pem";
}) // (optionalAttrs (vhostConfig.useACMEHost != null) {
sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem";
sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem";
- sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/full.pem";
+ sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem";
})
) cfg.virtualHosts;
enableIPv6 = config.networking.enableIPv6;
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5639b2668c3..95654b67960 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -116,6 +116,7 @@ in
installer = handleTest ./installer.nix {};
ipv6 = handleTest ./ipv6.nix {};
jackett = handleTest ./jackett.nix {};
+ jellyfin = handleTest ./jellyfin.nix {};
jenkins = handleTest ./jenkins.nix {};
kafka = handleTest ./kafka.nix {};
kerberos = handleTest ./kerberos/default.nix {};
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 3b65b06d8db..479d175020b 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
- version = "0.18.2";
+ version = "0.19.4";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
- sha256 = "1ha219xnd61qicf7r3j0wbfrifh7blwp3lyk3ycgdn381q1qln29";
+ sha256 = "1z4x25ygcw1pqml2ww02vqrvmihlv4f5gnnn1iyfirrjxgpfaxd7";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
index cbbfd85fe5b..c49bbc43251 100644
--- a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
+++ b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
@@ -4,12 +4,12 @@
dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
BITCOIN_QT_CHECK([
-- if test "x$3" != "x"; then
+- if test "x$3" != x; then
- AC_PATH_PROGS($1,$2,,$3)
- else
- AC_PATH_PROGS($1,$2)
- fi
+ AC_PATH_PROGS($1,$2)
- if test "x$$1" = "x" && test "x$4" != "xyes"; then
+ if test "x$$1" = x && test "x$4" != xyes; then
BITCOIN_QT_FAIL([$1 not found])
fi
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 8d8d8d85475..ff02d2a9e22 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "mixxx-${version}";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
- sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9";
+ sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
};
nativeBuildInputs = [ makeWrapper ];
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
qtx11extras rubberband scons sqlite taglib upower vampSDK
];
+ enableParallelBuilding = true;
+
sconsFlags = [
"build=release"
"qtdir=${qtbase}"
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 42ef89cd0fd..d190fa1b729 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
- version = "3.36.0";
+ version = "3.37.0";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "1qxb3rfjxmwihcm0nrarrgp9x7zr3kjipzn5igj0d57gpi2bdwgv";
+ sha256 = "1fy802jx3817ldrm3g5inrfjbi7s8xcx96pnglbq54nvp41lzyh5";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 0cbb022eb20..71b9d344246 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -47,13 +47,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- version = "4.5.9";
+ version = "4.6.0";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "19pqi9wix359hdrslzmi9sz0dzz03pdwqvdyzw3i5rdny01skdfw";
+ sha256 = "1ap07sw4j1a0al2hqh781m8ivlplxlaw515gkf65q100q80kr0zj";
};
nativeBuildInputs = [
@@ -107,5 +107,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
+ badPlatforms = [ "aarch64-linux" ];
};
}
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 089fffdc0e8..018dd39580f 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
- version = "0.5.6";
+ version = "0.5.7";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
- sha256 = "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj";
+ sha256 = "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95";
};
buildInputs = [
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 21bcd158f7a..b596e74a264 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
- version = "0.5.3";
+ version = "0.5.4";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
- sha256 = "0li6iz1anm8pzz7j12yrfyxlyslsfsksmz0kk0iapa4yx3kifn10";
+ sha256 = "1il4b8v3azb33yg4fy78npi56xlkz4n60f17sgvckyxb2yj57jwq";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index aef0d013e9f..b09aa835c9f 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "qsampler-${version}";
- version = "0.5.4";
+ version = "0.5.5";
src = fetchurl {
url = "mirror://sourceforge/qsampler/${name}.tar.gz";
- sha256 = "1hk0j63zzdyji5dd89spbyw79i74n28zjryyy0a4gsaq0m7j2dry";
+ sha256 = "1li2p8zknrdr62wlaassfvgski0rlbr3lvrzywbh32dq8j50w8zf";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 703ce5c5cf9..6c1f561ad74 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "qtractor";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "06sa4wl8zr0k8dnjiil0gjwnhrkq95h50xv56ih1y8jgyzxchaxp";
+ sha256 = "0z97c8h0m7070bfq0qsbf8hwzwcqjs7dln7na4mngyhc6vqkg63s";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 8e04b51753d..fc6a78af0bc 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "reaper-${version}";
- version = "5.973";
+ version = "5.974";
src = fetchurl {
url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
- sha256 = "02ymi2rn29zrb71krx43nrpfldhkcvwry4gz228apff2hb2lmqdx";
+ sha256 = "0pmjdh4d1jsplv99nrgjn437bgjp7hqk6fynvqk3lbn1zw3wk0i9";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 1a131539460..5d2b1645473 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "samplv1-${version}";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
- sha256 = "16a5xix9pn0gl3fr6bv6zl1l9vrzgvy1q7xd8yxzfr3vi5s8x4z9";
+ sha256 = "1vgmcjccpgqqlmmwfg6m91nph81p2xaxydjx82n4l1yrr9lidn9h";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 48579694699..170045704ef 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "synthv1-${version}";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
- sha256 = "1hcngk7mxfrqf8v3r759x3wd0p02nc3q83j8m3k58p408y3mx7nr";
+ sha256 = "0i70wm430fvksi3g985farrkhgb7mwhi7j06dl66cdj1n12jzzk7";
};
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
index 8d39c185aca..8980dc1f0a9 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
@@ -17,25 +17,41 @@ let
};
+ libvterm = libvterm-neovim.overrideAttrs(old: rec {
+ pname = "libvterm-neovim";
+ version = "2019-04-27";
+ name = pname + "-" + version;
+ src = fetchFromGitHub {
+ owner = "neovim";
+ repo = "libvterm";
+ rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
+ sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
+ };
+ });
+
+
in stdenv.mkDerivation rec {
name = "emacs-libvterm-${version}";
- version = "unstable-2018-11-16";
+ version = "unstable-2019-04-28";
src = fetchFromGitHub {
owner = "akermu";
repo = "emacs-libvterm";
- rev = "8be9316156be75a685c0636258b2fec2daaf5ab5";
- sha256 = "059js4aa7xgqcpaicgy4gz683hppa1iyp1r98mnms5hd31a304k8";
+ rev = "6adcedf3e4aaadeeaff97437044fba17aeb466d4";
+ sha256 = "1j6qr5bmajig3idhwsaa3zm72w13q9zn77z2dlrhhx3p4bbds3f8";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ emacs libvterm-neovim ];
+ buildInputs = [ emacs libvterm ];
- cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
+ cmakeFlags = [
+ "-DEMACS_SOURCE=${emacsSources}"
+ "-DUSE_SYSTEM_LIBVTERM=True"
+ ];
installPhase = ''
install -d $out/share/emacs/site-lisp
install ../*.el $out/share/emacs/site-lisp
- install ./*.so $out/share/emacs/site-lisp
+ install ../*.so $out/share/emacs/site-lisp
'';
}
diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 8d973b19ff3..b22b04bac65 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quilter";
- version = "1.8.1";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "0i8rvvc5g74bgfjgsmmgpj42xmhjaz14jjzl9s5nzwpy1fn7vv0p";
+ sha256 = "14qbkkz1l4zj6kwds5d82swnh3ynj6diyvjl0pafgp5i1i27j4rh";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 9d7539b5b65..ebceb4a8b35 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,10 +5,10 @@ let
in
rec {
sublime3-dev = common {
- buildVersion = "3203";
+ buildVersion = "3208";
dev = true;
- x32sha256 = "004hnlm2dvcfagf3bkbfqxlnkgqk46jrm8w9yagpjwkpdy76mgyx";
- x64sha256 = "0dp4vi39s2gq5a7snz0byrf44i0csbzwq6hn7i2zqa6rpvfywa1d";
+ x32sha256 = "09k04fjryc0dc6173i6nwhi5xaan89n4lp0n083crvkqwp0qlf2i";
+ x64sha256 = "12pn3yfm452m75dlyl0lyf82956j8raz2dglv328m81hbafflrj8";
} {};
sublime3 = common {
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index deb4974a9b1..03a8a55c780 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "typora";
- version = "0.9.68";
+ version = "0.9.70";
src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp";
+ sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index d0c8f79c9d4..11adfaaf80d 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -8,13 +8,13 @@ in
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
- version = "3.3.6";
+ version = "4.0.2";
src = fetchurl {
url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
# Verified using official SHA-1 and signature from
# https://github.com/fyookball/keys-n-hashes
- sha256 = "ac435f2bf98b9b50c4bdcc9e3fb2ff19d9c66f8cce5df852f3a4727306bb0a84";
+ sha256 = "6255cd0493442ec57c10ae70ca2e84c6a29497f90a1393e6ac5772afe7572acf";
};
propagatedBuildInputs = with python3Packages; [
@@ -48,7 +48,14 @@ python3Packages.buildPythonApplication rec {
--replace "(share_dir" "(\"share\""
'';
- doCheck = false;
+ checkInputs = with python3Packages; [
+ pytest
+ ];
+
+ checkPhase = ''
+ unset HOME
+ pytest lib/tests
+ '';
postInstall = ''
substituteInPlace $out/share/applications/electron-cash.desktop \
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index e72065fa283..9313612370c 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -5,32 +5,26 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "gcalcli";
- version = "4.0.4";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "insanum";
repo = pname;
rev = "v${version}";
- sha256 = "0bl4cmc24iw12zn5mlj5qn141s2k2mzdixbcb92pfng4w2s4dq66";
+ sha256 = "06iijpwlvvn8bj81s4znhykilvwvydxjmzd3d4nsa5j2kj3iwshi";
};
postPatch = lib.optionalString stdenv.isLinux ''
- substituteInPlace gcalcli/argparsers.py --replace \
- "command = 'notify-send -u critical" \
- "command = '${libnotify}/bin/notify-send -u critical"
+ substituteInPlace gcalcli/argparsers.py \
+ --replace "'notify-send" "'${libnotify}/bin/notify-send"
'';
propagatedBuildInputs = [
dateutil gflags httplib2 parsedatetime six vobject
google_api_python_client oauth2client uritemplate
+ libnotify
] ++ lib.optional (!isPy3k) futures;
- postInstall = lib.optionalString stdenv.isLinux ''
- substituteInPlace $out/bin/gcalcli --replace \
- "command = 'notify-send -u critical -a gcalcli %s'" \
- "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
- '';
-
# There are no tests as of 4.0.0a4
doCheck = false;
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 053da375ab1..47fb50242c1 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
patches = [
./gcc43.patch
+ ./find-config-file-in-system-etc-dir.patch
./gmrun-0.9.2-xdg.patch
];
diff --git a/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch b/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch
new file mode 100644
index 00000000000..12d5370961c
--- /dev/null
+++ b/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch
@@ -0,0 +1,18 @@
+diff -ur gmrun-0.9.2-orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
+--- gmrun-0.9.2-orig/src/prefs.cc 2019-05-02 12:56:39.025088361 +0200
++++ gmrun-0.9.2/src/prefs.cc 2019-05-02 13:21:51.179778620 +0200
+@@ -31,9 +31,11 @@
+
+ Prefs::Prefs()
+ {
+- string file_name = PACKAGE_DATA_DIR"/";
+- file_name += GMRUNRC;
+- init(file_name);
++ string file_name = "/etc/" GMRUNRC;
++ if (!init(file_name)) {
++ file_name = PACKAGE_DATA_DIR "/" GMRUNRC;;
++ init(file_name);
++ }
+
+ file_name = getenv("HOME");
+ if (!file_name.empty()) {
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 928a1bae108..7acebfad488 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
let
- version = "5.3.22";
+ version = "5.4.10";
in stdenv.mkDerivation {
name = "masterpdfeditor-${version}";
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
- sha256 = "0cnw01g3j5l07f2lng604mx8qqm61i5sflryj1vya2gkjmrphkan";
+ sha256 = "1902ahb2g9xanrip1n0ihr31az8sv9fsvzddnzf70kbwlfclnqf7";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 904fb95ca6c..0d9fffd1bb7 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "18.12";
+ version = "19.04";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d";
+ sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix
index 5d50238a9f0..9fb8469cf27 100644
--- a/pkgs/applications/misc/translate-shell/default.nix
+++ b/pkgs/applications/misc/translate-shell/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "translate-shell";
- version = "0.9.6.9";
+ version = "0.9.6.10";
src = fetchFromGitHub {
owner = "soimort";
repo = "translate-shell";
rev = "v${version}";
- sha256 = "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm";
+ sha256 = "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index 2c6940e037c..834be5cd302 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -34,7 +34,7 @@
, rsync
# Pluggable transports
-, obfsproxy
+, obfs4
# Customization
, extraPrefs ? ""
@@ -171,9 +171,9 @@ stdenv.mkDerivation rec {
EOF
# Configure pluggable transports
- cat >>$TBDATA_PATH/torrc-defaults <= 2.3.0'
+
group :default do
gem 'oauth', '>= 0.5.1'
gem 'json_pure', '~> 1.8'
- gem 'addressable', '~> 2.3'
+ gem 'addressable', '>= 2.5.2', '< 2.6'
+ gem 'diva', '>= 0.3.2', '< 2.0'
gem 'memoist', '>= 0.16', '< 0.17'
gem 'ruby-hmac', '~> 0.4'
gem 'typed-array', '~> 0.1'
gem 'delayer', '~> 0.0'
gem 'pluggaloid', '>= 1.1.1', '< 2.0'
- gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
- gem 'twitter-text', '>= 1.14.6'
+ gem 'delayer-deferred', '>= 2.0', '< 3.0'
+ gem 'twitter-text', '>= 2.1.0'
end
group :test do
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
index 69530be4a44..2e1f2fbd382 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
+++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
@@ -3,75 +3,78 @@ GEM
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
- atk (3.1.9)
- glib2 (= 3.1.9)
- cairo (1.15.10)
+ atk (3.3.2)
+ glib2 (= 3.3.2)
+ cairo (1.16.4)
native-package-installer (>= 1.0.3)
pkg-config (>= 1.2.2)
- cairo-gobject (3.1.9)
- cairo
- glib2 (= 3.1.9)
+ cairo-gobject (3.3.2)
+ cairo (>= 1.16.2)
+ glib2 (= 3.3.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
delayer (0.0.2)
- delayer-deferred (1.0.4)
+ delayer-deferred (2.0.0)
delayer (>= 0.0.2, < 0.1)
- gdk_pixbuf2 (3.1.9)
- gio2 (= 3.1.9)
- gettext (3.0.9)
+ diva (0.3.2)
+ addressable (>= 2.5, < 2.6)
+ gdk_pixbuf2 (3.3.2)
+ gio2 (= 3.3.2)
+ gettext (3.2.9)
locale (>= 2.0.5)
- text
- gio2 (3.1.9)
- glib2 (= 3.1.9)
- gobject-introspection (= 3.1.9)
- glib2 (3.1.9)
+ text (>= 1.3.0)
+ gio2 (3.3.2)
+ gobject-introspection (= 3.3.2)
+ glib2 (3.3.2)
native-package-installer (>= 1.0.3)
pkg-config (>= 1.2.2)
- gobject-introspection (3.1.9)
- glib2 (= 3.1.9)
- gtk2 (3.1.9)
- atk (= 3.1.9)
- gdk_pixbuf2 (= 3.1.9)
- pango (= 3.1.9)
- hashdiff (0.3.7)
+ gobject-introspection (3.3.2)
+ glib2 (= 3.3.2)
+ gtk2 (3.3.2)
+ atk (= 3.3.2)
+ gdk_pixbuf2 (= 3.3.2)
+ pango (= 3.3.2)
+ hashdiff (0.3.9)
httpclient (2.8.3)
+ idn-ruby (0.1.0)
instance_storage (1.0.0)
+ irb (1.0.0)
json_pure (1.8.6)
locale (2.1.2)
memoist (0.16.0)
metaclass (0.0.4)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
mocha (0.14.0)
metaclass (~> 0.0.1)
- moneta (1.0.0)
- native-package-installer (1.0.4)
- nokogiri (1.8.1)
- mini_portile2 (~> 2.3.0)
- oauth (0.5.3)
- pango (3.1.9)
- cairo (>= 1.14.0)
- cairo-gobject (= 3.1.9)
- gobject-introspection (= 3.1.9)
- pkg-config (1.2.8)
- pluggaloid (1.1.1)
+ moneta (1.1.1)
+ native-package-installer (1.0.7)
+ nokogiri (1.10.3)
+ mini_portile2 (~> 2.4.0)
+ oauth (0.5.4)
+ pango (3.3.2)
+ cairo-gobject (= 3.3.2)
+ gobject-introspection (= 3.3.2)
+ pkg-config (1.3.7)
+ pluggaloid (1.1.2)
delayer
instance_storage (>= 1.0.0, < 2.0.0)
- power_assert (1.1.1)
- public_suffix (3.0.0)
+ power_assert (1.1.4)
+ public_suffix (3.0.3)
rake (10.5.0)
ruby-hmac (0.4.0)
- ruby-prof (0.16.2)
- safe_yaml (1.0.4)
- test-unit (3.2.6)
+ ruby-prof (0.17.0)
+ safe_yaml (1.0.5)
+ test-unit (3.3.2)
power_assert
text (1.3.1)
totoridipjp (0.1.0)
- twitter-text (1.14.7)
+ twitter-text (3.0.0)
+ idn-ruby
unf (~> 0.1.0)
typed-array (0.1.2)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.4)
+ unf_ext (0.0.7.6)
watch (0.1.0)
webmock (1.24.6)
addressable (>= 2.3.6)
@@ -82,12 +85,14 @@ PLATFORMS
ruby
DEPENDENCIES
- addressable (~> 2.3)
+ addressable (>= 2.5.2, < 2.6)
delayer (~> 0.0)
- delayer-deferred (>= 1.0.4, < 1.1)
- gettext (~> 3.0.1)
- gtk2 (= 3.1.9)
+ delayer-deferred (>= 2.0, < 3.0)
+ diva (>= 0.3.2, < 2.0)
+ gettext (>= 3.2.9, < 3.3)
+ gtk2 (= 3.3.2)
httpclient
+ irb (>= 1.0.0, < 1.1)
json_pure (~> 1.8)
memoist (>= 0.16, < 0.17)
mocha (~> 0.14)
@@ -100,10 +105,13 @@ DEPENDENCIES
ruby-prof
test-unit (~> 3.0)
totoridipjp
- twitter-text (>= 1.14.6)
+ twitter-text (>= 2.1.0)
typed-array (~> 0.1)
watch (~> 0.1)
webmock (~> 1.17)
+RUBY VERSION
+ ruby 2.5.5p157
+
BUNDLED WITH
- 1.14.6
+ 1.17.2
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
index b7d19db3763..efe602edc4f 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
-gem 'gtk2', '3.1.9'
+gem 'gtk2', '3.3.2'
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
index 1625327f16d..61424d395f9 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
+++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
@@ -1,5 +1,6 @@
source 'https://rubygems.org'
group :default do
- gem 'gettext', '~> 3.0.1'
+ gem 'gettext', '>= 3.2.9', '< 3.3'
+ gem 'irb', '>= 1.0.0', '< 1.1'
end
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 3cb254122d7..ea190db07a6 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -1,15 +1,29 @@
{ stdenv, fetchurl
, bundlerEnv, ruby
-, alsaUtils, libnotify, which, wrapGAppsHook, gtk2
+, alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection
}:
+# how to update:
+# find latest version at: http://mikutter.hachune.net/download#download
+# run these commands:
+#
+# wget http://mikutter.hachune.net/bin/mikutter.3.8.7.tar.gz
+# tar xvf mikutter.3.8.7.tar.gz
+# cd mikutter
+# find . -not -name Gemfile -exec rm {} \;
+# find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \;
+# cd ..
+# mv mikutter/* .
+# rm mikutter.3.8.7.tar.gz
+# rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
+
stdenv.mkDerivation rec {
name = "mikutter-${version}";
- version = "3.5.13";
+ version = "3.8.7";
src = fetchurl {
url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
- sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320";
+ sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv";
};
env = bundlerEnv {
@@ -19,7 +33,7 @@ stdenv.mkDerivation rec {
inherit ruby;
};
- buildInputs = [ alsaUtils libnotify which gtk2 ruby ];
+ buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
nativeBuildInputs = [ wrapGAppsHook ];
postUnpack = ''
@@ -41,6 +55,7 @@ stdenv.mkDerivation rec {
--prefix GEM_HOME : "${env}/${env.ruby.gemPath}"
--set DISABLE_BUNDLER_SETUP 1
)
+ # --prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules"
mkdir -p $out/share/mikutter $out/share/applications
ln -sv $out/core/skin $out/share/mikutter/skin
@@ -54,7 +69,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- broken = true;
description = "An extensible Twitter client";
homepage = https://mikutter.hachune.net;
platforms = ruby.meta.platforms;
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
index ef7091689b3..5f3ef945b3d 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
@@ -1,6 +1,8 @@
{
addressable = {
dependencies = ["public_suffix"];
+ groups = ["default" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
@@ -10,33 +12,41 @@
};
atk = {
dependencies = ["glib2"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm";
+ sha256 = "17c5ixwyg16lbbjix2prk7fa6lm0vkxvc1z6m6inc6jgkb1x0700";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
cairo = {
dependencies = ["native-package-installer" "pkg-config"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c";
+ sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8";
type = "gem";
};
- version = "1.15.10";
+ version = "1.16.4";
};
cairo-gobject = {
dependencies = ["cairo" "glib2"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26";
+ sha256 = "12q441a5vnfvbcnli4fpq2svb75vq1wvs2rlgsp6fv38fh6fgsfz";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
crack = {
dependencies = ["safe_yaml"];
+ groups = ["default" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
@@ -45,6 +55,8 @@
version = "0.4.3";
};
delayer = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r";
@@ -54,76 +66,105 @@
};
delayer-deferred = {
dependencies = ["delayer"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb";
+ sha256 = "0zvqphyzngj5wghgbb2nd1qj2qvj2plsz9vx8hz24c7bfq55n4xz";
type = "gem";
};
- version = "1.0.4";
+ version = "2.0.0";
+ };
+ diva = {
+ dependencies = ["addressable"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rp125gdlq7jqq7x8la52pdpimhx5wr66frcgf6z4jm927rjw84d";
+ type = "gem";
+ };
+ version = "0.3.2";
};
gdk_pixbuf2 = {
dependencies = ["gio2"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d";
+ sha256 = "071z8a8khs5qb43ri5hbvaijwbx43mick7cjfmhn6javifkzijk7";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
gettext = {
dependencies = ["locale" "text"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14vw306p46w2kyad3kp9vq56zw3ch6px30wkhl5x0qkx8d3ya3ir";
+ sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
type = "gem";
};
- version = "3.0.9";
+ version = "3.2.9";
};
gio2 = {
- dependencies = ["glib2" "gobject-introspection"];
+ dependencies = ["gobject-introspection"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm";
+ sha256 = "1f131yd9zzfsjn8i4k8xkl7xm3c5f9sm7irvwxnqqh635qccfz8n";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
glib2 = {
dependencies = ["native-package-installer" "pkg-config"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73";
+ sha256 = "13r1i8gkgxj0fjz7bdnqqrsvszl7dffbf85ghx2f8p7zrcbzlk3p";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
gobject-introspection = {
dependencies = ["glib2"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3";
+ sha256 = "15njcm0yg4qpwkhyx6gf2nxvjl6fxm9jffan8zrl2xyh68yr4jf7";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
gtk2 = {
dependencies = ["atk" "gdk_pixbuf2" "pango"];
+ groups = ["plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq";
+ sha256 = "1a4lj6anmvr82cwrg8swzglz90jss995zr7bvsiwr876qqdwv7qs";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
hashdiff = {
+ groups = ["default" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
+ sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
type = "gem";
};
- version = "0.3.7";
+ version = "0.3.9";
};
httpclient = {
+ groups = ["plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
@@ -131,7 +172,19 @@
};
version = "2.8.3";
};
+ idn-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
instance_storage = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl";
@@ -139,7 +192,19 @@
};
version = "1.0.0";
};
+ irb = {
+ groups = ["default" "plugin"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "181d88hns00fpw8szg8hbchflwq69wp3y5zvd3dyqjzbq91v1dcr";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
json_pure = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam";
@@ -148,6 +213,8 @@
version = "1.8.6";
};
locale = {
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
@@ -156,6 +223,8 @@
version = "2.1.2";
};
memoist = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
@@ -164,6 +233,8 @@
version = "0.16.0";
};
metaclass = {
+ groups = ["default" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
@@ -172,15 +243,19 @@
version = "0.0.4";
};
mini_portile2 = {
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
mocha = {
dependencies = ["metaclass"];
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b";
@@ -189,81 +264,101 @@
version = "0.14.0";
};
moneta = {
+ groups = ["plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pgwn6xnlh7vviy511mfgkv2j3sfihn5ic2zabmyrs2nh6kfa912";
+ sha256 = "1mbs9w3c13phza8008mwlx8s991fzigml7pncq94i1c2flz9vw95";
type = "gem";
};
- version = "1.0.0";
+ version = "1.1.1";
};
native-package-installer = {
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a";
+ sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn";
type = "gem";
};
- version = "1.0.4";
+ version = "1.0.7";
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+ sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
- version = "1.8.1";
+ version = "1.10.3";
};
oauth = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b";
+ sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
type = "gem";
};
- version = "0.5.3";
+ version = "0.5.4";
};
pango = {
- dependencies = ["cairo" "cairo-gobject" "gobject-introspection"];
+ dependencies = ["cairo-gobject" "gobject-introspection"];
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk";
+ sha256 = "0lbhjsd6y42iw572xcynd6gcapczjki41h932s90rkh6022pbm9p";
type = "gem";
};
- version = "3.1.9";
+ version = "3.3.2";
};
pkg-config = {
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws";
+ sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1";
type = "gem";
};
- version = "1.2.8";
+ version = "1.3.7";
};
pluggaloid = {
dependencies = ["delayer" "instance_storage"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0p9s1bzw02jzjlpjpxsbfsy1cyfbqs10iqvhxqh4xgyh72nry9zr";
+ sha256 = "0fkm6y7aq132icmmv4k8mqw08fxqil8k52l8li642jyi79hvzrqh";
type = "gem";
};
- version = "1.1.1";
+ version = "1.1.2";
};
power_assert = {
+ groups = ["default" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz";
+ sha256 = "072y5ixw59ad47hkfj6nl2i4zcyad8snfxfsyyrgjkiqnvqwvbvq";
type = "gem";
};
- version = "1.1.1";
+ version = "1.1.4";
};
public_suffix = {
+ groups = ["default" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.3";
};
rake = {
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
@@ -272,6 +367,8 @@
version = "10.5.0";
};
ruby-hmac = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954";
@@ -280,31 +377,39 @@
version = "0.4.0";
};
ruby-prof = {
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag";
+ sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
type = "gem";
};
- version = "0.16.2";
+ version = "0.17.0";
};
safe_yaml = {
+ groups = ["default" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+ sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
type = "gem";
};
- version = "1.0.4";
+ version = "1.0.5";
};
test-unit = {
dependencies = ["power_assert"];
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv";
+ sha256 = "0hf47w70ajvwdchx0psq3dir26hh902x9sz0iwbxqj8z9w1kc6sd";
type = "gem";
};
- version = "3.2.6";
+ version = "3.3.2";
};
text = {
+ groups = ["default" "plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
@@ -313,6 +418,8 @@
version = "1.3.1";
};
totoridipjp = {
+ groups = ["plugin"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck";
@@ -321,15 +428,19 @@
version = "0.1.0";
};
twitter-text = {
- dependencies = ["unf"];
+ dependencies = ["idn-ruby" "unf"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
+ sha256 = "1ibk4bl9hrq0phlg7zplkilsqgniji6yvid1a7k09rs0ai422jax";
type = "gem";
};
- version = "1.14.7";
+ version = "3.0.0";
};
typed-array = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9";
@@ -339,6 +450,8 @@
};
unf = {
dependencies = ["unf_ext"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@@ -347,14 +460,18 @@
version = "0.1.4";
};
unf_ext = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
+ sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
type = "gem";
};
- version = "0.0.7.4";
+ version = "0.0.7.6";
};
watch = {
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx";
@@ -364,6 +481,8 @@
};
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
+ groups = ["test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5";
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
deleted file mode 100644
index bc83767af32..00000000000
--- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs ? import {} }:
-
-pkgs.stdenv.mkDerivation {
- name = "mikutter-shell";
- buildInputs = with pkgs; [
- bundix
- bundler
- ];
-
- shellHook = ''
- export MIKUTTER_CONFROOT="/homeless-shelter"
- truncate --size 0 Gemfile.lock
- bundle lock
- bundle package --path=vendor/bundle --no-install
- rm -rf vendor .bundle
- bundix -d
- '';
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
new file mode 100644
index 00000000000..2054f4cea19
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
@@ -0,0 +1,51 @@
+{ autoPatchelfHook, electron, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }:
+
+stdenv.mkDerivation rec {
+ pname = "rambox-pro";
+ version = "1.1.2";
+
+ dontBuild = true;
+ dontStrip = true;
+
+ buildInputs = [ nss xorg.libxkbfile ];
+ nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ];
+
+ src = fetchurl {
+ url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
+ sha256 = "0rrfpl371hp278b02b9b6745ax29yrdfmxrmkxv6d158jzlv0dlr";
+ };
+
+ postPatch = ''
+ substituteInPlace resources/app.asar.unpacked/node_modules/ad-block/vendor/depot_tools/create-chromium-git-src \
+ --replace "/usr/bin/env -S bash -e" "${stdenv.shell}"
+ substituteInPlace resources/app.asar.unpacked/node_modules/ad-block/node_modules/bloom-filter-cpp/vendor/depot_tools/create-chromium-git-src \
+ --replace "/usr/bin/env -S bash -e" "${stdenv.shell}"
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/opt/RamboxPro $out/share/applications
+ asar e resources/app.asar $out/opt/RamboxPro/resources/app.asar.unpacked
+ ln -s ${desktopItem}/share/applications/* $out/share/applications
+ '';
+
+ postFixup = ''
+ makeWrapper ${electron}/lib/electron/.electron-wrapped $out/bin/ramboxpro \
+ --add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \
+ --prefix PATH : ${xdg_utils}/bin
+ '';
+
+ desktopItem = makeDesktopItem {
+ name = "rambox-pro";
+ exec = "ramboxpro";
+ type = "Application";
+ desktopName = "Rambox Pro";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Messaging and emailing app that combines common web applications into one";
+ homepage = https://rambox.pro;
+ license = licenses.unfree;
+ maintainers = with maintainers; [ chrisaw ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index ee6a40e5860..f195a0cb955 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.0.7",
+ "version": "1.0.8",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 3db537938da..6209dc4b0bf 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -1,15 +1,18 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }:
+# Note for maintainers:
+# Versions of `riot-web` and `riot-desktop` should be kept in sync.
+
with (import ./yarn2nix.nix { inherit pkgs; });
let
executableName = "riot-desktop";
- version = "1.0.7";
+ version = "1.0.8";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
- sha256 = "1sq6vnyas2ab3phaiyby4fkpp0nwvl67xwxnr2pzfm0dkjxl9r58";
+ sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb";
};
in mkYarnPackage rec {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 9f8818efd98..d46c886a156 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -1,13 +1,16 @@
{ lib, stdenv, fetchurl, writeText, conf ? null }:
+# Note for maintainers:
+# Versions of `riot-web` and `riot-desktop` should be kept in sync.
+
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
- version = "1.0.7";
+ version = "1.0.8";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "1zg9hwvbanmv2yymjcxjzk2bwvv8707i30vrs0gr213iz6i4abg5";
+ sha256 = "010m8b4lfnfi70d4v205wk3i4xhnsz7zkrdqrvw3si14xqy6192r";
};
installPhase = ''
@@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A glossy Matrix collaboration client for the web";
homepage = http://riot.im/;
- maintainers = with stdenv.lib.maintainers; [ bachp ];
+ maintainers = with stdenv.lib.maintainers; [ bachp pacien ];
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
hydraPlatforms = [];
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 4a1f71f4b4f..0c30a3def33 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,17 +1,15 @@
{ stdenv, fetchFromGitHub, makeWrapper, lib
, dnsutils, coreutils, openssl, nettools, utillinux, procps }:
-let
- version = "2.9.5-7";
-
-in stdenv.mkDerivation rec {
- name = "testssl.sh-${version}";
+stdenv.mkDerivation rec {
+ pname = "testssl.sh";
+ version = "3.0rc5";
src = fetchFromGitHub {
owner = "drwetter";
- repo = "testssl.sh";
- rev = "v${version}";
- sha256 = "02xp0yi53xf6jw6v633zs2ws2iyyvq3mlkimg0cv3zvj7nw9x5wr";
+ repo = pname;
+ rev = version;
+ sha256 = "14b9n0h4f2dsa292wi9gnan5ncgqblis6wyh5978lhjzi1d7gyds";
};
nativeBuildInputs = [ makeWrapper ];
@@ -27,16 +25,15 @@ in stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace testssl.sh \
--replace /bin/pwd pwd \
- --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\"
+ --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \
+ --replace PROG_NAME=\"\$\(basename\ \"\$0\"\)\" PROG_NAME=\"testssl.sh\"
'';
installPhase = ''
- install -Dt $out/bin testssl.sh
-
- wrapProgram $out/bin/testssl.sh \
- --prefix PATH ':' ${lib.makeBinPath buildInputs}
-
+ install -D testssl.sh $out/bin/testssl.sh
cp -r etc $out
+
+ wrapProgram $out/bin/testssl.sh --prefix PATH ':' ${lib.makeBinPath buildInputs}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 289d1dffc96..b384efc5fe8 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "vnstat-${version}";
- version = "2.1";
+ version = "2.2";
src = fetchurl {
- sha256 = "0yk0x6bg9f36dsslhayyyi8fg04yvzjzqkjmlrcsrv6nnggchb6i";
+ sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6";
url = "https://humdi.net/vnstat/${name}.tar.gz";
};
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index c65315ad5bd..859cab7235a 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qownnotes";
- version = "19.4.1";
+ version = "19.4.5";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
- sha256 = "c0232dda44591033c2ed29ce0a52ba3539b2f2180d1862a18dd4f677063896cb";
+ sha256 = "13yafcdqkl46awq2mxr1c5skydi44iwgcmfkx3wrhq85ird25cpy";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 55b01bd7ec9..91468eaf819 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "picard-tools-${version}";
- version = "2.19.0";
+ version = "2.19.2";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "0l2riidd9p84axj8h7fnrbwgpcpizj74i9mnm3pcqm9vlzvw6zzr";
+ sha256 = "0dfap1whga03r0fh3adi684dyp9agfdi96hb2aqskgr9jp0z69rb";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index fa4fce26734..6608661364a 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -28,11 +28,11 @@ let
in stdenv.mkDerivation rec {
name = "kicad-${version}";
series = "5.0";
- version = "5.0.2";
+ version = "5.1.2";
src = fetchurl {
url = "https://launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz";
- sha256 = "10605rr10x0353n6yk2z095ydnkd1i6j1ncbq64pfxdn5vkhcd1g";
+ sha256 = "12kp82ms2dwqkhilmh3mbhg5rsj5ykk99pnkhp4sx89nni86qdw4";
};
postPatch = ''
@@ -47,6 +47,7 @@ in stdenv.mkDerivation rec {
# nix installs wxPython headers in wxPython package, not in wxwidget
# as assumed. We explicitely set the header location.
"-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0"
+ "-DwxPYTHON_INCLUDE_DIRS=${pythonPackages.wxPython}/include/wx-3.0"
] ++ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON";
@@ -72,22 +73,22 @@ in stdenv.mkDerivation rec {
dontWrapGApps = true;
passthru = {
- i18n = mkLib version "i18n" "1hkc240gymhmyv6r858mq5d2slz0vjqc47ah8wn82vvmb83fpnjy" {
+ i18n = mkLib version "i18n" "08a8lpz2j7bhwn155s0ii538qlynnnvq6fmdw1dxjfgmfy7y3r66" {
buildInputs = [
gettext
];
meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
};
- symbols = mkLib version "symbols" "1rjh2pjcrc3bhcgyyskj5pssm7vffrjk0ymwr70fb7sjpmk96yjk" {
+ symbols = mkLib version "symbols" "0l5r53wcv0518x2kl0fh1zi0d50cckc7z1739fp9z3k5a4ddk824" {
meta.license = licenses.cc-by-sa-40;
};
- footprints = mkLib version "footprints" "19khqyrbrqsdzxvm1b1vxfscxhss705fqky0ilrbvnbvf27fnx8w" {
+ footprints = mkLib version "footprints" "0q7y7m10pav6917ri37pzjvyh71c8lf4lh9ch258pdpl3w481zk6" {
meta.license = licenses.cc-by-sa-40;
};
- templates = mkLib version "templates" "0rlzq1n09n0sf2kj5c9bvbnkvs6cpycjxmxwcswql0fbpcp0sql7" {
+ templates = mkLib version "templates" "1nva4ckq0l2lrah0l05355cawlwd7qfxcagcv32m8hcrn781455q" {
meta.license = licenses.cc-by-sa-40;
};
- packages3d = mkLib version "packages3d" "135jyrljgknnv2y35skhnwcxg16yxxkfbcx07nad3vr4r76zk3am" {
+ packages3d = mkLib version "packages3d" "0xla9k1rnrs00fink90y9qz766iks5lyqwnf1h2i508djqhqm5zi" {
hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
meta.license = licenses.cc-by-sa-40;
};
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 560e1576efc..4f46fd55601 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -38,7 +38,7 @@ let
git-fame = callPackage ./git-fame {};
- gita = callPackage ./gita {};
+ gita = python3Packages.callPackage ./gita {};
# The full-featured Git.
gitFull = gitBase.override {
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 84a441641df..52494d4ab7e 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "ghq-${version}";
- version = "0.8.0";
+ version = "0.10.2";
goPackagePath = "github.com/motemen/ghq";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "1gdi0sbmq9kfi8hzd0dpgmhbmcf8q93jy3x08dd8smayrhbbwmld";
+ sha256 = "1i7zmgv7760nrw8sayag90b8vvmbsiifgiqki5s3gs3ldnvlki5w";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
index 1df37aa0f21..be99aee64a5 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
@@ -1,20 +1,75 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
+ {
+ goPackagePath = "github.com/blang/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/blang/semver";
+ rev = "v3.5.1";
+ sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
+ };
+ }
{
goPackagePath = "github.com/daviddengcn/go-colortext";
fetch = {
type = "git";
url = "https://github.com/daviddengcn/go-colortext";
- rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a";
- sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf";
+ rev = "186a3d44e920";
+ sha256 = "18piv4zzcb8abbc7fllz9p6rd4zhsy1gc6iygym381caggmmgxgk";
};
}
{
- goPackagePath = "github.com/mitchellh/go-homedir";
+ goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
- sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.2.0";
+ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+ };
+ }
+ {
+ goPackagePath = "github.com/golangplus/bytes";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golangplus/bytes";
+ rev = "45c989fe5450";
+ sha256 = "1fpwg1idakpbvkmk8j8yyhv9g7mhr9c922kvff6kj4br4k05zyzr";
+ };
+ }
+ {
+ goPackagePath = "github.com/golangplus/fmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golangplus/fmt";
+ rev = "2a5d6d7d2995";
+ sha256 = "1242q05qnawhv0klzy1pbq63q8jxkms5hc7421992hzq2m40k5yn";
+ };
+ }
+ {
+ goPackagePath = "github.com/golangplus/testing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golangplus/testing";
+ rev = "af21d9c3145e";
+ sha256 = "1g83sjvcavqbh92vyirc48mrqd18yfci08zya0hrgk840cr94czc";
+ };
+ }
+ {
+ goPackagePath = "github.com/hpcloud/tail";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hpcloud/tail";
+ rev = "v1.0.0";
+ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
{
@@ -22,8 +77,26 @@
fetch = {
type = "git";
url = "https://github.com/motemen/go-colorine";
- rev = "49ff36b8fa42db28092361cd20dcefd0b03b1472";
- sha256 = "1rfi5gggf2sxb52whgxfl37p22r2xp27rndixbiicw6swllmml9l";
+ rev = "45d19169413a";
+ sha256 = "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/ginkgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/ginkgo";
+ rev = "v1.6.0";
+ sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/gomega";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/gomega";
+ rev = "v1.5.0";
+ sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
};
}
{
@@ -31,8 +104,89 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
- rev = "f017f86fccc5a039a98f23311f34fdf78b014f78";
- sha256 = "1biq4wl4z8l0ycinb39mfavnk13d0qnqqdplqybl7klxmk67cvhv";
+ rev = "v1.20.0";
+ sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "4829fb13d2c6";
+ sha256 = "05nwpw41d7xsdln5rj381n8j9dsbq5ng1wp52bxslqc4x0l5s9fj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "1d60e4601c6f";
+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "d0b11bdaac8a";
+ sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "20d25e280405";
+ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/tomb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/tomb.v1";
+ rev = "dd632973f1e7";
+ sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.1";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
]
diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix
index 899f33218a1..6ecf81779f2 100644
--- a/pkgs/applications/version-management/git-and-tools/gita/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix
@@ -1,15 +1,19 @@
-{ lib, python3Packages }:
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pyyaml
+}:
-python3Packages.buildPythonApplication rec {
- version = "0.8.2";
+buildPythonApplication rec {
+ version = "0.9.2";
pname = "gita";
- src = python3Packages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
- sha256 = "16jpnl323x86dkrnh4acyvi9jknhgi3r0ccv63rkjcmd0srkaxkk";
+ sha256 = "1aycqq4crsa57ghpv7xc497rf4y8x43fcfd0v9prd2kn6h1793r0";
};
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = [
pyyaml
];
diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index abbec433c02..8c4c4ea8773 100644
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
@@ -1,12 +1,12 @@
{ stdenv, python3Packages }:
with python3Packages; buildPythonApplication rec {
pname = "pre-commit";
- version = "1.15.1";
+ version = "1.15.2";
src = fetchPypi {
inherit version;
pname = "pre_commit";
- sha256 = "1c4a6g3x44xkr75196m2qhb7fbm0lv40yv312g4hkl00mq713abm";
+ sha256 = "1if44rfzmrw9m2k47kiplccby1lfdrlq82jlz4p91wwqc1vs4xi5";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 7536e9c47d8..376e00a3da8 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,29 +1,29 @@
{
"ce": {
- "version": "11.9.8",
- "repo_hash": "10xlabp7ziw1vpyy9dvhaiwf5l340d3yzvlh2aq6ly3xlqr5ip07",
- "deb_hash": "0apw0w5grhpfxwl76w7as5xb6injr7ka8wwk2azllamrxrnn30dv",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.8-ce.0_amd64.deb/download.deb",
+ "version": "11.9.11",
+ "repo_hash": "08f824y6zla4076axdjwcn59hnybps2zvqjhrznfwnhwmak7zqr6",
+ "deb_hash": "17cp3vr8pq0l7pgrcmwrmlsygk7ggdvjhh71vjcdlmngaffmv5hm",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.11-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
- "rev": "v11.9.8",
+ "rev": "v11.9.11",
"passthru": {
- "GITALY_SERVER_VERSION": "1.27.1",
+ "GITALY_SERVER_VERSION": "1.27.2",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.3"
}
},
"ee": {
- "version": "11.9.8",
- "repo_hash": "0h6lpaiwsvyn5cdga08zbgr6cwp3k6xi5jpb7n37hc6y4c7b36ry",
- "deb_hash": "1bsy8qrr2sjvavzv4nslx14x4cx5xjx55d2v7zz6fvjzmgb98hgv",
- "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.8-ee.0_amd64.deb/download.deb",
+ "version": "11.9.11",
+ "repo_hash": "0nsp3lxxh8gmkafa5a5jxi78n9w8v7gij4l4lka2d1wzfkhgzjph",
+ "deb_hash": "1qr8zbwlj99gqxj0cziy5z9hnaxb5lilgf46k4przkd2lhg5s0c0",
+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.11-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
- "rev": "v11.9.8-ee",
+ "rev": "v11.9.11-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "1.27.1",
+ "GITALY_SERVER_VERSION": "1.27.2",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.3"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index d476e7c9038..8bb365f3d14 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
- version = "1.27.1";
+ version = "1.27.2";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "0sr1jjw1rvyxrv6vaqvl138m0x2xgjksjdy92ajslrjxrnjlrjvp";
+ sha256 = "03v8c9ask1f2bk4z51scpm6zh815hcxi5crly5zn7932i2nfvva0";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index da005d40499..1fd519d8be4 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '5.0.7.1'
+gem 'rails', '5.0.7.2'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Improves copy-on-write performance for MRI
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index 5de32fba5d9..27a2821cedb 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -4,41 +4,41 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actioncable (5.0.7.1)
- actionpack (= 5.0.7.1)
+ actioncable (5.0.7.2)
+ actionpack (= 5.0.7.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
+ actionmailer (5.0.7.2)
+ actionpack (= 5.0.7.2)
+ actionview (= 5.0.7.2)
+ activejob (= 5.0.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.7.1)
- actionview (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionpack (5.0.7.2)
+ actionview (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionview (5.0.7.2)
+ activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.7.1)
- activesupport (= 5.0.7.1)
+ activejob (5.0.7.2)
+ activesupport (= 5.0.7.2)
globalid (>= 0.3.6)
- activemodel (5.0.7.1)
- activesupport (= 5.0.7.1)
- activerecord (5.0.7.1)
- activemodel (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ activemodel (5.0.7.2)
+ activesupport (= 5.0.7.2)
+ activerecord (5.0.7.2)
+ activemodel (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
arel (~> 7.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
- activesupport (5.0.7.1)
+ activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -296,7 +296,7 @@ GEM
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (0.4.1)
+ globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.0)
actionpack (>= 3.0)
@@ -386,7 +386,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.2.0)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@@ -637,17 +637,17 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (5.0.7.1)
- actioncable (= 5.0.7.1)
- actionmailer (= 5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
- activemodel (= 5.0.7.1)
- activerecord (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ rails (5.0.7.2)
+ actioncable (= 5.0.7.2)
+ actionmailer (= 5.0.7.2)
+ actionpack (= 5.0.7.2)
+ actionview (= 5.0.7.2)
+ activejob (= 5.0.7.2)
+ activemodel (= 5.0.7.2)
+ activerecord (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
bundler (>= 1.3.0)
- railties (= 5.0.7.1)
+ railties (= 5.0.7.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@@ -663,9 +663,9 @@ GEM
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
- railties (5.0.7.1)
- actionpack (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ railties (5.0.7.2)
+ actionpack (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -1111,7 +1111,7 @@ DEPENDENCIES
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
- rails (= 5.0.7.1)
+ rails (= 5.0.7.2)
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index a60334eb3c2..123fa70678e 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -17,66 +17,80 @@
};
actioncable = {
dependencies = ["actionpack" "nio4r" "websocket-driver"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb";
+ sha256 = "14qy7aygsr35lhcrw2y0c1jxmkfjlcz10p7qcf9jxzhcfmk5rr3y";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm";
+ sha256 = "17whd0cjkb038g14pmkmakp89085j5950jdmfa5hmzqf1djnvc8r";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw";
+ sha256 = "1wyyj014n0gza5m2gpg9ab9av4yr6psvym047nrn1iz84v6fmkfb";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1";
+ sha256 = "0w96iqknr5jz7gzlcyixq1lvhbzbqijj4iq22pbfzscppbz1anvi";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv";
+ sha256 = "1281zl53a5dpl33vxswrg2jxv7kpcyl7mg5mckn4hcksna60356l";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activemodel = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c";
+ sha256 = "0xphpzx3ippi8f2h27v2g3n82i39xwx2gq9yamhby9s2a9hh8shl";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c";
+ sha256 = "1jy2amhn2xsd9hy546mw27agh8493nqlgbmzqhlppx7p3nwikw63";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activerecord_sane_schema_dumper = {
dependencies = ["rails"];
@@ -89,12 +103,14 @@
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb";
+ sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@@ -1163,12 +1179,14 @@
};
globalid = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
+ sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
type = "gem";
};
- version = "0.4.1";
+ version = "0.4.2";
};
gon = {
dependencies = ["actionpack" "multi_json" "request_store"];
@@ -1444,12 +1462,14 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "1.2.0";
+ version = "1.6.0";
};
icalendar = {
source = {
@@ -2423,12 +2443,14 @@
};
rails = {
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w";
+ sha256 = "0amqbd8kl6vmilfhlkf2w0l33x688jssjbra7s717kjqzb4fmqiw";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@@ -2477,12 +2499,14 @@
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr";
+ sha256 = "064w0n33l0wik5i00b4ry7iqv1nb3xhdpjvm55ycx2abpqnlrhjd";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
rainbow = {
source = {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index b2e42dc696c..894832dac17 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '5.0.7.1'
+gem 'rails', '5.0.7.2'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Improves copy-on-write performance for MRI
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 4cd35f7555d..16be6ab2d66 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -4,41 +4,41 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actioncable (5.0.7.1)
- actionpack (= 5.0.7.1)
+ actioncable (5.0.7.2)
+ actionpack (= 5.0.7.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
+ actionmailer (5.0.7.2)
+ actionpack (= 5.0.7.2)
+ actionview (= 5.0.7.2)
+ activejob (= 5.0.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.7.1)
- actionview (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionpack (5.0.7.2)
+ actionview (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.7.1)
- activesupport (= 5.0.7.1)
+ actionview (5.0.7.2)
+ activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.7.1)
- activesupport (= 5.0.7.1)
+ activejob (5.0.7.2)
+ activesupport (= 5.0.7.2)
globalid (>= 0.3.6)
- activemodel (5.0.7.1)
- activesupport (= 5.0.7.1)
- activerecord (5.0.7.1)
- activemodel (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ activemodel (5.0.7.2)
+ activesupport (= 5.0.7.2)
+ activerecord (5.0.7.2)
+ activemodel (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
arel (~> 7.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
- activesupport (5.0.7.1)
+ activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -321,7 +321,7 @@ GEM
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (0.4.1)
+ globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.0)
actionpack (>= 3.0)
@@ -413,7 +413,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.2.0)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@@ -667,17 +667,17 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (5.0.7.1)
- actioncable (= 5.0.7.1)
- actionmailer (= 5.0.7.1)
- actionpack (= 5.0.7.1)
- actionview (= 5.0.7.1)
- activejob (= 5.0.7.1)
- activemodel (= 5.0.7.1)
- activerecord (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ rails (5.0.7.2)
+ actioncable (= 5.0.7.2)
+ actionmailer (= 5.0.7.2)
+ actionpack (= 5.0.7.2)
+ actionview (= 5.0.7.2)
+ activejob (= 5.0.7.2)
+ activemodel (= 5.0.7.2)
+ activerecord (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
bundler (>= 1.3.0)
- railties (= 5.0.7.1)
+ railties (= 5.0.7.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@@ -693,9 +693,9 @@ GEM
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
- railties (5.0.7.1)
- actionpack (= 5.0.7.1)
- activesupport (= 5.0.7.1)
+ railties (5.0.7.2)
+ actionpack (= 5.0.7.2)
+ activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -1150,7 +1150,7 @@ DEPENDENCIES
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
- rails (= 5.0.7.1)
+ rails (= 5.0.7.2)
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index 7fcada47777..0116da7ca94 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -17,66 +17,80 @@
};
actioncable = {
dependencies = ["actionpack" "nio4r" "websocket-driver"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb";
+ sha256 = "14qy7aygsr35lhcrw2y0c1jxmkfjlcz10p7qcf9jxzhcfmk5rr3y";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm";
+ sha256 = "17whd0cjkb038g14pmkmakp89085j5950jdmfa5hmzqf1djnvc8r";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw";
+ sha256 = "1wyyj014n0gza5m2gpg9ab9av4yr6psvym047nrn1iz84v6fmkfb";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1";
+ sha256 = "0w96iqknr5jz7gzlcyixq1lvhbzbqijj4iq22pbfzscppbz1anvi";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv";
+ sha256 = "1281zl53a5dpl33vxswrg2jxv7kpcyl7mg5mckn4hcksna60356l";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activemodel = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c";
+ sha256 = "0xphpzx3ippi8f2h27v2g3n82i39xwx2gq9yamhby9s2a9hh8shl";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c";
+ sha256 = "1jy2amhn2xsd9hy546mw27agh8493nqlgbmzqhlppx7p3nwikw63";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
activerecord_sane_schema_dumper = {
dependencies = ["rails"];
@@ -89,12 +103,14 @@
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb";
+ sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@@ -1259,12 +1275,14 @@
};
globalid = {
dependencies = ["activesupport"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
+ sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
type = "gem";
};
- version = "0.4.1";
+ version = "0.4.2";
};
gon = {
dependencies = ["actionpack" "multi_json" "request_store"];
@@ -1549,12 +1567,14 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "1.2.0";
+ version = "1.6.0";
};
icalendar = {
source = {
@@ -2552,12 +2572,14 @@
};
rails = {
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+ groups = ["default" "development" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w";
+ sha256 = "0amqbd8kl6vmilfhlkf2w0l33x688jssjbra7s717kjqzb4fmqiw";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@@ -2606,12 +2628,14 @@
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
+ groups = ["default" "development" "mysql" "postgres" "test"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr";
+ sha256 = "064w0n33l0wik5i00b4ry7iqv1nb3xhdpjvm55ycx2abpqnlrhjd";
type = "gem";
};
- version = "5.0.7.1";
+ version = "5.0.7.2";
};
rainbow = {
source = {
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 9e42880dd7d..2cca53d6fe7 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
- version = "4.9";
+ version = "4.9.1";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
- sha256 = "01na1ymdlh9nd121gmq3vkssr183sd2fcwjfdnq5n5fpys6bazjc";
+ sha256 = "0c5gp5wyaiyh8w2zzy1q0f2qv8aa3219shb6swpsdzqr2j9gkk4b";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
@@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec {
meta = {
description = "Qt based graphical tool for working with Mercurial";
- homepage = http://tortoisehg.bitbucket.org/;
+ homepage = https://tortoisehg.bitbucket.io/;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ danbst ];
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 75433fe4c59..2d0c16aa2f4 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -97,7 +97,7 @@ if [ -z "$oldUrl" ]; then
fi
drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
-oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).${versionKey}" | tr -d '"')
+oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"')
if [ -z "$drvName" -o -z "$oldVersion" ]; then
die "Couldn't evaluate name and version from '$attr.name'!"
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
index d7963f6395a..52d11bfd622 100644
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ b/pkgs/data/fonts/twemoji-color-font/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec {
- name = "twemoji-color-font-${meta.version}";
+ pname = "twemoji-color-font";
+ version = "12.0.1";
src = fetchFromGitHub {
owner = "eosrei";
repo = "twemoji-color-font";
- rev = "v${meta.version}";
- sha256 = "07yawvbdkk15d7ac9dj7drs1rqln9sba1fd6jx885ms7ww2sfm7r";
+ rev = "v${version}";
+ sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
};
nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
@@ -21,7 +22,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- version = "11.2.0";
description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
longDescription = ''
A color and B&W emoji SVGinOT font built from the Twitter Emoji for
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 3ec29402b1a..11be8acc259 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/179aac2faddbba8921029ca9851ad97bcaa79991.tar.gz";
- sha256 = "17cbapnvpasdpza2r1y7lf4y4b31k094jqsnx89dn8zwp8n862lv";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f0c3944190bf34286e4e80620fede11dd688f68.tar.gz";
+ sha256 = "1i4k4wjm6w8hgwia1axwdr3ij0ckxh3ikc1f0nlk8sb0j3yrmxa6";
}
diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/data/themes/tetra/default.nix
similarity index 82%
rename from pkgs/misc/themes/tetra/default.nix
rename to pkgs/data/themes/tetra/default.nix
index 3f36ea8f01b..2a7b6e595c4 100644
--- a/pkgs/misc/themes/tetra/default.nix
+++ b/pkgs/data/themes/tetra/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3, sassc }:
stdenv.mkDerivation rec {
- name = "tetra-gtk-theme-${version}";
- version = "201903";
+ pname = "tetra-gtk-theme";
+ version = "201905";
src = fetchFromGitHub {
owner = "hrdwrrsk";
- repo = "tetra-gtk-theme";
+ repo = pname;
rev = version;
- sha256 = "0ycxvz16gg8rjlg71dzbfnqlh0y62v35j8dvgs8rckfb48xm0xvs";
+ sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi";
};
preBuild = ''
diff --git a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch b/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch
new file mode 100644
index 00000000000..87b76045b43
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch
@@ -0,0 +1,39 @@
+From c48867b73485b34b95f14e9b9bbb54507fc77648 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Fri, 19 Apr 2019 18:21:49 -0300
+Subject: [PATCH] Use an environment variable for the plugins directory
+
+---
+ frame/controller/dockpluginscontroller.cpp | 2 +-
+ plugins/tray/system-trays/systemtrayscontroller.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp
+index 32a5885..efd53c8 100644
+--- a/frame/controller/dockpluginscontroller.cpp
++++ b/frame/controller/dockpluginscontroller.cpp
+@@ -126,7 +126,7 @@ void DockPluginsController::startLoader()
+ {
+ QString pluginsDir("../plugins");
+ if (!QDir(pluginsDir).exists()) {
+- pluginsDir = "/usr/lib/dde-dock/plugins";
++ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins");
+ }
+ qDebug() << "using dock plugins dir:" << pluginsDir;
+
+diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp
+index 0c8ca88..7c47d25 100644
+--- a/plugins/tray/system-trays/systemtrayscontroller.cpp
++++ b/plugins/tray/system-trays/systemtrayscontroller.cpp
+@@ -159,7 +159,7 @@ void SystemTraysController::startLoader()
+ {
+ QString pluginsDir("../plugins/system-trays");
+ if (!QDir(pluginsDir).exists()) {
+- pluginsDir = "/usr/lib/dde-dock/plugins/system-trays";
++ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins") + "/system-trays";
+ }
+ qDebug() << "using system tray plugins dir:" << pluginsDir;
+
+--
+2.21.0
+
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
new file mode 100644
index 00000000000..30ec61f73c3
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
+ qtsvg, libsForQt5, polkit, gsettings-qt, dtkcore, dtkwidget,
+ dde-qt-dbus-factory, dde-network-utils, dde-daemon,
+ deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin,
+ plugins ? [], symlinkJoin, makeWrapper }:
+
+let
+unwrapped = stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "dde-dock";
+ version = "4.9.9";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "0vscm808q63bbl84q9l3vhhd8mw86wfjdh55rvyj42qpa5q4mvlz";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ qttools
+ wrapGAppsHook
+ deepin.setupHook
+ ];
+
+ buildInputs = [
+ dde-daemon
+ dde-network-utils
+ dde-qt-dbus-factory
+ deepin-desktop-schemas
+ dtkcore
+ dtkwidget
+ glib.bin
+ gsettings-qt
+ libsForQt5.libdbusmenu
+ polkit
+ qtsvg
+ qtx11extras
+ xorg.libXdmcp
+ xorg.libXtst
+ xorg.libpthreadstubs
+ ];
+
+ patches = [
+ ./dde-dock.plugins-dir.patch
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths
+ patchShebangs translate_generation.sh
+ fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt
+ fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake
+ fixPath $out /usr dde-dock.pc
+ fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service
+ fixPath $out /usr/share/dbus-1 CMakeLists.txt
+ fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp
+ fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp
+ fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp
+
+ substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out
+ substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out
+ '';
+
+ cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ];
+
+ postFixup = ''
+ searchHardCodedPaths $out
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "Dock for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/dde-dock;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+};
+
+in if plugins == [] then unwrapped
+ else import ./wrapper.nix {
+ inherit makeWrapper symlinkJoin plugins;
+ dde-dock = unwrapped;
+ }
diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/pkgs/desktops/deepin/dde-dock/wrapper.nix
new file mode 100644
index 00000000000..8f6d8a67b1a
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-dock/wrapper.nix
@@ -0,0 +1,21 @@
+{ makeWrapper, symlinkJoin, dde-dock, plugins }:
+
+symlinkJoin {
+ name = "dde-dock-with-plugins-${dde-dock.version}";
+
+ paths = [ dde-dock ] ++ plugins;
+
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram $out/bin/dde-dock \
+ --set DDE_DOCK_PLUGINS_DIR "$out/lib/dde-dock/plugins"
+
+ rm $out/share/dbus-1/services/com.deepin.dde.Dock.service
+
+ substitute ${dde-dock}/share/dbus-1/services/com.deepin.dde.Dock.service $out/share/dbus-1/services/com.deepin.dde.Dock.service \
+ --replace ${dde-dock} $out
+ '';
+
+ inherit (dde-dock) meta;
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 10e25cedc4b..6a1fb5d97b7 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -10,8 +10,9 @@ let
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
dde-daemon = callPackage ./dde-daemon { };
- dde-polkit-agent = callPackage ./dde-polkit-agent { };
+ dde-dock = callPackage ./dde-dock { };
dde-network-utils = callPackage ./dde-network-utils { };
+ dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 75c34b4b99d..dd2a02b6be8 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gnome-shell-gsconnect-${version}";
- version = "21";
+ version = "23";
src = fetchFromGitHub {
owner = "andyholmes";
repo = "gnome-shell-extension-gsconnect";
rev = "v${version}";
- sha256 = "0ikkb2rly3h4qglswn15vs8f2kl727gpri5c9x3jiy27ylag7yav";
+ sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid";
};
patches = [
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index c1bedc972df..6e54b137ba1 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -37,8 +37,22 @@ stdenv.mkDerivation rec {
mate.mate-settings-daemon
];
+ patches = [
+ # look up keyboard shortcuts in system data dirs
+ ./mate-control-center.keybindings-dir.patch
+ ];
+
configureFlags = [ "--disable-update-mimedb" ];
+ preFixup = ''
+ gappsWrapperArgs+=(
+ # WM keyboard shortcuts
+ --prefix XDG_DATA_DIRS : "${mate.marco}/share"
+ )
+ '';
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Utilities to configure the MATE desktop";
homepage = https://github.com/mate-desktop/mate-control-center;
diff --git a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch b/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
new file mode 100644
index 00000000000..4a3036ae16e
--- /dev/null
+++ b/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
@@ -0,0 +1,106 @@
+From faeb322b01d3856f3cf163470cc38f4e88a8527c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Sun, 28 Apr 2019 21:45:39 -0300
+Subject: [PATCH] Use system data dirs to locate key bindings
+
+---
+ capplets/keybindings/Makefile.am | 3 +-
+ .../keybindings/mate-keybinding-properties.c | 58 ++++++++++++-------
+ 2 files changed, 39 insertions(+), 22 deletions(-)
+
+diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
+index e5efb109..9501dd8f 100644
+--- a/capplets/keybindings/Makefile.am
++++ b/capplets/keybindings/Makefile.am
+@@ -33,8 +33,7 @@ AM_CPPFLAGS = \
+ $(MATECC_CAPPLETS_CFLAGS) \
+ -DMATELOCALEDIR="\"$(datadir)/locale\"" \
+ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
+- -DMATECC_UI_DIR="\"$(uidir)\"" \
+- -DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\""
++ -DMATECC_UI_DIR="\"$(uidir)\""
+ CLEANFILES = \
+ $(MATECC_CAPPLETS_CLEANFILES) \
+ $(desktop_DATA) \
+diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c
+index 4f257333..cf1891d2 100644
+--- a/capplets/keybindings/mate-keybinding-properties.c
++++ b/capplets/keybindings/mate-keybinding-properties.c
+@@ -1033,39 +1033,57 @@ static void
+ reload_key_entries (GtkBuilder *builder)
+ {
+ gchar **wm_keybindings;
+- GDir *dir;
+- const char *name;
+ GList *list, *l;
++ const gchar * const * data_dirs;
++ GHashTable *loaded_files;
++ guint i;
+
+ wm_keybindings = wm_common_get_current_keybindings();
+
+ clear_old_model (builder);
+
+- dir = g_dir_open (MATECC_KEYBINDINGS_DIR, 0, NULL);
+- if (!dir)
+- return;
+-
+- list = NULL;
+- for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
++ loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
++ data_dirs = g_get_system_data_dirs ();
++ for (i = 0; data_dirs[i] != NULL; i++)
+ {
+- if (g_str_has_suffix (name, ".xml"))
++ g_autofree gchar *dir_path = NULL;
++ GDir *dir;
++ const gchar *name;
++
++ dir_path = g_build_filename (data_dirs[i], "mate-control-center", "keybindings", NULL);
++ g_debug ("Keybinding dir: %s", dir_path);
++
++ dir = g_dir_open (dir_path, 0, NULL);
++ if (!dir)
++ continue;
++
++ for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
+ {
+- list = g_list_insert_sorted (list, g_strdup (name),
+- (GCompareFunc) g_ascii_strcasecmp);
+- }
+- }
+- g_dir_close (dir);
++ if (g_str_has_suffix (name, ".xml") == FALSE)
++ continue;
++
++ if (g_hash_table_lookup (loaded_files, name) != NULL)
++ {
++ g_debug ("Not loading %s, it was already loaded from another directory", name);
++ continue;
++ }
+
++ g_hash_table_insert (loaded_files, g_strdup (name), g_strdup (dir_path));
++ }
++
++ g_dir_close (dir);
++ }
++ list = g_hash_table_get_keys (loaded_files);
++ list = g_list_sort(list, (GCompareFunc) g_str_equal);
+ for (l = list; l != NULL; l = l->next)
+ {
+- gchar *path;
+-
+- path = g_build_filename (MATECC_KEYBINDINGS_DIR, l->data, NULL);
+- append_keys_to_tree_from_file (builder, path, wm_keybindings);
+- g_free (l->data);
+- g_free (path);
++ g_autofree gchar *path = NULL;
++ path = g_build_filename (g_hash_table_lookup (loaded_files, l->data), l->data, NULL);
++ g_debug ("Keybinding file: %s", path);
++ append_keys_to_tree_from_file (builder, path, wm_keybindings);
+ }
+ g_list_free (list);
++ g_hash_table_destroy (loaded_files);
+
+ /* Load custom shortcuts _after_ system-provided ones,
+ * since some of the custom shortcuts may also be listed
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 21cb26aaa39..f5fbb0a51cf 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
- version = "2.1.7";
+ version = "2.1.8";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql";
+ sha256 = "1xpgkvcv3bylpaj7c80727vr55vilkgjvnlbw7d5pr56v6mv7n9j";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 405e2d93425..28b226bdedb 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1kd1w3mxysg33niryrz5yp6fdayzjpg73ihvq7dlasj8ls5d0qyj";
+ sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc";
};
passthru = {
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index de7e3bd6a07..1c8e9fb7eb2 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -33,13 +33,13 @@ let
};
in
stdenv.mkDerivation rec {
- version = "0.3.1";
+ version = "0.5.0";
name = "mint-${version}";
src = fetchFromGitHub {
owner = "mint-lang";
repo = "mint";
rev = version;
- sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr";
+ sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
};
nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ];
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index fbf85ef8042..dc6866e3af3 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -8,8 +8,8 @@
ameba = {
owner = "veelenga";
repo = "ameba";
- rev = "v0.8.0";
- sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka";
+ rev = "v0.9.1";
+ sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj";
};
baked_file_system = {
owner = "schovi";
@@ -23,23 +23,23 @@
rev = "51962dc36f9bbb1b926d557f7cb8993a6c73cc63";
sha256 = "1nwnsxm8srfw8jg0yfi2v19x6j3dadx62hq0xpxra40qcqz9dbnp";
};
- duktape = {
- owner = "jessedoyle";
- repo = "duktape.cr";
- rev = "v0.14.1";
- sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1";
+ dotenv = {
+ owner = "gdotdesign";
+ repo = "cr-dotenv";
+ rev = "v0.2.0";
+ sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7";
};
exception_page = {
owner = "crystal-loot";
repo = "exception_page";
- rev = "v0.1.1";
- sha256 = "0pimjm64p21cjhp0jhcgdmbgisx7amk8hhbkcprkbr44bj6rv9ay";
+ rev = "v0.1.2";
+ sha256 = "0j5ishhyriq9p339yaawrmawl9wgmp1paniq30a8d6a0568h3avq";
};
kemal = {
owner = "kemalcr";
repo = "kemal";
- rev = "v0.24.0";
- sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k";
+ rev = "v0.25.1";
+ sha256 = "1334i905xj6vlmp8acyybwwlaxsgmf90b59da7brzpnf28wci782";
};
kilt = {
owner = "jeromegn";
@@ -50,8 +50,8 @@
radix = {
owner = "luislavena";
repo = "radix";
- rev = "v0.3.8";
- sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva";
+ rev = "v0.3.9";
+ sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix";
};
string_inflection = {
owner = "mosop";
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index ddfd5d0a3fd..a498eafd425 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
- version = "1.10.2";
+ version = "1.10.4";
src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
- rev = "Release-1.10.2";
- sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7";
+ rev = "Release-1.10.4";
+ sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 783edb599f7..4aa21ca04d5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -871,38 +871,17 @@ self: super: {
# https://github.com/takano-akio/filelock/issues/5
filelock = dontCheck super.filelock;
- # fix GHC 8.6 builds by using irrefutable patterns. jailbreak is also
- # required due to a constraint failure for base-compat.
- cryptol = doJailbreak (overrideCabal super.cryptol (drv: {
-
- # the last patch fixes ghc 8.6 builds; the other two (small) patches fix a
- # few bugs between them, but are also hard dependencies
- patches = drv.patches or [] ++ [
- (pkgs.fetchpatch {
- url = https://github.com/GaloisInc/cryptol/commit/634c5a03e757663bf86d1ffad1ce2c6086d4483f.patch;
- sha256 = "16dvfihsl2c4jnyfndgrjarkm3z5pyn7rzg2svnidx0qipwrxzm7";
- })
- (pkgs.fetchpatch {
- url = https://github.com/GaloisInc/cryptol/commit/515642328aff6d958ff1b534b9effdd726901b60.patch;
- sha256 = "1fml71b720igyh8s7mj1z1c2bbv1vk490iy7blvxp625nymzjij6";
- })
- (pkgs.fetchpatch {
- url = https://github.com/GaloisInc/cryptol/commit/a8eab11b319f6434f9b01b26d419b8305ff30bc2.patch;
- sha256 = "1bbznp3kbj8l83q979gf4gr2khwbyqi85ykwsf2jnkhzda6pr0n8";
- })
- ];
-
+ # Wrap the generated binaries to include their run-time dependencies in
+ # $PATH. Also, cryptol needs a version of sbl that's newer than what we have
+ # in LTS-13.x.
+ cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: {
buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
-
- # make sure the binaries always start up. previously this was in
- # all-packages.nix but it's almost certainly better to do it here (e.g. a
- # haskell deps may use cryptol in the test suite or something, etc)
postInstall = drv.postInstall or "" + ''
for b in $out/bin/cryptol $out/bin/cryptol-html; do
wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin"
done
'';
- }));
+ });
# Tests try to invoke external process and process == 1.4
grakn = dontCheck (doJailbreak super.grakn);
@@ -1223,15 +1202,10 @@ self: super: {
sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4";
});
- # These patches contain fixes for 8.6 that should be safe for
- # earlier versions, but we need the relaxed version bounds in GHC
- # 8.4 builds. beam needs to release a round of updates that relax
- # bounds and include the 8.6 fixes:
- # https://github.com/tathougies/beam/issues/315
- beam-core = appendPatch super.beam-core ./patches/beam-core-fix-ghc-8.6.x-build.patch;
- beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch;
- beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch;
- beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch;
+ # Requires pg_ctl command during tests
+ beam-postgres = overrideCabal super.beam-postgres (drv: {
+ testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
+ });
# https://github.com/sighingnow/computations/pull/1
primesieve = appendPatch super.primesieve (pkgs.fetchpatch {
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0795ca0f723..5952cbd16c2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3014,12 +3014,7 @@ broken-packages:
- bdcs
- bdcs-api
- beam
- - beam-core
- - beam-migrate
- - beam-mysql
- beam-newtype-field
- - beam-postgres
- - beam-sqlite
- beam-th
- beamable
- beautifHOL
@@ -8049,6 +8044,7 @@ broken-packages:
- reflex-backend-wai
- reflex-basic-host
- reflex-dom-core
+ - reflex-dom-svg
- reflex-gloss
- reflex-gloss-scene
- reflex-orphans
@@ -9947,6 +9943,7 @@ broken-packages:
- yesod-markdown
- yesod-paginate
- yesod-pagination
+ - yesod-paginator
- yesod-paypal-rest
- yesod-platform
- yesod-pnotify
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e13edb35268..97ac7757e8a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -21193,8 +21193,8 @@ self: {
}:
mkDerivation {
pname = "accelerate-blas";
- version = "0.2.0.0";
- sha256 = "0y77wsdw0i7b5bzlfrrn9q4d8q95r8z71g8qy77n24db1pwmjqy9";
+ version = "0.2.0.1";
+ sha256 = "00869y2zrh43sl0rap8bbgnzqdvrrxpc2qhzz0zdfasr3440py6k";
libraryHaskellDepends = [
accelerate accelerate-llvm accelerate-llvm-native
accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda
@@ -21289,18 +21289,18 @@ self: {
({ mkDerivation, accelerate, accelerate-fft, accelerate-io
, accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base
, binary, bmp, bytestring, bytestring-lexing, cereal
- , colour-accelerate, containers, criterion, directory, fclabels
- , filepath, gloss, gloss-accelerate, gloss-raster-accelerate
- , gloss-rendering, HUnit, lens-accelerate, linear
- , linear-accelerate, matrix-market-attoparsec, mwc-random
+ , colour-accelerate, containers, criterion, criterion-measurement
+ , directory, fclabels, filepath, gloss, gloss-accelerate
+ , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate
+ , linear, linear-accelerate, matrix-market-attoparsec, mwc-random
, normaldistribution, QuickCheck, random, repa, repa-io, scientific
, test-framework, test-framework-hunit, test-framework-quickcheck2
, vector, vector-algorithms
}:
mkDerivation {
pname = "accelerate-examples";
- version = "1.2.0.0";
- sha256 = "1gb4m1ri461f78x913ipxh14ybwl9wzbv81w8943whiwrmb3p5pc";
+ version = "1.2.0.1";
+ sha256 = "0hzk6zas03yhh8xjjrh772knhbvisl0r6q10y4mcq552bcfd8yvj";
configureFlags = [ "-f-opencl" ];
isLibrary = true;
isExecutable = true;
@@ -21313,10 +21313,10 @@ self: {
executableHaskellDepends = [
accelerate accelerate-fft accelerate-io base binary bmp bytestring
bytestring-lexing cereal colour-accelerate containers criterion
- directory fclabels filepath gloss gloss-accelerate
- gloss-raster-accelerate gloss-rendering lens-accelerate
- linear-accelerate matrix-market-attoparsec mwc-random
- normaldistribution random repa repa-io scientific vector
+ criterion-measurement directory fclabels filepath gloss
+ gloss-accelerate gloss-raster-accelerate gloss-rendering
+ lens-accelerate linear-accelerate matrix-market-attoparsec
+ mwc-random normaldistribution random repa repa-io scientific vector
vector-algorithms
];
description = "Examples using the Accelerate library";
@@ -23080,6 +23080,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "aeson-diff_1_1_0_7" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, doctest
+ , edit-distance-vector, filepath, Glob, hashable, mtl
+ , optparse-applicative, QuickCheck, quickcheck-instances
+ , scientific, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "aeson-diff";
+ version = "1.1.0.7";
+ sha256 = "01d48pd7d1mb9cd5yxfajln8rmjdjq8ch91s0lav4qw1azv6vp2r";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring edit-distance-vector hashable mtl scientific
+ text unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring optparse-applicative text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory doctest filepath Glob QuickCheck
+ quickcheck-instances text unordered-containers vector
+ ];
+ description = "Extract and apply patches to JSON documents";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson-diff-generic" = callPackage
({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring
, containers, dlist, hashable, lens, scientific, tagged
@@ -24296,6 +24324,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "alarmclock_0_7_0_1" = callPackage
+ ({ mkDerivation, async, base, clock, hspec, stm, time
+ , unbounded-delays
+ }:
+ mkDerivation {
+ pname = "alarmclock";
+ version = "0.7.0.1";
+ sha256 = "08y3qzm1z28k819xg2qz3dbj0kpynxmhs5bwa6rmgw52sxbiwlnf";
+ libraryHaskellDepends = [
+ async base clock stm time unbounded-delays
+ ];
+ testHaskellDepends = [
+ async base clock hspec stm time unbounded-delays
+ ];
+ description = "Wake up and perform an action at a certain time";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"alea" = callPackage
({ mkDerivation, base, optparse-applicative, random, text }:
mkDerivation {
@@ -33311,8 +33358,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "29";
- editedCabalFile = "07vc32yn5d954higzxg3c94l3wzgc38b7y2xq8c5rkxwqz8xf97s";
+ revision = "30";
+ editedCabalFile = "0z7awvdz7447gjgg98z8682d7q1gqn85qcm0dsdgrhv67rkfnadz";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -36011,8 +36058,6 @@ self: {
];
description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"beam-migrate" = callPackage
@@ -36033,8 +36078,6 @@ self: {
];
description = "SQL DDL support and migrations support library for Beam";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"beam-mysql" = callPackage
@@ -36052,8 +36095,6 @@ self: {
];
description = "Connection layer between beam and MySQL/MariaDB";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"beam-newtype-field" = callPackage
@@ -36097,8 +36138,6 @@ self: {
];
description = "Connection layer between beam and postgres";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"beam-sqlite" = callPackage
@@ -36116,8 +36155,6 @@ self: {
];
description = "Beam driver for SQLite";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"beam-th" = callPackage
@@ -37957,8 +37994,8 @@ self: {
({ mkDerivation, base, bindings-DSL }:
mkDerivation {
pname = "bindings-hdf5";
- version = "0.1";
- sha256 = "0x6p1mwwnpcd5bd6iy4di11n7b45c4zp9d6l957mmhsyg24h2n79";
+ version = "0.1.2";
+ sha256 = "1d94irqliswjqx65k147mj8i9j34xhfn5lyk5xa7ycf3m5b1g95z";
libraryHaskellDepends = [ base bindings-DSL ];
description = "Project bindings-* raw interface to HDF5 library";
license = stdenv.lib.licenses.bsd3;
@@ -43150,6 +43187,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "byteslice" = callPackage
+ ({ mkDerivation, base, primitive }:
+ mkDerivation {
+ pname = "byteslice";
+ version = "0.1.0.0";
+ sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg";
+ libraryHaskellDepends = [ base primitive ];
+ description = "Slicing ByteArray and MutableByteArray";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bytestring_0_10_8_2" = callPackage
({ mkDerivation, base, byteorder, deepseq, directory, dlist
, ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random
@@ -45126,6 +45174,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cache_0_1_1_2" = callPackage
+ ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "cache";
+ version = "0.1.1.2";
+ sha256 = "0b0jggcbnrs0pppn60kaggxkwmg0ri7b1i4j5613abgw8bj258s8";
+ libraryHaskellDepends = [
+ base clock hashable stm transformers unordered-containers
+ ];
+ testHaskellDepends = [ base clock hspec stm transformers ];
+ description = "An in-memory key/value store with expiration support";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cached" = callPackage
({ mkDerivation, base, containers, directory, doctest, filepath
, protolude, QuickCheck, quickcheck-assertions, shake, text
@@ -49106,10 +49171,8 @@ self: {
}:
mkDerivation {
pname = "chronos";
- version = "1.0.4";
- sha256 = "1v9v237473d3fg45sqhx1ksmgvy7p144jdw0a4bvlma01fbzk09h";
- revision = "1";
- editedCabalFile = "0796ic47hmzard8bmgnj0kww32afp8lppx3l5c85nafk7dasykyn";
+ version = "1.0.5";
+ sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock hashable primitive
semigroups text torsor vector
@@ -49120,7 +49183,7 @@ self: {
];
benchmarkHaskellDepends = [
attoparsec base bytestring criterion deepseq old-locale QuickCheck
- thyme time vector
+ text thyme time vector
];
description = "A performant time library";
license = stdenv.lib.licenses.bsd3;
@@ -53101,12 +53164,17 @@ self: {
}) {};
"comic" = callPackage
- ({ mkDerivation, aeson, base, text }:
+ ({ mkDerivation, aeson, base, deepseq, hashable, hashable-orphans
+ , lens, sorted-list, text, time, uuid
+ }:
mkDerivation {
pname = "comic";
- version = "0";
- sha256 = "00y23pd6pp4siggs0wkf102phi961dyfffbj5wjsvmhlg2nv5hg3";
- libraryHaskellDepends = [ aeson base text ];
+ version = "0.0.1";
+ sha256 = "1hr2dwj9d3wlwdalcr51jjvlk8lg92lhds25vxvjszpxf6nch20k";
+ libraryHaskellDepends = [
+ aeson base deepseq hashable hashable-orphans lens sorted-list text
+ time uuid
+ ];
description = "A format for describing comics";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -56079,8 +56147,8 @@ self: {
}:
mkDerivation {
pname = "constraints-deriving";
- version = "1.0.1.0";
- sha256 = "0jsqm1d8341i98vg98l01sg0vhw398z1x3lf68kz380qiy7paz4c";
+ version = "1.0.1.1";
+ sha256 = "08dggdvl4qgx376vh037ss2blha4x7qmf0xh0fjx4m4ljabg3k4f";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal ];
@@ -59543,26 +59611,24 @@ self: {
"cryptol" = callPackage
({ mkDerivation, alex, ansi-terminal, array, base, base-compat
- , blaze-html, bytestring, containers, criterion, deepseq, directory
- , filepath, gitrev, GraphSCC, happy, haskeline, heredoc
- , monad-control, monadLib, mtl, panic, pretty, process, random, sbv
- , simple-smt, strict, text, tf-random, time, transformers
- , transformers-base
+ , blaze-html, bytestring, containers, criterion, cryptohash-sha1
+ , deepseq, directory, filepath, gitrev, GraphSCC, happy, haskeline
+ , heredoc, monad-control, monadLib, mtl, panic, pretty, process
+ , random, sbv, simple-smt, strict, text, tf-random, time
+ , transformers, transformers-base
}:
mkDerivation {
pname = "cryptol";
- version = "2.6.0";
- sha256 = "0hlgff177s8lhv3s90cmqc3x2xr60g3vxvc7p1mhzb354zxbp2jz";
- revision = "1";
- editedCabalFile = "1smkc0gxbj1vl626iiy56aarx6rcnjzqprqzh443222samrrzr25";
+ version = "2.7.0";
+ sha256 = "14yk7qs7laxy5ranx9m911k1lxc4vh4pp83ywmsg1kf0cdfvmij6";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- array base base-compat bytestring containers deepseq directory
- filepath gitrev GraphSCC heredoc monad-control monadLib mtl panic
- pretty process random sbv simple-smt strict text tf-random time
- transformers-base
+ array base base-compat bytestring containers cryptohash-sha1
+ deepseq directory filepath gitrev GraphSCC heredoc monad-control
+ monadLib mtl panic pretty process random sbv simple-smt strict text
+ tf-random time transformers-base
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [
@@ -60804,8 +60870,8 @@ self: {
}:
mkDerivation {
pname = "cyclotomic";
- version = "0.5.1";
- sha256 = "1zazdzsiv42p244f0js2fj81l6wkv0s46rfcl9hyabzcq6x9h87p";
+ version = "1.0";
+ sha256 = "15mp9wi83anv1vxc6649agak4zn4fqyh2vik5f983269h4xsv12j";
libraryHaskellDepends = [ arithmoi base containers ];
testHaskellDepends = [
base HUnit QuickCheck test-framework test-framework-hunit
@@ -62396,8 +62462,8 @@ self: {
pname = "data-interval";
version = "1.3.0";
sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9";
- revision = "2";
- editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s";
+ revision = "3";
+ editedCabalFile = "0jfqgijikf11lqsvbj0rc2b9n2ym7gn4mhk5xpsginp0vy3bgpbp";
libraryHaskellDepends = [
base containers deepseq extended-reals hashable lattices
];
@@ -74771,16 +74837,16 @@ self: {
, directory, exceptions, monad-loops, process, QuickCheck
, quickcheck-instances, quickcheck-properties, quickcheck-text
, random, retry, SafeSemaphore, semigroups, stm, text, time
- , transformers, transformers-either
+ , transformers, transformers-either, unordered-containers
}:
mkDerivation {
pname = "entwine";
- version = "0.0.3";
- sha256 = "0x4ghpskgpls028fp74mmxqb6hrhcfvdxbfny2bniclh9826fiij";
+ version = "0.0.4";
+ sha256 = "1k150jbn2jb4ckadmcb655x7ck1cw659zkv03ngwp0wmx8l51n6b";
libraryHaskellDepends = [
async base clock containers exceptions monad-loops retry
SafeSemaphore semigroups stm text time transformers
- transformers-either
+ transformers-either unordered-containers
];
testHaskellDepends = [
async base directory exceptions process QuickCheck
@@ -76002,7 +76068,7 @@ self: {
broken = true;
}) {};
- "esqueleto_2_7_0" = callPackage
+ "esqueleto_3_0_0" = callPackage
({ mkDerivation, base, blaze-html, bytestring, conduit, containers
, hspec, monad-logger, mysql, mysql-simple, persistent
, persistent-mysql, persistent-postgresql, persistent-sqlite
@@ -76012,8 +76078,8 @@ self: {
}:
mkDerivation {
pname = "esqueleto";
- version = "2.7.0";
- sha256 = "1cxf26qfymsx578yzpmpdhs7w79s3xw5ar8d359cxbk04j0im2ib";
+ version = "3.0.0";
+ sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy";
libraryHaskellDepends = [
base blaze-html bytestring conduit monad-logger persistent
resourcet tagged text time transformers unliftio
@@ -76797,8 +76863,8 @@ self: {
}:
mkDerivation {
pname = "eventloop";
- version = "0.8.2.7";
- sha256 = "0rqgb224v9zy2kkchk2v3zwpdwh805ff03j5y5vswmc0l52bkw7w";
+ version = "0.8.2.8";
+ sha256 = "1k10f8mihxb9xsvjkmzxphin4l49f5pwbfxfan1ar7wzxyv85vjj";
libraryHaskellDepends = [
aeson base bytestring concurrent-utilities deepseq network stm
suspend text timers websockets
@@ -77920,8 +77986,8 @@ self: {
}:
mkDerivation {
pname = "expressions";
- version = "0.4.2";
- sha256 = "0lps0grvknsp0sfsqnd6kxfh6xf518x9ii11s7fy03qcl0v51da5";
+ version = "0.5";
+ sha256 = "1xp6rfiak6a8mg20xjdimcqna1g99a7gafgzrvpala3i06wjb3ia";
libraryHaskellDepends = [
attoparsec base containers free lattices singletons text
transformers
@@ -77939,8 +78005,8 @@ self: {
}:
mkDerivation {
pname = "expressions-z3";
- version = "0.4";
- sha256 = "1m3s9rm4767z68wpl92vryhg1sb0pllrv18x5x53amfa7kf6vrvv";
+ version = "0.5";
+ sha256 = "1l9h88hvbnl0y8yz5drzn2smnll3wsk6ni4qn752m51g9hm4qvjf";
libraryHaskellDepends = [
base containers expressions list-t singletons transformers z3
];
@@ -78788,8 +78854,8 @@ self: {
}:
mkDerivation {
pname = "fast-builder";
- version = "0.1.0.0";
- sha256 = "1sc5hgiagjcsblbzlymd9z140ybmq03l6xykksjdx0xkwj4sqrp2";
+ version = "0.1.0.1";
+ sha256 = "0ykl1s29kma3bxvv1jfi7q8yv9vmbn1lsrfyn7axgi51j4g06x32";
libraryHaskellDepends = [ base bytestring ghc-prim ];
testHaskellDepends = [ base bytestring process QuickCheck stm ];
benchmarkHaskellDepends = [
@@ -79189,8 +79255,8 @@ self: {
({ mkDerivation, base, fay }:
mkDerivation {
pname = "fay-base";
- version = "0.21.1.0";
- sha256 = "1i19q04a4z3aix8njw5im8ixkw7l53xfhff0rrgx3ibnf9jy752z";
+ version = "0.21.1.1";
+ sha256 = "09fnivdghxc750gpsa3hr7vgj3hff21zj7k73dfkxbkaj48bpf7q";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base fay ];
description = "The base package for Fay";
@@ -80717,6 +80783,19 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "filelock_0_1_1_3" = callPackage
+ ({ mkDerivation, async, base, process, unix }:
+ mkDerivation {
+ pname = "filelock";
+ version = "0.1.1.3";
+ sha256 = "04qimhz78jjndk686dblkx06l9jscq2q9gyr014a4pbfj4iljgi5";
+ libraryHaskellDepends = [ base unix ];
+ testHaskellDepends = [ async base process ];
+ description = "Portable interface to file locking (flock / LockFileEx)";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"filemanip" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, mtl
, unix-compat
@@ -83577,6 +83656,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "forma_1_1_2" = callPackage
+ ({ mkDerivation, aeson, base, containers, hspec, mtl, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "forma";
+ version = "1.1.2";
+ sha256 = "1ppgqwqm157ygj992r0cbarfii127g7nm63wbnrqvr9k1wmnlxx0";
+ libraryHaskellDepends = [
+ aeson base containers mtl text unordered-containers
+ ];
+ testHaskellDepends = [ aeson base containers hspec mtl text ];
+ description = "Parse and validate forms in JSON format";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"formal" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, containers
, directory, file-embed, HTTP, indents, interpolatedstring-perl6
@@ -87585,6 +87681,17 @@ self: {
broken = true;
}) {};
+ "generic-env" = callPackage
+ ({ mkDerivation, base, containers, text }:
+ mkDerivation {
+ pname = "generic-env";
+ version = "0.1.1.0";
+ sha256 = "084rfdmcw071dslnw86n2w58xiqhkaldf7qjcmlizykqc15si5xh";
+ libraryHaskellDepends = [ base containers text ];
+ description = "Generic Environment Generator";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"generic-lens" = callPackage
({ mkDerivation, base, criterion, deepseq, doctest, HUnit
, inspection-testing, lens, profunctors, QuickCheck, tagged
@@ -92673,8 +92780,8 @@ self: {
}:
mkDerivation {
pname = "gitlib-test";
- version = "3.1.1";
- sha256 = "1h8kqqj298bb0bj7w4rw18jf3bz0h1rqdg8fngmp4p35c1k1kjzi";
+ version = "3.1.2";
+ sha256 = "17v84igqyhc808nzv2qsyylk9ls4kzfd9hdx1avj4vb4gc5gblzz";
libraryHaskellDepends = [
base bytestring conduit conduit-combinators exceptions gitlib hspec
hspec-expectations HUnit tagged text time transformers
@@ -114533,8 +114640,8 @@ self: {
}:
mkDerivation {
pname = "hjugement-protocol";
- version = "0.0.0.20190428";
- sha256 = "1a4lyysd63y9r3cg4vjn1zxwf3s6vrngl3d93l7pdabhvfpmdkjb";
+ version = "0.0.0.20190501";
+ sha256 = "0jhc5qjraf3v54892134g1qlsi1wrl87kv9c0m4k40hd4fkjh894";
libraryHaskellDepends = [
base bytestring containers cryptonite memory mmorph random text
transformers unordered-containers
@@ -116169,6 +116276,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hoauth2_1_8_5" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
+ , http-types, microlens, text, unordered-containers, uri-bytestring
+ , uri-bytestring-aeson
+ }:
+ mkDerivation {
+ pname = "hoauth2";
+ version = "1.8.5";
+ sha256 = "1s96zijcmsd3kfh7pjvbs4ks3hi6fkbq04pnxp9zfgr4di6ifmwz";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring exceptions http-conduit http-types microlens
+ text unordered-containers uri-bytestring uri-bytestring-aeson
+ ];
+ description = "Haskell OAuth2 authentication client";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hob" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango
@@ -118277,8 +118404,8 @@ self: {
}:
mkDerivation {
pname = "hpqtypes-extras";
- version = "1.7.1.0";
- sha256 = "0fxa92lvw61d48dbgk24bcx2kjbw8k8gpzbbi7z2d8k3z2b9alfk";
+ version = "1.8.0.0";
+ sha256 = "1q90y8qm5hmyh4q344p844p78cqi0l5w8sxzazyg3mmf8xmz9xy1";
libraryHaskellDepends = [
base base16-bytestring bytestring containers cryptohash
data-default exceptions fields-json hpqtypes lifted-base log-base
@@ -118468,8 +118595,8 @@ self: {
}:
mkDerivation {
pname = "hpython";
- version = "0.2";
- sha256 = "1c9ryyfm3cdhl3n5vqhzsxi31jl0vg5qaq1n8li1cy843bjgl63a";
+ version = "0.3";
+ sha256 = "1vbjvx87n4d6fhvgz6hbbpyfh2276d3dlq0v39jq85qsb1274ip2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121164,14 +121291,16 @@ self: {
}) {};
"hslua-module-system" = callPackage
- ({ mkDerivation, base, directory, hslua, tasty, tasty-hunit
- , temporary, text
+ ({ mkDerivation, base, containers, directory, exceptions, hslua
+ , tasty, tasty-hunit, temporary, text
}:
mkDerivation {
pname = "hslua-module-system";
- version = "0.1.0.1";
- sha256 = "1qkp8pdnh8s7wh2yfpbfg1vbr7qpywa1gsz06chmwkyva0clx2cq";
- libraryHaskellDepends = [ base directory hslua temporary ];
+ version = "0.2.0";
+ sha256 = "1yjkq6af7x1vyqxszdlb6fysv8q97q3424gycvqhdqjd8wf545b5";
+ libraryHaskellDepends = [
+ base containers directory exceptions hslua temporary
+ ];
testHaskellDepends = [ base hslua tasty tasty-hunit text ];
description = "Lua module wrapper around Haskell's System module";
license = stdenv.lib.licenses.mit;
@@ -124195,6 +124324,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-conduit_2_3_7_1" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+ , case-insensitive, conduit, conduit-extra, connection, cookie
+ , data-default-class, hspec, http-client, http-client-tls
+ , http-types, HUnit, mtl, network, resourcet, streaming-commons
+ , temporary, text, time, transformers, unliftio, unliftio-core
+ , utf8-string, wai, wai-conduit, warp, warp-tls
+ }:
+ mkDerivation {
+ pname = "http-conduit";
+ version = "2.3.7.1";
+ sha256 = "1xnjbwvil1an5crffcwapdqyinbvvss25rcdra05isqixcs26h39";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring conduit conduit-extra http-client
+ http-client-tls http-types mtl resourcet transformers unliftio-core
+ ];
+ testHaskellDepends = [
+ aeson base blaze-builder bytestring case-insensitive conduit
+ conduit-extra connection cookie data-default-class hspec
+ http-client http-types HUnit network resourcet streaming-commons
+ temporary text time transformers unliftio utf8-string wai
+ wai-conduit warp warp-tls
+ ];
+ doCheck = false;
+ description = "HTTP client package with conduit interface and HTTPS support";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-conduit-browser" = callPackage
({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
, case-insensitive, conduit, containers, cookie, data-default
@@ -131425,6 +131583,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "interpolator_0_1_2" = callPackage
+ ({ mkDerivation, aeson, base, containers, either, hspec
+ , mono-traversable, mtl, product-profunctors, profunctors
+ , QuickCheck, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "interpolator";
+ version = "0.1.2";
+ sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz";
+ libraryHaskellDepends = [
+ aeson base containers either mono-traversable mtl
+ product-profunctors profunctors QuickCheck template-haskell text
+ ];
+ testHaskellDepends = [
+ aeson base containers either hspec mono-traversable mtl
+ product-profunctors profunctors QuickCheck template-haskell text
+ ];
+ description = "Runtime interpolation of environment variables in records using profunctors";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"interprocess" = callPackage
({ mkDerivation, base, typed-process }:
mkDerivation {
@@ -138131,8 +138311,8 @@ self: {
}:
mkDerivation {
pname = "knit-haskell";
- version = "0.1.0.0";
- sha256 = "11kqv2jxjn3maj53lgbccxcjcjrfqgsi8dd2ys51aalak2pf79bx";
+ version = "0.2.0.0";
+ sha256 = "0028g05plj8dsakb2c78ryl3lcbfaagg4n1hjfj6b92cxn1bg5hv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -138935,6 +139115,8 @@ self: {
pname = "lambdabot-core";
version = "5.2";
sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss";
+ revision = "1";
+ editedCabalFile = "1srdkvyw1b0cpv2gq497x11zmqkiqpxkhhdhkd0363wayqjpg21s";
libraryHaskellDepends = [
base binary bytestring containers dependent-map dependent-sum
dependent-sum-template directory edit-distance filepath haskeline
@@ -146995,6 +147177,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "logict_0_6_0_3" = callPackage
+ ({ mkDerivation, base, mtl }:
+ mkDerivation {
+ pname = "logict";
+ version = "0.6.0.3";
+ sha256 = "1a3sqws8bc55a7sxkl406a69ls75l60syv20b5rmkd30nbdisryh";
+ libraryHaskellDepends = [ base mtl ];
+ description = "A backtracking logic-programming monad";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"logict-state" = callPackage
({ mkDerivation, base, logict, mtl, transformers }:
mkDerivation {
@@ -150506,7 +150700,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "massiv_0_3_1_0" = callPackage
+ "massiv_0_3_2_0" = callPackage
({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest
, containers, data-default, data-default-class, deepseq, doctest
, exceptions, hspec, primitive, QuickCheck, scheduler
@@ -150514,8 +150708,8 @@ self: {
}:
mkDerivation {
pname = "massiv";
- version = "0.3.1.0";
- sha256 = "0hjfnp8w3yk1kfx2avmfv3cbhrzyh89nw5zlm0r5fpgdx3gmkn6k";
+ version = "0.3.2.0";
+ sha256 = "0cap5rxy3d301ci1ysh4d0y3k4smgx6w4s7ngqkzdbw17fk74iam";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bytestring data-default-class deepseq exceptions primitive
@@ -151920,6 +152114,51 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec_7_0_5" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , criterion, deepseq, mtl, parser-combinators, scientific, text
+ , transformers, weigh
+ }:
+ mkDerivation {
+ pname = "megaparsec";
+ version = "7.0.5";
+ sha256 = "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers deepseq mtl
+ parser-combinators scientific text transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion deepseq text weigh
+ ];
+ description = "Monadic parser combinators";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "megaparsec-tests" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
+ , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "megaparsec-tests";
+ version = "7.0.5";
+ sha256 = "11kwf122bq38qvkpvhb1pkqzbv7yk9wi7klmg9yvls29x66shiyq";
+ libraryHaskellDepends = [
+ base bytestring containers hspec hspec-expectations
+ hspec-megaparsec megaparsec mtl QuickCheck text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers hspec
+ hspec-expectations hspec-megaparsec megaparsec mtl
+ parser-combinators QuickCheck scientific text transformers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Test utilities and the test suite of Megaparsec";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"meldable-heap" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -153107,6 +153346,8 @@ self: {
pname = "microlens-th";
version = "0.4.2.3";
sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j";
+ revision = "1";
+ editedCabalFile = "167in7b1qhgrspx81bdm2jyg9qji66sk7id282c0s99kmp0d01n6";
libraryHaskellDepends = [
base containers microlens template-haskell th-abstraction
transformers
@@ -155776,8 +156017,8 @@ self: {
}:
mkDerivation {
pname = "monad-metrics";
- version = "0.2.1.2";
- sha256 = "0zxvdx75psdninvh7f7wqj498wav2cjmn94n5a3f5g8nvrs0n4rq";
+ version = "0.2.1.3";
+ sha256 = "0ryazqrn7s2pzgzgvzp4paibylbvl54p52gc70n3alwzz8x1b7bd";
libraryHaskellDepends = [
base clock ekg-core exceptions hashable microlens mtl text
transformers unordered-containers
@@ -158447,8 +158688,8 @@ self: {
}:
mkDerivation {
pname = "multi-containers";
- version = "0.1.0.0";
- sha256 = "1ig4i2jbkmap3iy8kdqwfr3n3jx30dy66x9lq03nlkxxpi0p1y93";
+ version = "0.1.0.2";
+ sha256 = "1az9drnj6kd6x8r8gycfndqw9mhv0arvi4mkmqcazjg3lr7rxvpa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers ];
@@ -158456,7 +158697,7 @@ self: {
base containers directory extra filepath
];
testHaskellDepends = [ base containers hspec ];
- description = "A few variants of multimaps";
+ description = "A few multimap variants";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -162224,8 +162465,8 @@ self: {
pname = "network-bsd";
version = "2.8.1.0";
sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr";
- revision = "1";
- editedCabalFile = "0j5dpk1b5qx2rl8w9awrw5ghi8i7fm7zhkdhakcqaqrx8m1yraar";
+ revision = "2";
+ editedCabalFile = "1cqb720gl960zfzbzxakc2wvrvw8plncgarbb1v1hdzmdxw07js7";
libraryHaskellDepends = [ base deepseq network ];
description = "POSIX network database () API";
license = stdenv.lib.licenses.bsd3;
@@ -173488,6 +173729,28 @@ self: {
broken = true;
}) {};
+ "persistent-documentation" = callPackage
+ ({ mkDerivation, base, containers, hspec, hspec-discover, mtl
+ , persistent, persistent-template, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "persistent-documentation";
+ version = "0.1.0.0";
+ sha256 = "1m9hmvi6krksb64k5mqkqpcz3670xjbqr4vic0x1n350ji2mrngd";
+ revision = "1";
+ editedCabalFile = "06nrr2c4pprrgl4d2iwi8np7714rx685g4dagaad79q5x01k4d8v";
+ libraryHaskellDepends = [
+ base containers mtl persistent template-haskell text
+ ];
+ testHaskellDepends = [
+ base containers hspec hspec-discover persistent persistent-template
+ text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Documentation DSL for persistent entities";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"persistent-equivalence" = callPackage
({ mkDerivation, array, base, diffarray }:
mkDerivation {
@@ -173727,6 +173990,8 @@ self: {
pname = "persistent-postgresql";
version = "2.9.1";
sha256 = "02i5lq6j79cv1y6n7c3lzipngkwaqfa96i4nvnkrs535x9xbxlpq";
+ revision = "1";
+ editedCabalFile = "186fbykla4hpsl14l1ccjr3rfdabl47c9x28m290477ilaygk685";
libraryHaskellDepends = [
aeson base blaze-builder bytestring conduit containers monad-logger
persistent postgresql-libpq postgresql-simple resource-pool
@@ -174001,8 +174266,8 @@ self: {
pname = "persistent-template";
version = "2.5.4";
sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc";
- revision = "3";
- editedCabalFile = "12f4pqxwfv2li78sd9s56p66xd0w465cmjycpkqvg8n1rjxkc8vs";
+ revision = "4";
+ editedCabalFile = "08yb4kcmpqmm50lwrbmavd0zhgg6p7bl8dy026xw644cazrzcvr1";
libraryHaskellDepends = [
aeson aeson-compat base bytestring containers ghc-prim
http-api-data monad-control monad-logger path-pieces persistent
@@ -174114,8 +174379,8 @@ self: {
}:
mkDerivation {
pname = "persistent-typed-db";
- version = "0.0.1.1";
- sha256 = "0cn9dyv5gzkjn9jbv2srw94akz1rpgxsvn1hv1ik90a8sl3drh9n";
+ version = "0.1.0.0";
+ sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv";
libraryHaskellDepends = [
aeson base bytestring conduit http-api-data monad-logger
path-pieces persistent persistent-template resource-pool resourcet
@@ -183998,8 +184263,8 @@ self: {
}:
mkDerivation {
pname = "purebred-email";
- version = "0.1.0.0";
- sha256 = "01r6pzv0c49lk2z68jz6z9fppdhdjyg7igl6ji44w1rmgpiaircj";
+ version = "0.1.0.1";
+ sha256 = "0igjid6rfg13bhgkm51np0ml2sfnkg5a6z3231mmiynkdja7l5zl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -186876,6 +187141,8 @@ self: {
pname = "ralist";
version = "0.2.1.1";
sha256 = "0fy8c36ygdn609nq6wasc685y3z7g188nkhym7bpb7rigi1si7xj";
+ revision = "1";
+ editedCabalFile = "187idyc9b2q476xxxnpgglf818vp701ww0ir5j4dn96g0qwni8xb";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
benchmarkHaskellDepends = [ base criterion deepseq ];
@@ -190101,6 +190368,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "reflex-dom-svg" = callPackage
+ ({ mkDerivation, base, containers, lens, reflex, reflex-dom-core
+ , safe, text
+ }:
+ mkDerivation {
+ pname = "reflex-dom-svg";
+ version = "0.3.2.0";
+ sha256 = "0xmhccim3n6qk1dj4qyf6rhaygrpb2wzhl00rwm74cqw7ljrf5y9";
+ libraryHaskellDepends = [
+ base containers lens reflex reflex-dom-core safe text
+ ];
+ description = "Reflex functions for SVG elements";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"reflex-gloss" = callPackage
({ mkDerivation, base, dependent-sum, gloss, mtl, reflex
, transformers
@@ -192170,6 +192454,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "repline_0_2_1_0" = callPackage
+ ({ mkDerivation, base, containers, fail, haskeline, mtl, process }:
+ mkDerivation {
+ pname = "repline";
+ version = "0.2.1.0";
+ sha256 = "0yxfn6p4gprnv8hzpzh7872fs3l661d587v4kkp51mjyydpiihs5";
+ libraryHaskellDepends = [
+ base containers fail haskeline mtl process
+ ];
+ description = "Haskeline wrapper for GHCi-like REPL interfaces";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"repo-based-blog" = callPackage
({ mkDerivation, base, blaze-html, containers, data-default
, directory, dyre, filepath, filestore, hspec, hspec-discover
@@ -193260,15 +193558,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "retry_0_8_0_0" = callPackage
+ "retry_0_8_0_1" = callPackage
({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl
, random, stm, tasty, tasty-hedgehog, tasty-hunit, time
, transformers
}:
mkDerivation {
pname = "retry";
- version = "0.8.0.0";
- sha256 = "0m44firqn9bkspj2jjf88kksf7mjmbi00xz0855lnflc8b3377cf";
+ version = "0.8.0.1";
+ sha256 = "0x63grjv0r96gv8ksh6r6aja6fvnwr06bypigvkskzhjjbk3fhcx";
libraryHaskellDepends = [
base exceptions ghc-prim random transformers
];
@@ -199960,16 +200258,16 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "semirings_0_3_1_2" = callPackage
+ "semirings_0_4" = callPackage
({ mkDerivation, base, containers, hashable, integer-gmp
- , unordered-containers, vector
+ , unordered-containers
}:
mkDerivation {
pname = "semirings";
- version = "0.3.1.2";
- sha256 = "1zh5fgm1xidd03c00wh9llscx529qd1n6cnpv7k172xp4rd2w261";
+ version = "0.4";
+ sha256 = "0p5crw2n47nx76y9zsx3bpjb619wsi8p91wjq4pcw29jw6idvid0";
libraryHaskellDepends = [
- base containers hashable integer-gmp unordered-containers vector
+ base containers hashable integer-gmp unordered-containers
];
description = "two monoids as one, in holy haskimony";
license = stdenv.lib.licenses.bsd3;
@@ -204163,8 +204461,8 @@ self: {
}:
mkDerivation {
pname = "shake";
- version = "0.17.8";
- sha256 = "18j9xhl7h3sc6jswac4dz78i4rq7004150b98kq49w20flpidr5d";
+ version = "0.17.9";
+ sha256 = "0kkglnw7cwj9xkxg7ffj09dnjyribgs1vrsyl2hmpl3xy4gs0sdk";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -206392,6 +206690,8 @@ self: {
pname = "simple-sendfile";
version = "0.2.28";
sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059";
+ revision = "2";
+ editedCabalFile = "16pyj7b4i1dzpzqbarzjamcjdyiy8j6lh5vf1ggchx69x44dqcr3";
libraryHaskellDepends = [ base bytestring network unix ];
testHaskellDepends = [
base bytestring conduit conduit-extra directory hspec HUnit network
@@ -214943,10 +215243,8 @@ self: {
({ mkDerivation, base, stm, transformers }:
mkDerivation {
pname = "stm-lifted";
- version = "0.1.1.0";
- sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c";
- revision = "1";
- editedCabalFile = "0mh0gdfwky4qxyhxrysqj1sr913pffvf420mf8cl9i53fsx4f255";
+ version = "2.5.0.0";
+ sha256 = "0zsah3s288cgb2h4gdjqvby1c3xp95nvgd561sdhigxcwlxk2658";
libraryHaskellDepends = [ base stm transformers ];
description = "Software Transactional Memory lifted to MonadIO";
license = stdenv.lib.licenses.bsd3;
@@ -215185,6 +215483,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "stopwatch_0_1_0_6" = callPackage
+ ({ mkDerivation, base, clock, hspec, transformers }:
+ mkDerivation {
+ pname = "stopwatch";
+ version = "0.1.0.6";
+ sha256 = "1gvlh58hkg02a5814lm5f123p853z92dlmv4r5mhhlg5j6g7c62h";
+ libraryHaskellDepends = [ base clock transformers ];
+ testHaskellDepends = [ base clock hspec ];
+ description = "A simple stopwatch utility";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"storable" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -218275,6 +218586,8 @@ self: {
pname = "sv";
version = "1.3.1";
sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k";
+ revision = "1";
+ editedCabalFile = "19khsv0s2gk78fiwjkd3b1f2dkv78yhsl88rlb2jb2j48sjaqsgn";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring contravariant hw-dsv
semigroupoids sv-core transformers utf8-string validation
@@ -218302,8 +218615,8 @@ self: {
pname = "sv-cassava";
version = "0.3";
sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b";
- revision = "1";
- editedCabalFile = "01xfdl296jcdh7c4yirzf6z0787z941h6p58dn5xhnsr965sncg1";
+ revision = "2";
+ editedCabalFile = "14grn815r54480jqpfib6qi3ivbaw0asa5ys0rp93allsprk96xb";
libraryHaskellDepends = [
attoparsec base bytestring cassava sv-core utf8-string validation
vector
@@ -218351,6 +218664,8 @@ self: {
pname = "sv-core";
version = "0.4.1";
sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7";
+ revision = "1";
+ editedCabalFile = "1zdg2v5sxz0x6q6sgz79s71kqj79g8vn9pyl8hvqkw43b3g6zs4i";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq double-conversion lens mtl parsec profunctors readable
@@ -220800,6 +221115,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tagsoup_0_14_8" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
+ , process, QuickCheck, text, time
+ }:
+ mkDerivation {
+ pname = "tagsoup";
+ version = "0.14.8";
+ sha256 = "1m9sx6gr9y9yxvkmcap8xsks8cnhznvma1mrfl39zljkv005azms";
+ libraryHaskellDepends = [ base bytestring containers text ];
+ testHaskellDepends = [
+ base bytestring deepseq directory process QuickCheck time
+ ];
+ description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tagsoup-ht" = callPackage
({ mkDerivation, base, bytestring, containers, data-accessor
, explicit-exception, old-time, tagsoup, transformers, utility-ht
@@ -225473,6 +225805,19 @@ self: {
broken = true;
}) {};
+ "th-env" = callPackage
+ ({ mkDerivation, base, markdown-unlit, template-haskell }:
+ mkDerivation {
+ pname = "th-env";
+ version = "0.1.0.0";
+ sha256 = "19br06iq4cmnyk7s23s08yq6v2llzi9zq26yi2pigk6spwb4pyjn";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base markdown-unlit ];
+ testToolDepends = [ markdown-unlit ];
+ description = "Template Haskell splice that expands to an environment variable";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"th-expand-syns" = callPackage
({ mkDerivation, base, containers, syb, template-haskell }:
mkDerivation {
@@ -225652,25 +225997,6 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "th-lift-instances_0_1_11" = callPackage
- ({ mkDerivation, base, bytestring, containers, QuickCheck
- , template-haskell, text, th-lift, vector
- }:
- mkDerivation {
- pname = "th-lift-instances";
- version = "0.1.11";
- sha256 = "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x";
- libraryHaskellDepends = [
- base bytestring containers template-haskell text th-lift vector
- ];
- testHaskellDepends = [
- base bytestring containers QuickCheck template-haskell text vector
- ];
- description = "Lift instances for template-haskell for common data types";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"th-lift-instances" = callPackage
({ mkDerivation, base, bytestring, containers, QuickCheck
, template-haskell, text, vector
@@ -225689,6 +226015,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "th-lift-instances_0_1_13" = callPackage
+ ({ mkDerivation, base, bytestring, containers, QuickCheck
+ , template-haskell, text, th-lift, transformers, vector
+ }:
+ mkDerivation {
+ pname = "th-lift-instances";
+ version = "0.1.13";
+ sha256 = "0zmhz593lfgi194ps8cv592j0wyc37mdn9pf2pchmr7h8bkmbksf";
+ libraryHaskellDepends = [
+ base bytestring containers template-haskell text th-lift
+ transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers QuickCheck template-haskell text vector
+ ];
+ description = "Lift instances for template-haskell for common data types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-nowq" = callPackage
({ mkDerivation, base, markdown-unlit, template-haskell, time }:
mkDerivation {
@@ -231326,6 +231672,8 @@ self: {
pname = "turtle";
version = "1.5.14";
sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z";
+ revision = "1";
+ editedCabalFile = "0jfa861ch7cibalcqszywjiyqa95xs7k1dqjjkqqx6fih9y13n0l";
libraryHaskellDepends = [
ansi-wl-pprint async base bytestring clock containers directory
exceptions foldl hostname managed optional-args
@@ -235207,8 +235555,8 @@ self: {
pname = "unliftio-core";
version = "0.1.2.0";
sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4";
- revision = "1";
- editedCabalFile = "0s6xfg9d0i3sfil5gjbamlq017wdxa69csk73bcqjkficg43vm29";
+ revision = "2";
+ editedCabalFile = "0jqrjjbgicx48wzcjxs1xmih48ay79rhmrz6081dldlfxynli6vz";
libraryHaskellDepends = [ base transformers ];
description = "The MonadUnliftIO typeclass for unlifting monads to IO";
license = stdenv.lib.licenses.mit;
@@ -237309,6 +237657,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "validation_1_1" = callPackage
+ ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
+ , semigroupoids, semigroups
+ }:
+ mkDerivation {
+ pname = "validation";
+ version = "1.1";
+ sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5";
+ libraryHaskellDepends = [
+ base bifunctors deepseq lens semigroupoids semigroups
+ ];
+ testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
+ description = "A data-type like Either but with an accumulating Applicative";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"validations" = callPackage
({ mkDerivation, base, containers, digestive-functors, HUnit, mtl
, QuickCheck, test-framework, test-framework-hunit
@@ -237680,8 +238045,8 @@ self: {
}:
mkDerivation {
pname = "vault-tool";
- version = "0.1.0.0";
- sha256 = "00hnbd34chi7nm8vwq80vhl0629gklfkyfwic80q7i17kzsdvx90";
+ version = "0.1.0.1";
+ sha256 = "13bxbzamd3mca5bngmzn82fzk66b4vp5crw33bzg01nmbprxfcbb";
libraryHaskellDepends = [
aeson base bytestring http-client http-client-tls http-types text
unordered-containers
@@ -237698,8 +238063,8 @@ self: {
}:
mkDerivation {
pname = "vault-tool-server";
- version = "0.1.0.0";
- sha256 = "06h4cslkb54p3yydcnkzlzysn54cy801i5fwc02hc4gi3kvia84k";
+ version = "0.1.0.1";
+ sha256 = "0svgjr2qxsiwx5i0lrwzfcmaikgavls8vc9p0wcj3w1ndrbjk1y5";
libraryHaskellDepends = [
aeson async base bytestring filepath http-client process temporary
text vault-tool
@@ -238023,6 +238388,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vector_0_12_0_3" = callPackage
+ ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
+ , primitive, QuickCheck, random, template-haskell, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, transformers
+ }:
+ mkDerivation {
+ pname = "vector";
+ version = "0.12.0.3";
+ sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq";
+ revision = "1";
+ editedCabalFile = "0nkx1kwrvskp7xx1193d7b72fk7b678nlljzjqazhcbvi7qxpdxr";
+ libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+ testHaskellDepends = [
+ base base-orphans HUnit primitive QuickCheck random
+ template-haskell test-framework test-framework-hunit
+ test-framework-quickcheck2 transformers
+ ];
+ description = "Efficient Arrays";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vector-algorithms" = callPackage
({ mkDerivation, base, bytestring, containers, mwc-random
, primitive, QuickCheck, vector
@@ -240107,6 +240494,8 @@ self: {
pname = "wai-extra";
version = "3.0.26";
sha256 = "1vax87kchm92az0f4axn793bavp8pwjh7a9mc1lwwwni678h35gq";
+ revision = "1";
+ editedCabalFile = "02475xywcp12xysa6l2p6ibx800978lsa6rkgx9gnhans7z6yj16";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -250480,6 +250869,8 @@ self: {
];
description = "A pagination approach for yesod";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"yesod-paypal-rest" = callPackage
@@ -251075,6 +251466,8 @@ self: {
pname = "yesod-test";
version = "1.5.9.1";
sha256 = "05l5n28azbh6r1vsi7xvz1h19if5zrwn1b3jsr2913axfs3d9r3y";
+ revision = "1";
+ editedCabalFile = "1s3rfrk122ag4j0jzmym8nj6iql5jxv6ilsf0671f63824x3kgas";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-html blaze-markup bytestring
case-insensitive containers cookie hspec-core html-conduit
diff --git a/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch
deleted file mode 100644
index e5ad00ee009..00000000000
--- a/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/beam-core/Database/Beam/Backend/SQL.hs b/beam-core/Database/Beam/Backend/SQL.hs
-index e2cd37d0..6f9db126 100644
---- a/Database/Beam/Backend/SQL.hs
-+++ b/Database/Beam/Backend/SQL.hs
-@@ -10,6 +10,7 @@
- import Database.Beam.Backend.Types
-
- import Control.Monad.IO.Class
-+import Control.Monad.Fail (MonadFail)
-
- -- * MonadBeam class
-
-@@ -29,7 +30,7 @@
- -- strategies. More complicated strategies (for example, Postgres's @COPY@)
- -- are supported in individual backends. See the documentation of those
- -- backends for more details.
--class (BeamBackend be, Monad m, MonadIO m, Sql92SanityCheck syntax) =>
-+class (BeamBackend be, Monad m, MonadIO m, MonadFail m, Sql92SanityCheck syntax) =>
- MonadBeam syntax be handle m | m -> syntax be handle where
-
- {-# MINIMAL withDatabaseDebug, runReturningMany #-}
-diff --git a/Database/Beam/Backend/SQL/Builder.hs b/Database/Beam/Backend/SQL/Builder.hs
-index 9e734036..e9849912 100644
---- a/Database/Beam/Backend/SQL/Builder.hs
-+++ b/Database/Beam/Backend/SQL/Builder.hs
-@@ -33,6 +33,7 @@
- import Data.Hashable
- import Data.Int
- import Data.String
-+import qualified Control.Monad.Fail as Fail
- #if !MIN_VERSION_base(4, 11, 0)
- import Data.Semigroup
- #endif
-@@ -507,8 +508,10 @@
- type BackendFromField SqlSyntaxBackend = Trivial
-
- newtype SqlSyntaxM a = SqlSyntaxM (IO a)
-- deriving (Applicative, Functor, Monad, MonadIO)
-+ deriving (Applicative, Functor, Monad, MonadIO, Fail.MonadFail)
-
- instance MonadBeam SqlSyntaxBuilder SqlSyntaxBackend SqlSyntaxBackend SqlSyntaxM where
-- withDatabaseDebug _ _ _ = fail "absurd"
-- runReturningMany _ _ = fail "absurd"
-+ withDatabaseDebug _ _ _ = Fail.fail "absurd"
-+ runReturningMany _ _ = Fail.fail "absurd"
-+
-+
-diff --git a/Database/Beam/Schema/Lenses.hs b/Database/Beam/Schema/Lenses.hs
-index b21dddb6..5df0654c 100644
---- a/Database/Beam/Schema/Lenses.hs
-+++ b/Database/Beam/Schema/Lenses.hs
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PolyKinds #-}
-+{-# LANGUAGE UndecidableInstances #-}
- module Database.Beam.Schema.Lenses
- ( tableLenses
- , TableLens(..)
-diff --git a/beam-core.cabal b/beam-core.cabal
-index 4bf4ffd9..251d4d85 100644
---- a/beam-core.cabal
-+++ b/beam-core.cabal
-@@ -64,8 +64,8 @@
- time >=1.6 && <1.10,
- hashable >=1.1 && <1.3,
- network-uri >=2.6 && <2.7,
-- containers >=0.5 && <0.6,
-- vector-sized >=0.5 && <1.1,
-+ containers >=0.5 && <0.7,
-+ vector-sized >=0.5 && <1.3,
- tagged >=0.8 && <0.9
- Default-language: Haskell2010
- default-extensions: ScopedTypeVariables, OverloadedStrings, GADTs, RecursiveDo, FlexibleInstances, FlexibleContexts, TypeFamilies,
diff --git a/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch
deleted file mode 100644
index b715140be0a..00000000000
--- a/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Database/Beam/Migrate/Generics/Types.hs b/Database/Beam/Migrate/Generics/Types.hs
-index 553e208b..0cf9b2c8 100644
---- a/Database/Beam/Migrate/Generics/Types.hs
-+++ b/Database/Beam/Migrate/Generics/Types.hs
-@@ -1,3 +1,5 @@
-+{-# LANGUAGE UndecidableInstances #-}
-+
- module Database.Beam.Migrate.Generics.Types where
-
- import Database.Beam.Migrate.Types
-diff --git a/beam-migrate.cabal b/beam-migrate.cabal
-index f53b280d..9cf3722c 100644
---- a/beam-migrate.cabal
-+++ b/beam-migrate.cabal
-@@ -69,13 +69,12 @@ library
- mtl >=2.2 && <2.3,
- scientific >=0.3 && <0.4,
- vector >=0.11 && <0.13,
-- containers >=0.5 && <0.6,
- unordered-containers >=0.2 && <0.3,
- hashable >=1.2 && <1.3,
- parallel >=3.2 && <3.3,
- deepseq >=1.4 && <1.5,
- ghc-prim >=0.5 && <0.6,
-- containers >=0.5 && <0.6,
-+ containers >=0.5 && <0.7,
- haskell-src-exts >=1.18 && <1.21,
- pretty >=1.1 && <1.2,
- dependent-map >=0.2 && <0.3,
diff --git a/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch
deleted file mode 100644
index ede2bce1257..00000000000
--- a/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/Database/Beam/Postgres/Connection.hs b/Database/Beam/Postgres/Connection.hs
-index 433f55b9..5836c53d 100644
---- a/Database/Beam/Postgres/Connection.hs
-+++ b/Database/Beam/Postgres/Connection.hs
-@@ -52,6 +52,8 @@ import qualified Database.PostgreSQL.Simple.Types as Pg (Null(..), Query(..))
-
- import Control.Monad.Reader
- import Control.Monad.State
-+import Control.Monad.Fail (MonadFail)
-+import qualified Control.Monad.Fail as Fail
-
- import Data.ByteString (ByteString)
- import Data.ByteString.Builder (toLazyByteString, byteString)
-@@ -302,6 +304,9 @@ deriving instance Functor PgF
- newtype Pg a = Pg { runPg :: F PgF a }
- deriving (Monad, Applicative, Functor, MonadFree PgF)
-
-+instance MonadFail Pg where
-+ fail e = fail $ "Internal Error with: " <> show e
-+
- instance MonadIO Pg where
- liftIO x = liftF (PgLiftIO x id)
-
-diff --git a/beam-postgres.cabal b/beam-postgres.cabal
-index e14b84f5..d29a5b67 100644
---- a/beam-postgres.cabal
-+++ b/beam-postgres.cabal
-@@ -31,7 +31,7 @@ library
- beam-migrate >=0.3 && <0.4,
-
- postgresql-libpq >=0.8 && <0.10,
-- postgresql-simple >=0.5 && <0.6,
-+ postgresql-simple >=0.5 && <0.7,
-
- text >=1.0 && <1.3,
- bytestring >=0.10 && <0.11,
-@@ -38,7 +38,7 @@ library
-
- hashable >=1.1 && <1.3,
- lifted-base >=0.2 && <0.3,
-- free >=4.12 && <5.1,
-+ free >=4.12 && <5.2,
- time >=1.6 && <1.10,
- monad-control >=1.0 && <1.1,
- mtl >=2.1 && <2.3,
diff --git a/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch
deleted file mode 100644
index ebfca8a2f65..00000000000
--- a/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Database/Beam/Sqlite/Connection.hs b/Database/Beam/Sqlite/Connection.hs
-index f034b272..4e459ea3 100644
---- a/Database/Beam/Sqlite/Connection.hs
-+++ b/Database/Beam/Sqlite/Connection.hs
-@@ -37,6 +37,7 @@ import Database.SQLite.Simple.Types (Null)
-
- import Control.Exception (bracket_, onException, mask)
- import Control.Monad (forM_, replicateM_)
-+import Control.Monad.Fail (MonadFail)
- import Control.Monad.Free.Church
- import Control.Monad.IO.Class (MonadIO(..))
- import Control.Monad.Identity (Identity)
-@@ -143,7 +144,7 @@ newtype SqliteM a
- { runSqliteM :: ReaderT (String -> IO (), Connection) IO a
- -- ^ Run an IO action with access to a SQLite connection and a debug logging
- -- function, called or each query submitted on the connection.
-- } deriving (Monad, Functor, Applicative, MonadIO)
-+ } deriving (Monad, Functor, Applicative, MonadIO, MonadFail)
-
- newtype BeamSqliteParams = BeamSqliteParams [SQLData]
- instance ToRow BeamSqliteParams where
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 02ce07bdf47..12631cee38a 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -1,18 +1,28 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, fetchpatch, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "hy-${version}";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchurl {
url = "mirror://pypi/h/hy/${name}.tar.gz";
- sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1";
+ sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd";
};
+ patches = [
+ (fetchpatch {
+ name = "bytecode-error-handling.patch";
+ url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch";
+ sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92";
+ excludes = [ "AUTHORS" "NEWS.rst" ];
+ })
+ ];
+
propagatedBuildInputs = with pythonPackages; [
appdirs
astor
clint
+ fastentrypoints
funcparserlib
rply
];
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 882de562114..33d00afd9e7 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
- cargoSha256 = "17k8n5xar4pvvi4prhm6c51vlim9xqwkkhysbnss299mm3fyh36h";
+ cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc";
cargoPatches = [ ./cargo-lock.patch ];
diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix
new file mode 100644
index 00000000000..da2fd13465f
--- /dev/null
+++ b/pkgs/development/libraries/ethash/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, cmake, boost, cryptopp, opencl-headers, opencl-info,
+ openmpi, ocl-icd, mesa, gbenchmark, gtest }:
+
+stdenv.mkDerivation rec {
+ pname = "ethash";
+ version = "0.4.2";
+
+ src =
+ fetchFromGitHub {
+ owner = "chfast";
+ repo = "ethash";
+ rev = "v${version}";
+ sha256 = "0qiixvxbpl2gz7jh1qs8lmyk7wzv6ffnl7kckqgrpgm547nnn8zy";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ buildInputs = [
+ boost
+ cryptopp
+ opencl-headers
+ opencl-info
+ openmpi
+ ocl-icd
+ mesa
+ ];
+
+ checkInputs = [
+ gbenchmark
+ gtest
+ ];
+
+ #preConfigure = ''
+ # sed -i 's/GTest::main//' test/unittests/CMakeLists.txt
+ # cat test/unittests/CMakeLists.txt
+ # ln -sfv ${gtest.src}/googletest gtest
+ #'';
+
+ # NOTE: disabling tests due to gtest issue
+ cmakeFlags = [
+ "-DHUNTER_ENABLED=OFF"
+ "-DETHASH_BUILD_TESTS=OFF"
+ #"-Dbenchmark_DIR=${gbenchmark}/lib/cmake/benchmark"
+ #"-DGTest_DIR=${gtest.dev}/lib/cmake/GTest"
+ #"-DGTest_DIR=${gtest.src}/googletest"
+ #"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
+ homepage = https://github.com/ethereum/ethash;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ nand0p ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 1c62d79ed32..b543d47a050 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,10 +1,7 @@
-{ stdenv
-, fetchFromGitHub
-, cmake
-, python
-}:
+{ stdenv , fetchFromGitHub , cmake , python }:
+
stdenv.mkDerivation rec {
- name = "jsoncpp-${version}";
+ pname = "jsoncpp";
version = "1.8.4";
src = fetchFromGitHub {
@@ -36,13 +33,14 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF"
+ "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
];
meta = with stdenv.lib; {
inherit version;
homepage = https://github.com/open-source-parsers/jsoncpp;
description = "A C++ library for interacting with JSON.";
- maintainers = with maintainers; [ ttuegel cpages ];
+ maintainers = with maintainers; [ ttuegel cpages nand0p ];
license = licenses.mit;
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 5f295009b99..1a177dc2237 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "liblinear-${version}";
- version = "2.21";
+ version = "2.30";
src = fetchurl {
url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz";
- sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs";
+ sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748";
};
buildPhase = ''
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index 143919d148e..c90e0ee009e 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "liburing-${version}";
- version = "1.0.0pre821_${builtins.substring 0 7 src.rev}";
+ version = "1.0.0pre92_${builtins.substring 0 7 src.rev}";
src = fetchgit {
url = "http://git.kernel.dk/liburing";
- rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6";
- sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7";
+ rev = "7b989f34191302011b5b49bf5b26b36862d54056";
+ sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc";
};
enableParallelBuilding = true;
@@ -19,13 +19,12 @@ stdenv.mkDerivation rec {
[ "prefix=$(out)"
"includedir=$(dev)/include"
"libdir=$(lib)/lib"
+ "mandir=$(man)/share/man"
];
- # Copy the examples into $out and man pages into $man. This should be handled
- # by the build system in the future and submitted upstream.
+ # Copy the examples into $out.
postInstall = ''
- mkdir -p $out/bin $man/share/man/man2/
- cp -R ./man/* $man/share/man/man2
+ mkdir -p $out/bin
cp ./examples/io_uring-cp examples/io_uring-test $out/bin
'';
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 7fb79c549be..cc86ab19379 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
let
- name = "log4cplus-2.0.3";
+ name = "log4cplus-2.0.4";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
- sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w";
+ sha256 = "0lh2i22znx573jchcfy4n5lrr9yjg2hd3iphhlih61zzmd67p2hc";
};
meta = {
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 3b0a0441cc4..16502ca4e61 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, boost }:
stdenv.mkDerivation rec {
- version = "1.3.1";
- name = "mdds-${version}";
+ pname = "mdds";
+ version = "1.4.3";
src = fetchurl {
- url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2";
- sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w";
+ url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2";
+ sha256 = "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5";
};
postInstall = ''
- mkdir -p "$out/lib/pkgconfig"
- cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
+ mkdir -p "$out/lib/pkgconfig"
+ cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
'';
checkInputs = [ boost ];
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 30383dda50c..156a8c4c15c 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }:
-let version = "8.4.0";
+let version = "8.4.1";
in
stdenv.mkDerivation rec {
name = "qpdf-${version}";
src = fetchurl {
url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
- sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r";
+ sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix
new file mode 100644
index 00000000000..529f910c35a
--- /dev/null
+++ b/pkgs/development/libraries/smesh/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, ninja, opencascade }:
+
+stdenv.mkDerivation rec {
+ pname = "smesh";
+ version = "6.7.6";
+
+ src = fetchFromGitHub {
+ owner = "tpaviot";
+ repo = "smesh";
+ rev = version;
+ sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0";
+ };
+
+ nativeBuildInputs = [ cmake ninja ];
+ buildInputs = [ opencascade ];
+
+ meta = with stdenv.lib; {
+ description = "Extension to OCE providing advanced meshing features";
+ homepage = "https://github.com/tpaviot/smesh";
+ license = licenses.lgpl21;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ gebner ];
+ };
+}
diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/development/python-modules/addic7ed-cli/default.nix
new file mode 100644
index 00000000000..a9720f45ef6
--- /dev/null
+++ b/pkgs/development/python-modules/addic7ed-cli/default.nix
@@ -0,0 +1,24 @@
+{ lib, python3Packages, }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "addic7ed-cli";
+ version = "1.4.5";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "16nmyw7j2igx5dxflwiwblf421g69rxb879n1553wv6hxi4x27in";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ requests
+ pyquery
+ ];
+
+ meta = with lib; {
+ description = "A commandline access to addic7ed subtitles";
+ homepage = https://github.com/BenoitZugmeyer/addic7ed-cli;
+ license = licenses.mit;
+ maintainers = with maintainers; [ aethelz ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix
new file mode 100644
index 00000000000..4a921b2390d
--- /dev/null
+++ b/pkgs/development/python-modules/fastentrypoints/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+ pname = "fastentrypoints";
+ version = "0.12";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02s1j8i2dzbpbwgq2a3fiqwm3cnmhii2qzc0k42l0rdxd4a4ya7z";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Makes entry_points specified in setup.py load more quickly";
+ homepage = https://github.com/ninjaaron/fast-entry_points;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ nixy ];
+ };
+}
diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index c5e9b102828..b318016ee81 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-auth-oauthlib";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "226d1d0960f86ba5d9efd426a70b291eaba96f47d071657e0254ea969025728a";
+ sha256 = "03rq2rjac0zh16vsw0q914sp62l9f8fp033wn3191pqd2cchqix0";
};
checkInputs = [
@@ -28,6 +28,7 @@ buildPythonPackage rec {
];
checkPhase = ''
+ rm -fr tests/__pycache__/
py.test
'';
diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix
index 9d6461168d4..aab9f827da0 100644
--- a/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/pkgs/development/python-modules/google_cloud_storage/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437";
+ sha256 = "13b9ah54z6g3w8p74a1anmyz84nrxy27snqv6vp95wsizp8zwsyn";
};
checkInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index d47f5ce39fe..2db6ad1c3d0 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
- version = "1.2.2";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7";
+ sha256 = "443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9";
};
# Tests not included in PyPI tarball
diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index 2ca26ad65e8..226f1743a2a 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -2,25 +2,16 @@
buildPythonApplication rec {
pname = "jsbeautifier";
- version = "1.9.1";
+ version = "1.10.0";
propagatedBuildInputs = [ six EditorConfig ];
checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
- sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960";
+ sha256 = "1e389572ade865173605471e98df4002f4b6e5235121c13f1e4497a3eac69108";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch";
- sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523";
- })
- ];
-
- patchFlags = [ "-p2" ];
-
meta = with lib; {
homepage = "http://jsbeautifier.org";
description = "JavaScript unobfuscator and beautifier.";
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index c028eaaaa14..093d0d39ddd 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "mypy";
- version = "0.670";
+ version = "0.700";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d";
+ sha256 = "1zxfi5s9hxrz0hbaj4n513az17l44pxl80r62ipjc0bsmbcic2xi";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 08c908e0aa5..acb46af46b3 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "peewee";
- version = "3.9.3";
+ version = "3.9.5";
# pypi release does not provide tests
src = fetchFromGitHub {
owner = "coleifer";
repo = pname;
rev = version;
- sha256 = "1frwwqkk0y1bkcm7bdzbyv2119vv640ncgs4d55zhbs70fxm2ylj";
+ sha256 = "0c2hkkpp9rajnw5px17wd72x95k7wc2a0iy55pjhi5ly2cqd9ylv";
};
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 20b39131135..693477d20c0 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyatspi";
- version = "2.32.0";
+ version = "2.32.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a";
+ sha256 = "1283cbwd2kacgdij96xk26721f6amyzdhy2py11kdj5cprdlm5c4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix
index fc269641ecf..47d6ea7e26b 100644
--- a/pkgs/development/python-modules/pystemd/default.nix
+++ b/pkgs/development/python-modules/pystemd/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, buildPythonPackage, fetchPypi, mock, pytest, six, systemd }:
+{ stdenv, python, systemd }:
-buildPythonPackage rec {
+python.pkgs.buildPythonPackage rec {
pname = "pystemd";
- version = "0.5.0";
- src = fetchPypi {
+ version = "0.6.0";
+ src = python.pkgs.fetchPypi {
inherit pname version;
- sha256 = "000001hxv25vwcsvc0avg42v89c7qcjdpw6dr8419prmcb9186i5";
+ sha256 = "054a3ni71paqa1xa786840z3kjixcgyqdbscyq8nfxp3hwn0gz5i";
};
- buildInputs = [ systemd ];
- propagatedBuildInputs = [ six ];
+ disabled = !python.pkgs.isPy3k;
- checkInputs = [ pytest mock ];
+ buildInputs = [ systemd ];
+
+ checkInputs = with python.pkgs; [ pytest mock ];
checkPhase = "pytest tests";
meta = with stdenv.lib; {
description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way.";
homepage = https://github.com/facebookincubator/pystemd/;
- license = licenses.bsd0;
+ license = licenses.lgpl21Plus;
maintainers = with maintainers; [ flokli ];
};
}
diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix
index 53e1fce493d..c03590f8de8 100644
--- a/pkgs/development/python-modules/pytest-tornado/default.nix
+++ b/pkgs/development/python-modules/pytest-tornado/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pytest-tornado";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw";
+ sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4";
};
# package has no tests
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
new file mode 100644
index 00000000000..b3a9cfe82ee
--- /dev/null
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, python, fetchFromGitHub, cmake, swig, ninja,
+ opencascade, smesh, freetype, libGL, libGLU, libX11 }:
+
+stdenv.mkDerivation rec {
+ pname = "pythonocc-core";
+ version = "0.18.1";
+
+ src = fetchFromGitHub {
+ owner = "tpaviot";
+ repo = "pythonocc-core";
+ rev = version;
+ sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3";
+ };
+
+ nativeBuildInputs = [ cmake swig ninja ];
+ buildInputs = [
+ python opencascade smesh
+ freetype libGL libGLU libX11
+ ];
+
+ cmakeFlags = [
+ "-Wno-dev"
+ "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC"
+
+ "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh"
+ "-DSMESH_LIB_PATH=${smesh}/lib"
+ "-DPYTHONOCC_WRAP_SMESH=TRUE"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Python wrapper for the OpenCASCADE 3D modeling kernel";
+ homepage = "https://github.com/tpaviot/pythonocc-core";
+ license = licenses.lgpl3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ gebner ];
+ };
+}
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 1b501b06012..08800552607 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
- version = "3.5.19";
+ version = "3.5.20";
src = fetchPypi {
inherit pname version;
- sha256 = "47951166d897b60e9e7ca349db82a2b689e6478ac6078e2c7c88ca8becbb0c7d";
+ sha256 = "06l7jfax1izvbddmmjw9xpyb7iy4n99v3chyv75d9djaklnqs93v";
};
checkInputs = [ glibcLocales ];
@@ -26,6 +26,7 @@ in buildPythonPackage rec {
# Remove all the test files that require access to the internet to pass.
rm tests/test_lib_utils.py
rm tests/test_platypus_general.py
+ rm tests/test_platypus_images.py
# Remove the tests that require Vera fonts installed
rm tests/test_graphics_render.py
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 9c20226fea0..f8fbf8e49f4 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "twilio";
- version = "6.26.1";
+ version = "6.26.2";
# tests not included in PyPi, so fetch from github instead
src = fetchFromGitHub {
owner = "twilio";
repo = "twilio-python";
rev = version;
- sha256 = "1ly22ah487jkq0my1l3c6hbx24fgganjhxrlrcw5jfc80qmgd3hd";
+ sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw";
};
buildInputs = [ nose mock ];
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index 25acc4f88bc..adbcf539494 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "vega";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm";
+ sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index cb7a2f19b5e..f9f1addd4c3 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -23,7 +23,7 @@
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
-, file, libvirt, glib, vips, taglib, libopus
+, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, libselinux ? null, libsepol ? null
}@args:
@@ -79,6 +79,11 @@ in
buildInputs = [ which icu zlib ];
};
+ cld3 = attrs: {
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ protobuf ];
+ };
+
curb = attrs: {
buildInputs = [ curl ];
};
@@ -174,9 +179,17 @@ in
gtk2 = attrs: {
nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
- buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp];
+ buildInputs = [
+ fribidi
+ gobject-introspection
+ gtk2
+ harfbuzz
+ pcre
+ xorg.libpthreadstubs
+ xorg.libXdmcp
+ ];
# CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
- CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
+ # CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
};
gobject-introspection = attrs: {
@@ -201,6 +214,10 @@ in
buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
};
+ idn-ruby = attrs: {
+ buildInputs = [ libidn ];
+ };
+
# disable bundle install as it can't install anything in addition to what is
# specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R
# to compensate for read-only files in site_template in nix store.
@@ -290,7 +307,15 @@ in
pango = attrs: {
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ];
+ buildInputs = [
+ fribidi
+ gobject-introspection
+ gtk2
+ harfbuzz
+ pcre
+ xorg.libpthreadstubs
+ xorg.libXdmcp
+ ];
};
patron = attrs: {
@@ -340,6 +365,10 @@ in
buildInputs = [ imagemagick which ];
};
+ rpam2 = attrs: {
+ buildInputs = [ linux-pam ];
+ };
+
ruby-libvirt = attrs: {
buildInputs = [ libvirt pkgconfig ];
buildFlags = [
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index ab00573965e..5294bb46f18 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pmd-${version}";
- version = "6.13.0";
+ version = "6.14.0";
buildInputs = [ unzip ];
src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
- sha256 = "1g8ds38zwprjswm71y7l10l15rbh2s6ha9xpp20wjy823q9agbpq";
+ sha256 = "0k40l93fxakms9vm641d4vlb68gfhkblrm24sb7slzvhq2v832dj";
};
installPhase = ''
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index d4e5c5a38dc..832e8e35164 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
ant
- ./bin/buck build -c buck.release_version=${version} buck
+ PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck
'';
installPhase = ''
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 48b0631c64a..47db8c9fea6 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -3,13 +3,13 @@
, go-md2man }:
let
- version = "1.7.2";
+ version = "1.7.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "buildah";
- sha256 = "19rp5kgdgyjfvg23m8dqlv6g1cs2c57nnw64ifjv24hqhy1xc0qk";
+ sha256 = "154zjkccinf6nvbz5a8rdlkgy7fi6yz11wi100jn9cmsjydspax8";
};
goPackagePath = "github.com/containers/buildah";
@@ -46,7 +46,7 @@ in buildGoPackage rec {
meta = {
description = "A tool which facilitates building OCI images";
homepage = https://github.com/containers/buildah;
- maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
+ maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ];
license = stdenv.lib.licenses.asl20;
};
}
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index 85e7c07b8cc..f93bd9d28c8 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -2,8 +2,8 @@
buildGoPackage rec {
name = "gocode-gomod-unstable-${version}";
- version = "2019-02-12";
- rev = "8cc90faaf4765d16de060350da41eadccc1a15d1";
+ version = "2019-03-27";
+ rev = "81059208699789f992bb4a4a3fedd734e335468d";
goPackagePath = "github.com/stamblerre/gocode";
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index 6c8270f8598..8eb65281b3f 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "gotests-${version}";
- version = "1.5.2";
+ version = "1.5.3";
rev = "v${version}";
goPackagePath = "github.com/cweill/gotests";
@@ -13,7 +13,7 @@ buildGoPackage rec {
inherit rev;
owner = "cweill";
repo = "gotests";
- sha256 = "0ff2jvpc1xb5jr6dv9izlpfavxaivzirqmdmicpznrqjz0d56pri";
+ sha256 = "1c0hly31ax0wk01zdx0l0yl40xybaizjfb3gjxia2z0mgx330dq9";
};
meta = {
diff --git a/pkgs/development/tools/gotests/deps.nix b/pkgs/development/tools/gotests/deps.nix
index 6a333b58bec..df411303d94 100644
--- a/pkgs/development/tools/gotests/deps.nix
+++ b/pkgs/development/tools/gotests/deps.nix
@@ -1,11 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
- url = "https://github.com/golang/tools";
- rev = "96b5a5404f303f074e6117d832a9873c439508f0";
- sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42";
+ url = "https://go.googlesource.com/tools";
+ rev = "23463209683dad3f2b9cc7f7c2663e1847c59017";
+ sha256 = "1shzfl4zixhj78v4f6y04bcmfl705yr5q8hp72ndbbma0mh09g8f";
};
}
]
diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
deleted file mode 100644
index ec2fb334a3b..00000000000
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, ghcWithPackages, gtk3, makeWrapper }:
-
-let
-leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
-in stdenv.mkDerivation {
- name = "leksah-${leksahEnv.version}";
-
- buildInputs = [ gtk3 ];
- nativeBuildInputs = [ makeWrapper ];
-
- buildCommand = ''
- mkdir -p $out/bin
- makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \
- --prefix PATH : "${leksahEnv}/bin" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = {
- broken = true; # 2018-09-13, no successful hydra build since 2017-08-19
- };
-}
diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix
new file mode 100644
index 00000000000..904119bd6ae
--- /dev/null
+++ b/pkgs/development/tools/misc/cli11/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, cmake, gtest, python, boost }:
+
+stdenv.mkDerivation rec {
+ pname = "cli11";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "CLIUtils";
+ repo = "CLI11";
+ rev = "v${version}";
+ sha256 = "0wddck970pczk7c201i2g6s85mkv4f2f4zxy6mndh3pfz41wcs2d";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ checkInputs = [ boost python ];
+
+ doCheck = true;
+
+ preConfigure = ''
+ rm -rfv extern/googletest
+ ln -sfv ${gtest.src} extern/googletest
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "CLI11 is a command line parser for C++11";
+ homepage = https://github.com/CLIUtils/CLI11;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ nand0p ];
+ license = licenses.unfreeRedistributable;
+ };
+
+}
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index cea86f090d6..7141fdcee7e 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }:
+{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }:
stdenv.mkDerivation rec {
name = "openocd-${version}";
@@ -10,28 +10,28 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libftdi libusb1 hidapi ];
+ buildInputs = [ libftdi1 libusb1 hidapi ];
configureFlags = [
"--enable-jtag_vpi"
"--enable-usb_blaster_libftdi"
- "--enable-amtjtagaccel"
- "--enable-gw16012"
+ (lib.enableFeature (! stdenv.isDarwin) "amtjtagaccel")
+ (lib.enableFeature (! stdenv.isDarwin) "gw16012")
"--enable-presto_libftdi"
"--enable-openjtag_ftdi"
- "--enable-oocd_trace"
+ (lib.enableFeature (! stdenv.isDarwin) "oocd_trace")
"--enable-buspirate"
- "--enable-sysfsgpio"
+ (lib.enableFeature stdenv.isLinux "sysfsgpio")
"--enable-remote-bitbang"
];
- NIX_CFLAGS_COMPILE = [
+ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
"-Wno-implicit-fallthrough"
"-Wno-format-truncation"
"-Wno-format-overflow"
];
- postInstall = ''
+ postInstall = lib.optionalString stdenv.isLinux ''
mkdir -p "$out/etc/udev/rules.d"
rules="$out/share/openocd/contrib/60-openocd.rules"
if [ ! -f "$rules" ]; then
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
ln -s "$rules" "$out/etc/udev/rules.d/"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing";
longDescription = ''
OpenOCD provides on-chip programming and debugging support with a layered
@@ -55,6 +55,6 @@ stdenv.mkDerivation rec {
homepage = http://openocd.sourceforge.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ bjornfor ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 20105f362cf..bce1e273cc4 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "rust-cbindgen-${version}";
- version = "0.8.0";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
- sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq";
+ sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1";
};
- cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb";
+ cargoSha256 = "1nig4891p7ii4z4f4j4d4pxx39f501g7yrsygqbpkr1nrgjip547";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 3eb0760b222..d6c5718d3ec 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -1,25 +1,25 @@
{ stdenv, lib, runCommand, patchelf
, fetchFromGitHub, rustPlatform
-, pkgconfig, curl, Security }:
+, pkgconfig, curl, Security, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "rustup";
- version = "1.18.1";
+ version = "1.18.2";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rustup.rs";
rev = version;
- sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x";
+ sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f";
};
- cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb";
+ cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
curl
- ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
cargoBuildFlags = [ "--features no-self-update" ];
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 3d08a6b787d..417f0a749c9 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
buildGoPackage rec {
name = "skaffold-${version}";
- version = "0.26.0";
- # rev is the 0.25.0 commit, mainly for skaffold version command output
- rev = "d88680e9ede62da65500702670ef72fc9272a06f";
+ version = "0.28.0";
+ # rev is the 0.28.0 commit, mainly for skaffold version command output
+ rev = "2b6143bb6d185de9b9fbf2eaa981c8e7acff7339";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "151x7hs1876ij5kc1xlm1m7pyff6i22ddhfvjsgwb8sjl4h1ays5";
+ sha256 = "1j7wf2a5xmrk944nc0b9634qa9al3cln3lrij8383avylbx68prw";
};
meta = {
diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix
index 42b8e5229e9..a8068e9b47b 100644
--- a/pkgs/misc/emulators/caprice32/default.nix
+++ b/pkgs/misc/emulators/caprice32/default.nix
@@ -2,18 +2,22 @@
stdenv.mkDerivation rec {
- repo = "caprice32";
- version = "unstable-2018-03-05";
- rev = "317fe638111e245d67e301f6f295094d3c859a70";
- name = "${repo}-${version}";
+ pname = "caprice32";
+ version = "4.5.0";
src = fetchFromGitHub {
- inherit rev repo;
+ repo = "caprice32";
+ rev = "v${version}";
owner = "ColinPitrat";
- sha256 = "1bywpmkizixcnr057k8zq9nlw0zhcmwkiriln0krgdcm7d3h9b86";
+ sha256 = "056vrf5yq1574g93ix8hnjqqbdqza3qcjv0f8rvpsslqcbizma9y";
};
postPatch = "substituteInPlace cap32.cfg --replace /usr/local $out";
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libpng SDL freetype zlib ];
+
+ #fix GIT_HASH avoid depend on git
+ makeFlags = [ "GIT_HASH=${src.rev}" "DESTDIR=$(out)" "prefix=/"];
meta = with stdenv.lib; {
description = "A complete emulation of CPC464, CPC664 and CPC6128";
@@ -21,9 +25,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.genesis ];
platforms = platforms.linux;
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libpng SDL freetype zlib ];
- makeFlags = [ "GIT_HASH=${src.rev}" "DESTDIR=$(out)" "prefix=/"];
+ };
}
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 72eb537bf18..c8712d20859 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -15,22 +15,22 @@
stdenv.mkDerivation rec {
name = "visualboyadvance-m-${version}";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = "visualboyadvance-m";
repo = "visualboyadvance-m";
rev = "v${version}";
- sha256 = "0bgb9r6qc4g1biymayknj1fccwrdmn772i4qnc9zs3f9jrs0b34g";
+ sha256 = "0ibpn05jm6zvvrjyxbmh8qwm1qd26v0dzq45cp233ksvapw1h77h";
};
+ nativeBuildInputs = [ cmake pkgconfig ];
+
buildInputs = [
cairo
- cmake
ffmpeg
gettext
libGLU_combined
openal
- pkgconfig
SDL2
sfml
zip
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 70fadf7683f..ef22bd9a3ac 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,24 +31,24 @@ in rec {
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
- version = "4.8.2";
+ version = "4.8.3";
url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
- sha256 = "1hvwhqdb11j9yzhhw86fjhj9bawg76zrh0wnx658pn5xghhk2jhy";
+ sha256 = "0xhavcjwwr21am3bxp2cxlvykwasw8y4g8p470j5fg7skc0izynn";
};
};
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "4.6";
+ version = "4.7";
url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
- sha256 = "1nk2nlkdklwpd0kbq8hx59gl05b5wglcla0v3892by6k4kwh341j";
+ sha256 = "1c5swx6jj0hz9w2jgyl30pdjcq9n62qp1rmqyq1d4q2a6n291jiv";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "0mripibsi1p8h2j9ngqszkcjppdxji027ss4shqwb0nypaydd9w2";
+ sha256 = "1sgyq57dyzchwnvkgx96bcx5rv821s0vidzdyz7x5711j7xmiv70";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
diff --git a/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch b/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch
new file mode 100644
index 00000000000..92725cac5b4
--- /dev/null
+++ b/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch
@@ -0,0 +1,105 @@
+From fbee2adffd39b03e10262b09779faef94c4d5a9d Mon Sep 17 00:00:00 2001
+From: Ben Wolsieffer
+Date: Thu, 18 Apr 2019 15:50:24 -0400
+Subject: [PATCH] fdt: make compatible with dtc >=1.4.6
+
+Signed-off-by: Ben Wolsieffer
+---
+ include/libfdt_env.h | 6 +++---
+ lib/libfdt/fdt.h | 6 +++---
+ lib/libfdt/libfdt.h | 6 +++---
+ lib/libfdt/libfdt_internal.h | 6 +++---
+ tools/dtoc/fdt.py | 2 +-
+ 5 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/include/libfdt_env.h b/include/libfdt_env.h
+index 6c6845f76c..1fbcd0ef83 100644
+--- a/include/libfdt_env.h
++++ b/include/libfdt_env.h
+@@ -6,8 +6,8 @@
+ * SPDX-License-Identifier: LGPL-2.1+
+ */
+
+-#ifndef _LIBFDT_ENV_H
+-#define _LIBFDT_ENV_H
++#ifndef LIBFDT_ENV_H
++#define LIBFDT_ENV_H
+
+ #include "compiler.h"
+ #include "linux/types.h"
+@@ -32,4 +32,4 @@ typedef __be64 fdt64_t;
+ /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
+ #define FDT_RAMDISK_OVERHEAD 0x80
+
+-#endif /* _LIBFDT_ENV_H */
++#endif /* LIBFDT_ENV_H */
+diff --git a/lib/libfdt/fdt.h b/lib/libfdt/fdt.h
+index 3134d78332..38cc182739 100644
+--- a/lib/libfdt/fdt.h
++++ b/lib/libfdt/fdt.h
+@@ -1,5 +1,5 @@
+-#ifndef _FDT_H
+-#define _FDT_H
++#ifndef FDT_H
++#define FDT_H
+ /*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+@@ -64,4 +64,4 @@ struct fdt_property {
+ #define FDT_V16_SIZE FDT_V3_SIZE
+ #define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t))
+
+-#endif /* _FDT_H */
++#endif /* FDT_H */
+diff --git a/lib/libfdt/libfdt.h b/lib/libfdt/libfdt.h
+index cb533f4275..9345a59f05 100644
+--- a/lib/libfdt/libfdt.h
++++ b/lib/libfdt/libfdt.h
+@@ -1,5 +1,5 @@
+-#ifndef _LIBFDT_H
+-#define _LIBFDT_H
++#ifndef LIBFDT_H
++#define LIBFDT_H
+ /*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+@@ -2189,4 +2189,4 @@ int fdt_device_is_available(const void *blob, int node);
+ int fdt_node_offset_by_phandle_node(const void *fdt, int node, uint32_t phandle);
+ #endif /* SWIG */
+
+-#endif /* _LIBFDT_H */
++#endif /* LIBFDT_H */
+diff --git a/lib/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h
+index 9a79fe85dd..8fdda7ee79 100644
+--- a/lib/libfdt/libfdt_internal.h
++++ b/lib/libfdt/libfdt_internal.h
+@@ -1,5 +1,5 @@
+-#ifndef _LIBFDT_INTERNAL_H
+-#define _LIBFDT_INTERNAL_H
++#ifndef LIBFDT_INTERNAL_H
++#define LIBFDT_INTERNAL_H
+ /*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+@@ -47,4 +47,4 @@ static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n)
+
+ #define FDT_SW_MAGIC (~FDT_MAGIC)
+
+-#endif /* _LIBFDT_INTERNAL_H */
++#endif /* LIBFDT_INTERNAL_H */
+diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
+index dbc338653b..ac2191fb37 100644
+--- a/tools/dtoc/fdt.py
++++ b/tools/dtoc/fdt.py
+@@ -360,7 +360,7 @@ class Fdt:
+ poffset = libfdt.fdt_first_property_offset(self._fdt, node._offset)
+ while poffset >= 0:
+ p = self._fdt_obj.get_property_by_offset(poffset)
+- prop = Prop(node, poffset, p.name, p.value)
++ prop = Prop(node, poffset, p.name, p)
+ props_dict[prop.name] = prop
+
+ poffset = libfdt.fdt_next_property_offset(self._fdt, poffset)
+--
+2.21.0
+
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
index af8d044387a..614d1ec1f8f 100644
--- a/pkgs/misc/uboot/rock64.nix
+++ b/pkgs/misc/uboot/rock64.nix
@@ -15,6 +15,8 @@ in buildUBoot rec {
sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75";
};
+ patches = [ ./rock64-fdt-dtc-compatibility.patch ];
+
extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];
# Close to being blob free, but the U-Boot TPL causes the kernel to hang after a few minutes
diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix
index d8802e6d5f5..be5f7afa342 100644
--- a/pkgs/misc/uboot/rockpro64.nix
+++ b/pkgs/misc/uboot/rockpro64.nix
@@ -15,6 +15,8 @@ in buildUBoot rec {
sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75";
};
+ patches = [ ./rock64-fdt-dtc-compatibility.patch ];
+
# Upstream ATF hangs in SPL
extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.17.elf" "u-boot.itb" "all" ];
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 6625502a163..d327b7e16fa 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2019-04-26";
+ version = "2019-05-02";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
- rev = "737ed31de5be0c50502d820421726b8a707d1a58";
- sha256 = "16641pvxs98s4jvry3dkap3nijzxganc5fn241mhzd954s2k6wwp";
+ rev = "7f0954b89ef7c43e5fb7b6490665e9814c8205b2";
+ sha256 = "0pgqgswggf037y49a2yr1p5k3fbw6lq4v9v7ipj6h9y9iklbqzhr";
};
};
@@ -392,12 +392,12 @@ let
denite-git = buildVimPluginFrom2Nix {
pname = "denite-git";
- version = "2019-03-29";
+ version = "2019-04-29";
src = fetchFromGitHub {
owner = "chemzqm";
repo = "denite-git";
- rev = "c86a6b2b22ac16544a8bccbefb608604f9252349";
- sha256 = "19rx46xd9hi7z1n9adxa9yf4ljv38jhwinplsszwlpcq518ac4i6";
+ rev = "b6a0c7d08a1477a1607ba8be3a33c1352f93d79d";
+ sha256 = "001848nr3pdzv6z2c9a262n63gcln1dr98qamkr5c5khxc1da322";
};
};
@@ -516,23 +516,23 @@ let
dhall-vim = buildVimPluginFrom2Nix {
pname = "dhall-vim";
- version = "2018-12-26";
+ version = "2019-05-01";
src = fetchFromGitHub {
owner = "vmchale";
repo = "dhall-vim";
- rev = "54a0f463d098abf72c76a233a6a3f0f9dd069dfe";
- sha256 = "0yacjv7kv79yilsyij43m378shzln0qra5c3nc5g2mc2i9hxcial";
+ rev = "20d2fa23dddc11d694d62c957e4aa7287dba63d3";
+ sha256 = "0718acz3qwrnjy1d76bar825dhbjj7mm5vrkgwxhyvdljx5w0hxs";
};
};
direnv-vim = buildVimPluginFrom2Nix {
pname = "direnv-vim";
- version = "2019-04-25";
+ version = "2019-04-30";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv.vim";
- rev = "15c0d2c91d65f95f90c30d21d9ea11bc8ee51def";
- sha256 = "1k9ipwiayp5i31slr1119az0wylqsnaf5zz04x7bcpclaaajgzfk";
+ rev = "5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1";
+ sha256 = "0vabsv98vwdjns3dliplg7x8ssyrin44af9jl248kdzkqw5fx445";
};
};
@@ -606,12 +606,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
- version = "2019-04-18";
+ version = "2019-05-02";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "b0b5f19042685cd3ec3b3f388f64aaed489889db";
- sha256 = "0rikl448c1ps3phivb0xpx8a085wk5fz2xj1b6n24g88xfay1psm";
+ rev = "2920687e537c6aa771a3d24986f7a09359558dbe";
+ sha256 = "0x5kslnv82v5hczaywjpbigyqf4n6g2kbr8k9m76c3ajb9p5k13r";
};
};
@@ -695,12 +695,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2019-02-22";
+ version = "2019-04-29";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "b31512e2a2d062ee4b6eb38864594c83f1ad2c2f";
- sha256 = "18wqg6czxwbbydssq6azqcl4llb5lf4phivdas4nqnlgg9hnp5ga";
+ rev = "ac4e7bfb36c88d27799c080218cea3bb833bdbd9";
+ sha256 = "10m6v1jrry4fhrbkgb8kkdjasl0pz2qgr9khxl94nlg42fxb1r20";
};
};
@@ -739,12 +739,12 @@ let
goyo-vim = buildVimPluginFrom2Nix {
pname = "goyo-vim";
- version = "2019-02-20";
+ version = "2019-04-29";
src = fetchFromGitHub {
owner = "junegunn";
repo = "goyo.vim";
- rev = "057fe68e442e7d4ffa45a3c992389e19e64abc7c";
- sha256 = "1yx2i1daqmz99apzh8x69xvg4iav0c97rm7n5y1q07z9rbz4j554";
+ rev = "012290431a834752d2fce3dfc197dba3d7d1d0f8";
+ sha256 = "0vqd75c2a5yjmiakv26cgd9wkqwzfbi93qm1vw9g2j5s96dcwa6a";
};
};
@@ -893,12 +893,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
- version = "2019-04-05";
+ version = "2019-04-28";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
- rev = "914754a04e0ea0882b3172230199fd771b02dc95";
- sha256 = "0wj0fgvbvwhgx0ij9lrka5an2xc8gy6pq7add8ildk25fls23ig4";
+ rev = "69aa410afaefbecbcaac2a8254af7bed290d6927";
+ sha256 = "0wd29y66k12rndh1zf3wfdz3gqv25dahf0m61rg3zii6dcyk0qsd";
fetchSubmodules = true;
};
};
@@ -949,12 +949,12 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
- version = "2019-01-18";
+ version = "2019-05-02";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
- rev = "83ae633be323a7fb5baf77e493232cf3358d02bf";
- sha256 = "1y0iwz3wwcds4b2cll893l17i14ih5dwq1njxjbq9sd0694dadz7";
+ rev = "78b1cc9e715f509a7e9f157e0d7a0e02b7e5125e";
+ sha256 = "0j2i09shwi8fcqfh7m48m4d6bi5pzfgn8mf6iw53v4ah2cdp2m93";
};
};
@@ -1862,12 +1862,12 @@ let
typescript-vim = buildVimPluginFrom2Nix {
pname = "typescript-vim";
- version = "2019-04-11";
+ version = "2019-05-03";
src = fetchFromGitHub {
owner = "leafgarland";
repo = "typescript-vim";
- rev = "f50fed442f8e75e714efeaf015225af9eaf67cf4";
- sha256 = "077h668k4z94kvpijmivq3mf6884b96fz5v53rlzxrx80431biww";
+ rev = "7704fac2c765aaf975ad4034933bf63113dd4a64";
+ sha256 = "1cjqqbaaa2ns1c916skqcgqy9yv7l9b457bfay5gv1p364y35msk";
};
};
@@ -1939,12 +1939,12 @@ let
vim = buildVimPluginFrom2Nix {
pname = "vim";
- version = "2019-04-15";
+ version = "2019-04-30";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "d8ca3b52b07529f4a55da451291fe0ca8e18d02d";
- sha256 = "153pmg4x0yrc9npwjk9zyzd347r2xkr3r72nmhh1cfy0n0lg10gg";
+ rev = "b68c4fdbd32b7ccf3b4e52e69106021f9bc54878";
+ sha256 = "0xikbqljpn3br0pbf8iigp3lc0qwxl4gcj6zg4y5gr8aywll7819";
};
};
@@ -2170,12 +2170,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2019-04-26";
+ version = "2019-05-02";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "28ed36a9ec9c9bc35bec81c42cfbf8cf5e76b231";
- sha256 = "0a5cgkwwhrdxfh1mf1x5vph132s4cmmdy9h88yhzz1jpw0x8322d";
+ rev = "a26a46069825ec391b342481b2d45be66887b8a2";
+ sha256 = "14g72yg38vb027xw3bsyzrvq16hbapgqqvhls7p4pf3880v9ngff";
};
};
@@ -2445,12 +2445,12 @@ let
vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
- version = "2019-04-21";
+ version = "2019-04-27";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
- rev = "8901782b58f5613d6c1b45456c9f130f30df2dc7";
- sha256 = "0wmqcfiysp6nhspqv1lyvjvpkxpkslrg9rqa8kjf04vcggipdr5g";
+ rev = "ea338f099183c95ecbc2ea7ebde370206573fe94";
+ sha256 = "0az1qpzbv662a12paasx9ci246jy0z5b72chn294254pla595w2b";
};
};
@@ -2478,12 +2478,12 @@ let
vim-easy-align = buildVimPluginFrom2Nix {
pname = "vim-easy-align";
- version = "2017-06-03";
+ version = "2019-04-29";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-easy-align";
- rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0";
- sha256 = "16yis2wlgi8v0h04hiqmnkm9qrby4kbc2fvkw4szfsbg5m3qx0fc";
+ rev = "12dd6316974f71ce333e360c0260b4e1f81169c3";
+ sha256 = "0gpfdla8shaf5ykgakrsf0h0w6ygvwcv3lfpnki24l790xhdi606";
};
};
@@ -2533,12 +2533,12 @@ let
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
- version = "2019-04-25";
+ version = "2019-05-02";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "vim-elixir";
- rev = "8e4782f439b5c8adbfe6d368c21bd4bf5db4cd3a";
- sha256 = "02ikcdpffcwipzlpcjmrsnr7rxm6632x2qhxw0m22727pzqbmrmc";
+ rev = "98c03047d15dfa62cedf56e27bffb03772d41753";
+ sha256 = "0pbad3hlsy6glhmbz6nkb6lfx9y3yb6rw23vc48acxw936zm282n";
};
};
@@ -2577,12 +2577,12 @@ let
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
- version = "2018-06-01";
+ version = "2019-05-01";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
- rev = "1ef0f0726cadd96547a5f79103b66339f170da02";
- sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4";
+ rev = "8ccbaf0cfde235126af3346705a4c2945b32cd77";
+ sha256 = "0xzxx9i4c82zrfyak1a3c0sqdjzh2gzw6vyyjpbcwq58dm6hzz16";
};
};
@@ -2632,12 +2632,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2019-04-24";
+ version = "2019-05-03";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "16b7a060a3e20b8e159783f42ce4aa79a158208c";
- sha256 = "0jg8xcp69134kgjib2pknh0ibsqcc8bcfdi1cw7nb16p3w2s2fzp";
+ rev = "2bde1d9de608f7086c8b2eaeb3e295107bce9d92";
+ sha256 = "0mb7k1kxkvgyfvfi6x37jsxbbq4f9cm0r5nwvb4c5czi915nahnh";
};
};
@@ -2698,12 +2698,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-04-27";
+ version = "2019-05-03";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "3e9a29279627d1ac50a855376b5da4dc0f809356";
- sha256 = "0jyy3hgw8z1c372qd4672p5zpbxnq0l4w2dd4s07div6wxxs9cdh";
+ rev = "2c1a85bbd04f40503bb7d1488d5d8eeb14836efb";
+ sha256 = "0x09prxw5ixprjldkw76b4xxqvl6mgqg5j48xl3ldpndg3v92nqg";
};
};
@@ -3260,34 +3260,34 @@ let
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
- version = "2019-04-25";
+ version = "2019-04-29";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
- rev = "89ebe3cf92b4502cb3b3f5a25f96b27456af5825";
- sha256 = "0d6x3js259xcs0440izrplhly9vg5dsx1fwf4dxgqr17dvd48l06";
+ rev = "ecf6339e8fc31abd17fff7895ca8218540c52598";
+ sha256 = "03zdjbndrzq4gnlsx5ykagw53112b338sj66lpqip2x1kvlw66gk";
};
};
vim-pandoc-after = buildVimPluginFrom2Nix {
pname = "vim-pandoc-after";
- version = "2017-11-21";
+ version = "2019-04-29";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc-after";
- rev = "844f27debf4d72811049167f97191a3b551ddfd5";
- sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf";
+ rev = "26513a138d5e2ba8c785e0d7dfec0218e983e9dd";
+ sha256 = "07wg4j2kx08s9hvvp8jspwb0v7fgac8m8cjr3y1sbq8ca18bkvgy";
};
};
vim-pandoc-syntax = buildVimPluginFrom2Nix {
pname = "vim-pandoc-syntax";
- version = "2019-04-17";
+ version = "2019-04-29";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc-syntax";
- rev = "e1ce4ff92afd23139759e7322ebeb434bbad88b0";
- sha256 = "1wa2gwkq5d5mb97dklyl6q81f0irr8bmbwcdn39x5sxwsahck83c";
+ rev = "22b67a7c67665b97402809195e0ec1d3e8661635";
+ sha256 = "1kxfncw783kw374kn53rq25hw59q6pvx3ypk7s6wxv6cfh2c59kc";
};
};
@@ -3359,11 +3359,11 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2019-04-23";
+ version = "2019-05-01";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "9fd5c11a20f88525088c8635a3bc6a25ec4c05c7";
+ rev = "e8245dbf1746aa59774124de1c77ffc4d8b5b52f";
sha256 = "1b9ndv9lm9p39c56ikj0mj6xs857464vicw3bif9k78j4mf2q12y";
};
};
@@ -3579,12 +3579,12 @@ let
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
- version = "2019-04-02";
+ version = "2019-05-02";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
- rev = "9035bef4c91fd730d76b5fdc994f1dcdcef49405";
- sha256 = "1f65nq1hgvblm074hbqy647vixzhkimr1yhqjlrqg7mjiffrkr43";
+ rev = "d9856e26a552b72238c4f3d65a520b4dcb250b82";
+ sha256 = "0pafvfhf3xbdqyy7v5y8h2j47k4y1zmscp7rans6vd5rq68k8fwf";
};
};
@@ -3623,12 +3623,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2019-04-19";
+ version = "2019-05-01";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "a79d5b062427a4acfd665b2f5498e7052ebc29e5";
- sha256 = "0si5gl0v5f2jhvx03n5vz41kjzbhzqvxwd3p6kg7z3c8r4bac7zh";
+ rev = "9827f1713407ace7d7608b5dec4db256979d5858";
+ sha256 = "1l3pig6v0k629av50vcdhc0qwh5v1lsg7wlmm77q11sk0jacw2sv";
};
};
@@ -3865,12 +3865,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
- version = "2019-04-23";
+ version = "2019-04-27";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
- rev = "b29d535fae1b27308b7cf75c2d27e8b0c929a381";
- sha256 = "09mhcnb8798lb28bc2xpbxkyic3zkypybxbr5p5xniq4d2hmqmx1";
+ rev = "7fa183675d690054022e5d27dbfc29e740637641";
+ sha256 = "14hl9v5l08qcsj3a9zd53v72lr7hm4vkyv8idmxg9wi0m0bqgq5i";
};
};
@@ -3898,12 +3898,12 @@ let
vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime";
- version = "2019-03-31";
+ version = "2019-04-30";
src = fetchFromGitHub {
owner = "wakatime";
repo = "vim-wakatime";
- rev = "fdd56e0e1b0f9cafc0268076c4636f97ccd081dc";
- sha256 = "1b1m4d1dn1ymqrj6bbl44hnmf0rh93jipjlrrbk9gr3fc0x99xmh";
+ rev = "da37439234c7bc10afdd23f10b115eade1e8fa30";
+ sha256 = "1vw14naa535nv8bh1dmv8ji5a2qlrlcqi1szljss2kv9p9z5gl4j";
};
};
@@ -4163,12 +4163,12 @@ let
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
- version = "2019-04-24";
+ version = "2019-04-27";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
- rev = "2ae00449e5d7505102bb63d4bc28abb5e0744829";
- sha256 = "16xsrnlyrzjsx4sr30xbk4bh37yrw0bwkdfvlahicsh6x9fz9sxj";
+ rev = "d691404ae2f7c79ec5d053f2c22a4c775b4bf915";
+ sha256 = "1ijs627q679241qjjajk5nwj664vk7vk1szipjm728m9hf9pk5sx";
fetchSubmodules = true;
};
};
diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix
new file mode 100644
index 00000000000..28a92d31eaa
--- /dev/null
+++ b/pkgs/os-specific/linux/extrace/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "extrace-${version}";
+ version = "0.7";
+
+ src = fetchFromGitHub {
+ owner = "leahneukirchen";
+ repo = "extrace";
+ rev = "v${version}";
+ sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85";
+ };
+
+ makeFlags = "PREFIX=$(out)";
+
+ postInstall = ''
+ install -dm755 "$out/share/licenses/extrace/"
+ install -m644 LICENSE "$out/share/licenses/extrace/LICENSE"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/leahneukirchen/extrace;
+ description = "Trace exec() calls system-wide";
+ license = with licenses; [ gpl2 bsd2 ];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.leahneukirchen ];
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index b78540c44df..231ae0ed983 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.114";
+ version = "4.14.115";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "05cyq4id1l3z8hhfs7ril9qc92pfx9h9pgvwl18q1lf8mg7ispmp";
+ sha256 = "11k1a58l4x22ir8ma9rhdm9gsylpj8dr2izxd0yha8qk39qn3bmp";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index cf952184ccc..4aa711535fd 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.37";
+ version = "4.19.38";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0rcwzzbm4853rhsj5mkya0asi6bhsg3mhh9r9ihps31cqc7b7c7c";
+ sha256 = "0zyd1dgr0fzmnshk0zp2pfwrar8dxfk4f2gz420ywqdw5nhdygva";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 87b9036dc9a..39ffdaee2a2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.171";
+ version = "4.9.172";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "00bznn1x8rq0wgjpl8sbp0cp4mzpbzjdnf2rvm8rinklpy9dj723";
+ sha256 = "03mlbqaj4jz4s72a034i1z8h5swdk04brdzllrlv1h4wk0q8whj9";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix
index 2af5541a57c..492f7caf6b5 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.0.10";
+ version = "5.0.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0xjycbjlzpgskqnwcjml60vkbg7r8fsijdj6ypmhpry7q8ii677a";
+ sha256 = "183zjm2y5fy4djpc7lqwqiv8mb1azhq2iwpfg4p81lyaclv65nqq";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 7351712b887..9528b9be7f7 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "mbpfan-${version}";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "dgraziotin";
repo = "mbpfan";
rev = "v${version}";
- sha256 = "1gysq778rkl6dvvj9a1swxcl15wvz0bng5bn4nwq118cl8p8pask";
+ sha256 = "0aijyxrqh01x0s80yr4cgxgd001iiqqph65pxvby7f0wz8lnxnqj";
};
installPhase = ''
mkdir -p $out/bin $out/etc
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index 96bffc63a27..67dda1e5bd2 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext, bzip2 }:
stdenv.mkDerivation rec {
- name = "sysstat-12.1.3";
+ name = "sysstat-12.1.4";
src = fetchurl {
url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
- sha256 = "1am1a6mwi91921rrq8ivgczdsl4gdz91zxkx7vnrzfjm4zw8njam";
+ sha256 = "0vd1v3kdgsfi82mskh18pyv4bb1rjzzai13vga1ms3nkjvv8lqkg";
};
buildInputs = [ gettext ];
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
deleted file mode 100644
index 12b0dde0c9b..00000000000
--- a/pkgs/servers/emby/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }:
-
-stdenv.mkDerivation rec {
- name = "emby-${version}";
- version = "3.5.3.0";
-
- # We are fetching a binary here, however, a source build is possible.
- # See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43
- # Though in my attempt it failed with this error repeatedly
- # The type 'Attribute' is defined in an assembly that is not referenced. You must add a reference to assembly 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'.
- # This may also need msbuild (instead of xbuild) which isn't in nixpkgs
- # See -> https://github.com/NixOS/nixpkgs/issues/29817
- src = fetchurl {
- url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip";
- sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj";
- };
-
- buildInputs = [
- unzip
- makeWrapper
- ];
-
- propagatedBuildInputs = [
- dotnet-sdk
- sqlite
- ];
-
- preferLocalBuild = true;
-
- buildPhase = ''
- rm -rf {electron,runtimes}
- '';
-
- installPhase = ''
- install -dm 755 "$out/opt/emby-server"
- cp -r * "$out/opt/emby-server"
-
- makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \
- --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
- sqlite
- ]}" \
- --add-flags "$out/opt/emby-server/EmbyServer.dll -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
- '';
-
- meta = with stdenv.lib; {
- description = "MediaBrowser - Bring together your videos, music, photos, and live television";
- homepage = https://emby.media/;
- license = licenses.gpl2;
- maintainers = with maintainers; [ fadenb ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix
index 978e4fe109c..5f6e7d466cf 100644
--- a/pkgs/servers/ftp/pure-ftpd/default.nix
+++ b/pkgs/servers/ftp/pure-ftpd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "pure-ftpd-1.0.48";
+ name = "pure-ftpd-1.0.49";
src = fetchurl {
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz";
- sha256 = "1xr1wlf08qaw93irsbdk4kvhqnkvmi6p0jb8kiiz0vr0h92pszxl";
+ sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn";
};
buildInputs = [ openssl ];
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index f92314b2123..d41c94eee56 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "jellyfin";
- version = "10.3.1";
+ version = "10.3.2";
# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
- sha256 = "1j6jyrbc0ha348y63wk5jv9wjcjydma9cr3jxva1y85pjrmm7z90";
+ sha256 = "0cwmaq61xhdb34f53m2vhnw8v4zrj266vjzfdm106gyychpr46vz";
};
buildInputs = [
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index f14d36f1efb..d4eb0922082 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -14,13 +14,13 @@ in
stdenv.mkDerivation rec {
name = "rspamd-${version}";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
- sha256 = "120944v0n2qh30ri5604h4xz38jm94f6s00gwhsjvs1sfm6csapz";
+ sha256 = "1ygyqlm8x8d54g829pmd3x3qp4rsxj8nq25kgzrpkw73spi7bkkq";
};
nativeBuildInputs = [ cmake pkgconfig perl ];
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index ee127729276..20effd5bceb 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "mosquitto-${version}";
- version = "1.6";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "eclipse";
repo = "mosquitto";
rev = "v${version}";
- sha256 = "1yvn0yj9hb502lvk2yrshpvrnq2fddjyarnw37ip34mhxynnz5gb";
+ sha256 = "0mpllj719cmirynbcgiankdzyg7bn6vpvxxhg8zr18lic5dvgm3p";
};
postPatch = ''
diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix
deleted file mode 100644
index 5b0d15136f8..00000000000
--- a/pkgs/servers/softether/4.18.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl
-, openssl, readline, ncurses, zlib
-, dataDir ? "/var/lib/softether" }:
-
-let
- os = if stdenv.isLinux then "1"
- else if stdenv.isFreeBSD then "2"
- else if stdenv.isSunOS then "3"
- else if stdenv.isDarwin then "4"
- else if stdenv.isOpenBSD then "5"
- else "";
- cpuBits = if stdenv.is64bit then "2" else "1";
-
-in
-
-stdenv.mkDerivation rec {
- name = "softether-${version}";
- version = "4.18";
- build = "9570";
- compiledDate = "2015.07.26";
-
- src = fetchurl {
- url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
- sha256 = "585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574";
- };
-
- buildInputs = [ openssl readline ncurses zlib ];
-
- preConfigure = ''
- echo "${os}
- ${cpuBits}
- " | ./configure
- rm configure
- '';
-
- buildPhase = ''
- mkdir -p $out/bin
- sed -i \
- -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
- -e "/_DIR=/s|/usr|${dataDir}|g" \
- -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
- -e "/echo/s|echo $out/|echo |g" \
- Makefile
- '';
-
- meta = with stdenv.lib; {
- description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
- homepage = https://www.softether.org/;
- license = licenses.gpl2;
- maintainers = [ maintainers.rick68 ];
- platforms = filter (p: p != "aarch64-linux") platforms.linux;
- };
-}
diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix
deleted file mode 100644
index 91dd0d0411f..00000000000
--- a/pkgs/servers/softether/4.20.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl
-, openssl, readline, ncurses, zlib
-, dataDir ? "/var/lib/softether" }:
-
-let
- os = if stdenv.isLinux then "1"
- else if stdenv.isFreeBSD then "2"
- else if stdenv.isSunOS then "3"
- else if stdenv.isDarwin then "4"
- else if stdenv.isOpenBSD then "5"
- else "";
- cpuBits = if stdenv.is64bit then "2" else "1";
-
-in
-
-stdenv.mkDerivation rec {
- name = "softether-${version}";
- version = "4.20";
- build = "9608";
- compiledDate = "2016.04.17";
-
- src = fetchurl {
- url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
- sha256 = "e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e";
- };
-
- buildInputs = [ openssl readline ncurses zlib ];
-
- preConfigure = ''
- echo "${os}
- ${cpuBits}
- " | ./configure
- rm configure
- '';
-
- buildPhase = ''
- mkdir -p $out/bin
- sed -i \
- -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
- -e "/_DIR=/s|/usr|${dataDir}|g" \
- -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
- -e "/echo/s|echo $out/|echo |g" \
- Makefile
- '';
-
- meta = with stdenv.lib; {
- description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
- homepage = https://www.softether.org/;
- license = licenses.gpl2;
- maintainers = [ maintainers.rick68 ];
- platforms = filter (p: p != "aarch64-linux") platforms.linux;
- };
-}
diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix
index 04053174f4e..7eaa5b3e8a0 100644
--- a/pkgs/servers/softether/4.25.nix
+++ b/pkgs/servers/softether/4.25.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = https://www.softether.org/;
license = licenses.gpl2;
maintainers = [ maintainers.rick68 ];
- platforms = filter (p: p != "aarch64-linux") platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix
new file mode 100644
index 00000000000..e26e8f057b6
--- /dev/null
+++ b/pkgs/servers/softether/4.29.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl
+, openssl, readline, ncurses, zlib
+, dataDir ? "/var/lib/softether" }:
+
+stdenv.mkDerivation rec {
+ name = "softether-${version}";
+ version = "4.29";
+ build = "9680";
+
+ src = fetchurl {
+ url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz";
+ sha256 = "1r169s5dr31060r2mxkmm08riy6zrxgapmrc6kdrpxdav6kmy0z6";
+ };
+
+ buildInputs = [ openssl readline ncurses zlib ];
+
+ preConfigure = ''
+ ./configure
+ '';
+
+ buildPhase = ''
+ mkdir -p $out/bin
+ sed -i \
+ -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
+ -e "/_DIR=/s|/usr|${dataDir}|g" \
+ -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
+ -e "/echo/s|echo $out/|echo |g" \
+ Makefile
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
+ homepage = https://www.softether.org/;
+ license = licenses.asl20;
+ maintainers = [ maintainers.rick68 ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index a25f720c3c4..287054a750b 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -3,14 +3,14 @@
}:
let
- version = "11.31.13";
+ version = "11.33.3";
in stdenv.mkDerivation rec {
name = "monetdb-${version}";
src = fetchurl {
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
- sha256 = "1dvqhjxd2lmnqjzj14n4dnlflca0525kshl9abi7qjv0ipcc6a4l";
+ sha256 = "0k0xcm3b5qq2arjfn8f1h020sjkk97qfynsimn848bnl01vscqh8";
};
postPatch = ''
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 3083512e1b4..ebca3eae450 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "shaarli-${version}";
- version = "0.10.3";
+ version = "0.10.4";
src = fetchurl {
url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
- sha256 = "1jcjkyhqwh1pv0a98bidf8az6mc34l4snnsl6lc7m2gxr55099j8";
+ sha256 = "00m41x3nlxcc8dspin61zx7lrv1hjzacjadm34afqrb21yxdp84f";
};
outputs = [ "out" "doc" ];
diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix
new file mode 100644
index 00000000000..833947a6ddb
--- /dev/null
+++ b/pkgs/shells/jush/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, editline }:
+
+stdenv.mkDerivation rec {
+ pname = "jush";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "troglobit";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1azvghrh31gawd798a254ml4id642qvbva64zzg30pjszh1087n8";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+ buildInputs = [ editline ];
+
+ passthru.shellPath = "/bin/jush";
+
+ meta = with stdenv.lib; {
+ description = "just a useless shell";
+ homepage = https://github.com/troglobit/jush;
+ license = licenses.isc;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6b475394126..dce438dc4c9 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2019-04-29";
+ version = "2019-05-01";
name = "oh-my-zsh-${version}";
- rev = "d16adb6a9f9b0ea46121f48751a012f0511b465b";
+ rev = "55f20fed6e34e6651816888ea823b61de2fedbcb";
src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
- sha256 = "0sps2jcsh8x91xzm1zixmi4fij0agzg8m4scyf8sgb6mn41y92rx";
+ sha256 = "1b5mpvrc78zh679bbdj4mm2mv3wgaj6ys4iqnbxlcvgqzzh07hxg";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index 53664409485..97c8e05e83a 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -2,12 +2,12 @@
libpng, libtool, libxml2, pkgconfig, which, xorg }:
stdenv.mkDerivation rec {
name = "nx-libs-${version}";
- version = "3.5.99.19";
+ version = "3.5.99.20";
src = fetchFromGitHub {
owner = "ArcticaProject";
repo = "nx-libs";
rev = version;
- sha256 = "0vw333i59slz4rcmv32j4ydgiiihyqqy3fzgn1h6gj88qsbyfwqm";
+ sha256 = "1c3xjbmnylw53h04g77lk9va1sk1dgg7zhirwz3mpn73r6dkyzix";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig which
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 2d4b6527323..98c5da9707b 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -4,17 +4,17 @@ with lib;
let
- version = "0.17.4";
+ version = "0.17.8";
# switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
pulumiArchPackage = {
"x86_64-linux" = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
- sha256 = "169hj0db3kcq8874sb3px1hk88ls08kq5w6wygay56whymhva65n";
+ sha256 = "1c4fyzwp00r5xcn5ri1s47jmvl646hfsmiqmczdndaf14ib1xszl";
};
"x86_64-darwin" = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
- sha256 = "1cn4mbgzq86d69mpp341zxfl8baakz0n5p9yd5chxrjjvxb6i629";
+ sha256 = "0fxs5bmssbhb9q7adsr8ybkbykazzv2q5dn0zdl8xi90mhpd1lgv";
};
};
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix
index de25d00cf21..d5349900756 100644
--- a/pkgs/tools/archivers/s-tar/default.nix
+++ b/pkgs/tools/archivers/s-tar/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "s-tar-${version}";
- version = "1.5.3";
+ version = "1.6";
src = fetchurl {
url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2";
- sha256 = "0nsg3adv8lwqsbizicgmyxx8w26d1f4almprkcb08cd87s1l40q7";
+ sha256 = "0xpp8gf0ghwdgncdwx17fpadxislwrj48gcm42851hz6p8p6c60v";
};
preConfigure = "rm configure";
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index a5d1e7b05ef..2a51e4d7bc9 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "unrar-${version}";
- version = "5.7.4";
+ version = "5.7.5";
src = fetchurl {
url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
- sha256 = "1d77wwgapwjxxshhinhk51skdd6v6xdsx34jjcjg6cj6zlwd0baq";
+ sha256 = "1vp2pc1n5qhri0zr7fszlpjz8niw9x4cl47wbd9v323sm3dgvhp1";
};
postPatch = ''
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 7ee54a63fbb..c919bfade3a 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchpatch, utillinux, libuuid
+{stdenv, fetchurl, utillinux, libuuid
, crypto ? false, libgcrypt, gnutls, pkgconfig}:
stdenv.mkDerivation rec {
@@ -12,17 +12,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = stdenv.lib.optional crypto pkgconfig;
src = fetchurl {
- url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
+ url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
sha256 = "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy";
};
- patches = [
- (fetchpatch {
- url = "https://sources.debian.org/data/main/n/ntfs-3g/1:2016.2.22AR.1+dfsg-1/debian/patches/0003-CVE-2017-0358.patch";
- sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3";
- })
- ];
-
patchPhase = ''
substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
new file mode 100644
index 00000000000..979b3be0493
--- /dev/null
+++ b/pkgs/tools/misc/docui/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ name = "docui-${version}";
+ version = "1.0.3";
+
+ src = fetchFromGitHub {
+ owner = "skanehira";
+ repo = "docui";
+ rev = version;
+ sha256 = "1kbap36hccwlj273is98cvgf5z5cl2c3s6p46nh6bnykz3zqzs71";
+ };
+
+ modSha256 = "1qma9bnd4k594cr5dcv74xns53mhfyl4jsm01chf85dxywjjd9vd";
+
+ meta = with stdenv.lib; {
+ description = "TUI Client for Docker";
+ homepage = https://github.com/skanehira/docui;
+ license = licenses.mit;
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix
new file mode 100644
index 00000000000..8a270ed0fef
--- /dev/null
+++ b/pkgs/tools/misc/ethminer/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, opencl-headers, cmake, jsoncpp, boost, makeWrapper,
+ cudatoolkit, mesa, ethash, opencl-info, ocl-icd, openssl, pkg-config, cli11 }:
+
+stdenv.mkDerivation rec {
+ pname = "ethminer";
+ version = "0.18.0-rc.0";
+
+ src =
+ fetchFromGitHub {
+ owner = "ethereum-mining";
+ repo = "ethminer";
+ rev = "v${version}";
+ sha256 = "0gwnwxahjfwr4d2aci7y3w206nc5ifssl28ildva98ys0d24wy7z";
+ fetchSubmodules = true;
+ };
+
+ # NOTE: dbus is broken
+ cmakeFlags = [
+ "-DHUNTER_ENABLED=OFF"
+ "-DETHASHCUDA=ON"
+ "-DAPICORE=ON"
+ "-DETHDBUS=OFF"
+ "-DCMAKE_BUILD_TYPE=Release"
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ makeWrapper
+ ];
+
+ buildInputs = [
+ cli11
+ boost
+ opencl-headers
+ mesa
+ cudatoolkit
+ ethash
+ opencl-info
+ ocl-icd
+ openssl
+ jsoncpp
+ ];
+
+ preConfigure = ''
+ sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Ethereum miner with OpenCL, CUDA and stratum support";
+ homepage = https://github.com/ethereum-mining/ethminer;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ nand0p ];
+ license = licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index a6a4d35b7fe..96f2d989601 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
- name = "parallel-20190322";
+ name = "parallel-20190422";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "12q0ys0dp019wykx7jcqbrilz8798hgb66k97aj2s2m7xdpw41ym";
+ sha256 = "0xdl5fnh1vpjp3zpmqsrbbgjixazlhl4d9awk42nz4snzynysjxl";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 4619d05c4c6..70a0b4923c4 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2019.4";
+ version = "1.2019.5";
name = "plantuml-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "0kd0f7kknl6x1dibh4gsx3pl58bzylx42lxwmh9zv4d53gm6a93r";
+ sha256 = "02xx7xyr7il7y6p7p7hq4svcp7jn197mg9b0dcd5bgr84dm6d2ad";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 7f9638a3ffc..ea304d2aa89 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pspg-${version}";
- version = "1.6.4";
+ version = "1.6.5";
src = fetchFromGitHub {
owner = "okbob";
repo = "pspg";
rev = "${version}";
- sha256 = "0j9qn516j0fdz1x196xsdai3qk3jmlamm53zvngqjbjzdfkdclqw";
+ sha256 = "0zz924fl0b99a09gi5l3vxv9dmxnkv1v679w6k9zf365b44z91ki";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index b4683167f33..9b587c27154 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
# dynamically using sysconf(_SC_PAGE_SIZE) instead of hardcoded value that hopefully is correct.
# [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html
# [2] http://www.openwall.com/lists/musl/2015/09/11/8
- url = "https://raw.githubusercontent.com/voidlinux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch";
+ url = "https://raw.githubusercontent.com/void-linux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch";
sha256 = "1m8r3vhrnsy8drgs0svs3fgpi3mmxzdcqsv6bmvc0j52cvfqvhvy";
extraPrefix = ""; # empty means add 'a/' and 'b/'
})
diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix
new file mode 100644
index 00000000000..005abb0968b
--- /dev/null
+++ b/pkgs/tools/networking/obfs4/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchgit, buildGoModule }:
+
+buildGoModule rec {
+ pname = "obfs4";
+ version = "0.0.10";
+
+ src = fetchgit {
+ url = meta.repositories.git;
+ rev = "refs/tags/${pname}proxy-${version}";
+ sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad";
+ };
+
+ modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv";
+
+ meta = with lib; {
+ description = "A pluggable transport proxy";
+ homepage = https://www.torproject.org/projects/obfsproxy;
+ repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git;
+ maintainers = with maintainers; [ phreedom thoughtpolice ];
+ };
+}
diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix
index ea20306e26f..d52cc9d8def 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/pkgs/tools/networking/opensm/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "opensm-${version}";
- version = "3.3.21";
+ version = "3.3.22";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "opensm";
rev = "${version}";
- sha256 = "0iikw28vslxq3baq9qmmw08yay7l524wciz7dv7km09ylcbx23b7";
+ sha256 = "1nb6zl93ffbgb8z8728j0dxrmvk3pm0i6a1sn7mpn8ki1vkf2y0j";
};
nativeBuildInputs = [ autoconf automake libtool bison flex ];
diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index 788c561da3c..2dbbd93e13b 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
- cargoSha256 = "0bzid5wrpcrghazv5652ghyv4amp298p5kfridswv175kmr9gg0x";
+ cargoSha256 = "02xrz7vq8nan70f07xyf335blfmdc6gaz9sbfjipsi1drgfccf09";
meta = with lib; {
description = "An unofficial lightweight implementation of the Bitwarden server API using Rust and SQLite";
diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix
index dac6df56a79..57174148160 100644
--- a/pkgs/tools/security/krunner-pass/default.nix
+++ b/pkgs/tools/security/krunner-pass/default.nix
@@ -1,15 +1,10 @@
-{ mkDerivation, stdenv,
- fetchFromGitHub,
- cmake, extra-cmake-modules, gnumake,
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules
+, kauth, krunner
+, pass, pass-otp ? null }:
- pass, pass-otp ? null, krunner,
-}:
-let
+mkDerivation rec {
pname = "krunner-pass";
version = "1.3.0";
-in
-mkDerivation rec {
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "akermu";
@@ -19,22 +14,26 @@ mkDerivation rec {
};
buildInputs = [
- pass
- pass-otp
- krunner
+ kauth krunner
+ pass pass-otp
];
- nativeBuildInputs = [cmake extra-cmake-modules gnumake];
+ nativeBuildInputs = [ cmake extra-cmake-modules ];
patches = [
+ (fetchpatch {
+ url = https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch;
+ sha256 = "098dqnal57994p51p2srfzg4lgcd6ybp29h037llr9cdv02hdxvl";
+ name = "fix_build.patch";
+ })
./pass-path.patch
];
CXXFLAGS = [
- ''-DNIXPKGS_PASS=\"${stdenv.lib.getBin pass}/bin/pass\"''
+ ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"''
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)";
homepage = https://github.com/akermu/krunner-pass;
license = licenses.gpl3;
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index dfbda2b5e07..198e33c8500 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "lynis";
- version = "2.7.3";
+ version = "2.7.4";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CISOfy";
repo = "${pname}";
rev = "${version}";
- sha256 = "0md1w86i3fy9l78i98ijr5136nbhdiik2dxyw9qnzmvdlvkqmw70";
+ sha256 = "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix
index b649c57b346..0c927b7501b 100644
--- a/pkgs/tools/security/mkp224o/default.nix
+++ b/pkgs/tools/security/mkp224o/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "mkp224o-${version}";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "cathugger";
repo = "mkp224o";
rev = "v${version}";
- sha256 = "1m7r0jfm6na6rk75v1kals3bx2cs6jsfxdgpxdljn39j3qr4mxvd";
+ sha256 = "1il12ahcs5pj52hxn4xvpjfz801xcg31zk2jnkl80frzlwq040qi";
};
buildCommand =
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index 3606e7b23f4..55d2505ed1c 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pdfcrack-${version}";
- version = "0.16";
+ version = "0.17";
src = fetchurl {
url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz";
- sha256 = "1vvkrg3niinz0j9wwm31laxgmd7wdz201kn82b3dbksc0w1v4rbq";
+ sha256 = "15hfxwr9yfzkx842p0jjdjnjarny6qc5fwcpy2f6lnq047pb26sn";
};
installPhase = ''
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index b3ec973368c..29af5a5cc0a 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, makeWrapper
+{ stdenv, fetchFromGitLab, autoconf, automake, makeWrapper
, python3, perl, perlPackages
, libmd, gnupg1, which, getopt, libpaper, nettools, qprint
, sendmailPath ? "/run/wrappers/bin/sendmail" }:
@@ -13,12 +13,15 @@ let
];
in stdenv.mkDerivation rec {
pname = "signing-party";
- version = "2.9";
+ version = "2.10";
name = "${pname}-${version}";
- src = fetchurl {
- url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz";
- sha256 = "14pgi45zqa0zd1ldfj9mnf9jgv5kfrhl78lr8iy7k88p9h6b9n7n";
+ src = fetchFromGitLab {
+ domain = "salsa.debian.org";
+ owner = "signing-party-team";
+ repo = "signing-party";
+ rev = "v${version}";
+ sha256 = "0lq8nmwjmysry0n4jg6vb7bh0lagbyb9pa11ii3s41p1mhzchf2r";
};
# TODO: Get this patch upstream...
diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix
new file mode 100644
index 00000000000..e615cec945d
--- /dev/null
+++ b/pkgs/tools/security/ssh-audit/default.nix
@@ -0,0 +1,53 @@
+{ fetchFromGitHub, python3Packages, stdenv }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "ssh-audit";
+ version = "1.7.0";
+
+ src = fetchFromGitHub {
+ owner = "arthepsy";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ sha256 = "0akrychkdym9f6830ysq787c9nc0bkyqvy4h72498lyghwvwc2ms";
+ };
+
+ checkInputs = [
+ python3Packages.pytest
+ python3Packages.pytestcov
+ ];
+
+ checkPhase = ''
+ py.test --cov-report= --cov=ssh-audit -v test
+ '';
+
+ postPatch = ''
+ printf %s "$setupPy" > setup.py
+ mkdir scripts
+ cp ssh-audit.py scripts/ssh-audit
+ mkdir ssh_audit
+ cp ssh-audit.py ssh_audit/__init__.py
+ '';
+
+ setupPy = /* py */ ''
+ from distutils.core import setup
+ setup(
+ author='arthepsy',
+ description='${meta.description}',
+ license='${meta.license.spdxId}',
+ name='${pname}',
+ packages=['ssh_audit'],
+ scripts=['scripts/ssh-audit'],
+ url='${meta.homepage}',
+ version='${version}',
+ )
+ '';
+
+ meta = {
+ description = "Tool for ssh server auditing";
+ homepage = "https://github.com/arthepsy/ssh-audit";
+ license = stdenv.lib.licenses.mit;
+ maintainers = [
+ stdenv.lib.maintainers.tv
+ ];
+ };
+}
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 1bda80dab45..b3b71a16eb8 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -14,11 +14,12 @@
}:
stdenv.mkDerivation rec {
- name = "tor-0.3.5.7";
+ pname = "tor";
+ version = "0.4.0.5";
src = fetchurl {
- url = "https://dist.torproject.org/${name}.tar.gz";
- sha256 = "17l31p58rsd30w4b6r4d8pbr84z3y7awahvjxbpmnlxc47y8f20v";
+ url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
+ sha256 = "0vk9j3ybz5dwwbmqrdj1bjcsxy76pc8frmfvflkdzwfkvkqcp8mm";
};
outputs = [ "out" "geoip" ];
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index 17680de86f0..badc36650f0 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "inxi-${version}";
- version = "3.0.33-1";
+ version = "3.0.34-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
- sha256 = "19bfdid4zp39irsdq3m6yyqf2336c30da35qgslrzcr2vh815g8c";
+ sha256 = "0x2s40lwsan2pk292nspjgyw00f9f5fdfmwfvl50924pxhyxn2fh";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index a907225914c..8544ee9225f 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -11,11 +11,11 @@ let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
stdenv.mkDerivation rec {
- name = "rsyslog-8.1903.0";
+ name = "rsyslog-8.1904.0";
src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
- sha256 = "0vq50k9n3dlb02431zy2c0vhzvb4x27bp887d1xlrinf7m4kmlnh";
+ sha256 = "0gcwzyq3i76vn49yb97gfsx18mllwxb4q4avbp1vzy63vxcv963h";
};
#patches = [ ./fix-gnutls-detection.patch ];
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index a865859b186..3bf01674977 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FanFicFare";
- version = "3.6.0";
+ version = "3.7.0";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "1ir3m8wknr8shdbmbpiaw73mdpa7mvidkl6pbs9ca23mgwivxa84";
+ sha256 = "1h4a1y9m65lf495r52gayprlbxpd43hpbhcbawadbkxf26gr1vkk";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 04461a825ee..10b4198bd64 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -2,7 +2,7 @@
, texlive
, zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
-, perl, pkgconfig, autoreconfHook
+, perl, perlPackages, pkgconfig, autoreconfHook
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
, cairo, pixman, xorg, clisp, biber
, makeWrapper
@@ -190,7 +190,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
hardeningDisable = [ "format" ];
inherit (core) nativeBuildInputs;
- buildInputs = core.buildInputs ++ [ core cairo harfbuzz icu graphite2 ];
+ buildInputs = core.buildInputs ++ [ core cairo harfbuzz icu graphite2 libX11 ];
configureFlags = common.configureFlags
++ withSystemLibs [ "kpathsea" "ptexenc" "cairo" "harfbuzz" "icu" "graphite2" ]
@@ -364,4 +364,30 @@ xindy = stdenv.mkDerivation {
'';
};
+latexindent = perlPackages.buildPerlPackage rec {
+ inherit (src) name version;
+
+ src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs);
+
+ outputs = [ "out" ];
+
+ propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ];
+
+ postPatch = ''
+ substituteInPlace scripts/latexindent/LatexIndent/GetYamlSettings.pm \
+ --replace '$FindBin::RealBin/defaultSettings.yaml' ${src}/scripts/latexindent/defaultSettings.yaml
+ '';
+
+ # Dirty hack to apply perlFlags, but do no build
+ preConfigure = ''
+ touch Makefile.PL
+ '';
+ buildPhase = ":";
+ installPhase = ''
+ install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent
+ mkdir -p "$out"/${perl.libPrefix}
+ cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/
+ '';
+};
+
}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ada0de74be7..6d9d81c935a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -85,6 +85,7 @@ mapAliases ({
emacsMelpa = emacs25PackagesNg; # for backward compatibility
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18
+ emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65a7afd7f80..29733e3887c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -177,6 +177,8 @@ in
docker-sync = callPackage ../tools/misc/docker-sync { };
+ docui = callPackage ../tools/misc/docui { };
+
dotfiles = callPackage ../applications/misc/dotfiles { };
dotnetenv = callPackage ../build-support/dotnetenv {
@@ -1438,8 +1440,6 @@ in
elm-github-install = callPackage ../tools/package-management/elm-github-install { };
- emby = callPackage ../servers/emby { };
-
enca = callPackage ../tools/text/enca { };
ent = callPackage ../tools/misc/ent { };
@@ -2102,10 +2102,14 @@ in
colormake = callPackage ../development/tools/build-managers/colormake { };
+ ethash = callPackage ../development/libraries/ethash { };
+
cpuminer = callPackage ../tools/misc/cpuminer { };
cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
+ ethminer = callPackage ../tools/misc/ethminer { };
+
cuetools = callPackage ../tools/cd-dvd/cuetools { };
u3-tool = callPackage ../tools/filesystems/u3-tool { };
@@ -4795,6 +4799,8 @@ in
obexd = callPackage ../tools/bluetooth/obexd { };
+ obfs4 = callPackage ../tools/networking/obfs4 { };
+
oci-image-tool = callPackage ../tools/misc/oci-image-tool { };
ocproxy = callPackage ../tools/networking/ocproxy { };
@@ -5368,6 +5374,8 @@ in
rambox = callPackage ../applications/networking/instant-messengers/rambox { };
+ rambox-pro = callPackage ../applications/networking/instant-messengers/rambox/pro.nix { };
+
ranger = callPackage ../applications/misc/ranger { };
rarcrack = callPackage ../tools/security/rarcrack { };
@@ -5760,6 +5768,8 @@ in
smenu = callPackage ../tools/misc/smenu { };
+ smesh = callPackage ../development/libraries/smesh {};
+
smugline = python3Packages.smugline;
snabb = callPackage ../tools/networking/snabb { } ;
@@ -6104,7 +6114,6 @@ in
tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle {
stdenv = stdenvNoCC;
tor-browser-unwrapped = firefoxPackages.tor-browser;
- inherit (python27Packages) obfsproxy;
};
touchegg = callPackage ../tools/inputmethods/touchegg { };
@@ -6846,6 +6855,8 @@ in
ion = callPackage ../shells/ion { };
+ jush = callPackage ../shells/jush { };
+
ksh = callPackage ../shells/ksh { };
mksh = callPackage ../shells/mksh { };
@@ -7859,7 +7870,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
rustup = callPackage ../development/tools/rust/rustup {
- inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
@@ -8901,6 +8912,8 @@ in
libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };
libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { };
+ cli11 = callPackage ../development/tools/misc/cli11 { };
+
dcadec = callPackage ../development/tools/dcadec { };
dejagnu = callPackage ../development/tools/misc/dejagnu { };
@@ -12767,9 +12780,8 @@ in
lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { };
- leksah = callPackage ../development/tools/haskell/leksah {
- inherit (haskellPackages) ghcWithPackages;
- };
+ leksah = throw ("To use leksah, refer to the instructions in " +
+ "https://github.com/leksah/leksah.");
libgme = callPackage ../development/libraries/audio/libgme { };
@@ -14324,10 +14336,9 @@ in
oracleXE = callPackage ../servers/sql/oracle-xe { };
- softether_4_18 = callPackage ../servers/softether/4.18.nix { };
- softether_4_20 = callPackage ../servers/softether/4.20.nix { };
softether_4_25 = callPackage ../servers/softether/4.25.nix { };
- softether = softether_4_25;
+ softether_4_29 = callPackage ../servers/softether/4.29.nix { };
+ softether = softether_4_29;
qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };
@@ -14845,6 +14856,8 @@ in
ebtables = callPackage ../os-specific/linux/ebtables { };
+ extrace = callPackage ../os-specific/linux/extrace { };
+
facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
fatrace = callPackage ../os-specific/linux/fatrace { };
@@ -15764,35 +15777,9 @@ in
# Non-upstream U-Boots:
ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
- inherit (let
- dtc = buildPackages.dtc.overrideAttrs (old: rec {
- version = "1.4.5";
- src = fetchgit {
- url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
- rev = "refs/tags/v${version}";
- sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3";
- };
- });
- # Newer dtc versions are incompatible with U-Boot 2017.09
- inherit (callPackage ../misc/uboot {
- inherit dtc;
- buildPackages = buildPackages // {
- python2 = buildPackages.python2.override (old: {
- packageOverrides = pySelf: pySuper: {
- libfdt = pySelf.toPythonModule dtc;
- };
- });
- };
- }) buildUBoot;
- in {
- ubootRock64 = callPackage ../misc/uboot/rock64.nix {
- inherit buildUBoot;
- };
+ ubootRock64 = callPackage ../misc/uboot/rock64.nix { };
- ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix {
- inherit buildUBoot;
- };
- }) ubootRock64 ubootRockPro64;
+ ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix { };
uclibc = callPackage ../os-specific/linux/uclibc { };
@@ -16426,6 +16413,8 @@ in
termtekst = callPackage ../misc/emulators/termtekst { };
+ tetra-gtk-theme = callPackage ../data/themes/tetra { };
+
tex-gyre = callPackages ../data/fonts/tex-gyre { };
tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
@@ -23500,8 +23489,6 @@ in
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
- tetra-gtk-theme = callPackage ../misc/themes/tetra { };
-
tewi-font = callPackage ../data/fonts/tewi {};
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
@@ -23514,6 +23501,8 @@ in
ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; };
+ ssh-audit = callPackage ../tools/security/ssh-audit { };
+
thermald = callPackage ../tools/system/thermald { };
thinkfan = callPackage ../tools/system/thinkfan { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d7a727ccd6..5ed3c9f1a6f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -782,6 +782,10 @@ in {
python-mnist = callPackage ../development/python-modules/python-mnist { };
+ pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core {
+ inherit (pkgs.xorg) libX11;
+ });
+
python-igraph = callPackage ../development/python-modules/python-igraph {
pkgconfig = pkgs.pkgconfig;
igraph = pkgs.igraph;
@@ -921,6 +925,8 @@ in {
aafigure = callPackage ../development/python-modules/aafigure { };
+ addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { };
+
altair = callPackage ../development/python-modules/altair { };
vega = callPackage ../development/python-modules/vega { };
@@ -1917,6 +1923,8 @@ in {
fastcache = callPackage ../development/python-modules/fastcache { };
+ fastentrypoints = callPackage ../development/python-modules/fastentrypoints { };
+
functools32 = callPackage ../development/python-modules/functools32 { };
future-fstrings = callPackage ../development/python-modules/future-fstrings { };