diff --git a/doc/functions.xml b/doc/functions.xml
index c23f6aa25967..2a9cc44d5c5b 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -649,6 +649,8 @@ merge:"diff3"
imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
finalImageTag = "1.11";
sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
+ os = "linux";
+ arch = "x86_64";
}
@@ -664,9 +666,15 @@ merge:"diff3"
imageDigest specifies the digest of the image to be
- downloaded. Skopeo can be used to get the digest of an image
+ downloaded. Skopeo can be used to get the digest of an image, with its
+ inspect subcommand. Since a given imageName
+ may transparently refer to a manifest list of images which support
+ multiple architectures and/or operating systems, supply the `--override-os`
+ and `--override-arch` arguments to specify exactly which image you
+ want. By default it will match the OS and architecture of the host the
+ command is run on.
- $ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
+ $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
This argument is required.
@@ -686,6 +694,18 @@ merge:"diff3"
This argument is required.
+
+
+ os, if specified, is the operating system of the fetched image.
+ By default it's linux.
+
+
+
+
+ arch, if specified, is the cpu architecture of the fetched image.
+ By default it's x86_64.
+
+
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 1c953a2ba844..79124855f7fa 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -231,6 +231,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Eiffel Forum License v2.0";
};
+ elastic = {
+ fullName = "ELASTIC LICENSE";
+ url = https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt;
+ free = false;
+ };
+
epl10 = spdx {
spdxId = "EPL-1.0";
fullName = "Eclipse Public License 1.0";
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 47841a9eba5c..b07396a9dfd7 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -18,6 +18,7 @@
with lib.lists;
with lib.types;
with lib.attrsets;
+with lib.strings;
with (import ./inspect.nix { inherit lib; }).predicates;
let
@@ -179,9 +180,6 @@ rec {
} // { # aliases
# 'darwin' is the kernel for all of them. We choose macOS by default.
darwin = kernels.macos;
- # TODO(@Ericson2314): Handle these Darwin version suffixes more generally.
- darwin10 = kernels.macos;
- darwin14 = kernels.macos;
watchos = kernels.ios;
tvos = kernels.ios;
win32 = kernels.windows;
@@ -269,6 +267,8 @@ rec {
then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
+ else if hasPrefix "netbsd" (elemAt l 2)
+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
else throw "Target specification with 3 components is ambiguous";
"4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
}.${toString (length l)}
@@ -295,7 +295,9 @@ rec {
else if isDarwin parsed then vendors.apple
else if isWindows parsed then vendors.pc
else vendors.unknown;
- kernel = getKernel args.kernel;
+ kernel = if hasPrefix "darwin" args.kernel then getKernel "darwin"
+ else if hasPrefix "netbsd" args.kernel then getKernel "netbsd"
+ else getKernel args.kernel;
abi =
/**/ if args ? abi then getAbi args.abi
else if isLinux parsed then
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ad5671ac8b73..d3e8932ac1ee 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1486,7 +1486,7 @@
name = "Robin Gloster";
};
gnidorah = {
- email = "yourbestfriend@opmbx.org";
+ email = "gnidorah@yandex.com";
github = "gnidorah";
name = "Alex Ivanov";
};
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 863110a1c7ca..d4e5ff3f4312 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -70,7 +70,7 @@
- Bump the system.nixos.defaultChannel attribute in
+ Bump the system.defaultChannel attribute in
nixos/modules/misc/version.nix
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 2465f370cf13..4eb2f9aa0a95 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -433,9 +433,9 @@ system.autoUpgrade.enable = true;
default. If you have existing systems with such host keys and want to
continue to use them, please set
-system.nixos.stateVersion = "14.12";
+system.stateVersion = "14.12";
- The new option ensures that
+ The new option ensures that
certain configuration changes that could break existing systems (such as
the sshd host key setting) will maintain compatibility
with the specified NixOS release. NixOps sets the state version of
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 298b8d88bb59..36024ce9f45e 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -32,5 +32,5 @@ with lib;
# Allow the user to log in as root without a password.
users.users.root.initialHashedPassword = "";
- system.nixos.stateVersion = mkDefault "18.03";
+ system.stateVersion = mkDefault "18.03";
}
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 165566912401..cbe145d5a330 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -628,7 +628,7 @@ $bootLoaderConfig
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
- system.nixos.stateVersion = "${\(qw(@release@))}"; # Did you read the comment?
+ system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment?
}
EOF
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index f823c0d83bb6..8ca3592f3800 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -21,5 +21,5 @@ with lib;
services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
powerManagement.enable = false;
- system.nixos.stateVersion = mkDefault "18.03";
+ system.stateVersion = mkDefault "18.03";
}
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 33d8a7861693..3be12e4a6375 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -12,29 +12,29 @@ in
{
- options.system.nixos = {
+ options.system = {
- version = mkOption {
+ nixos.version = mkOption {
internal = true;
type = types.str;
description = "The full NixOS version (e.g. 16.03.1160.f2d4ee1).";
};
- release = mkOption {
+ nixos.release = mkOption {
readOnly = true;
type = types.str;
default = trivial.release;
description = "The NixOS release (e.g. 16.03).";
};
- versionSuffix = mkOption {
+ nixos.versionSuffix = mkOption {
internal = true;
type = types.str;
default = trivial.versionSuffix;
description = "The NixOS version suffix (e.g. 1160.f2d4ee1).";
};
- revision = mkOption {
+ nixos.revision = mkOption {
internal = true;
type = types.str;
default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo
@@ -43,7 +43,7 @@ in
description = "The Git revision from which this NixOS configuration was built.";
};
- codeName = mkOption {
+ nixos.codeName = mkOption {
readOnly = true;
type = types.str;
description = "The NixOS release code name (e.g. Emu).";
@@ -76,8 +76,8 @@ in
config = {
- warnings = lib.optional (options.system.nixos.stateVersion.highestPrio > 1000)
- "You don't have `system.nixos.stateVersion` explicitly set. Expect things to break.";
+ warnings = lib.optional (options.system.stateVersion.highestPrio > 1000)
+ "You don't have `system.stateVersion` explicitly set. Expect things to break.";
system.nixos = {
# These defaults are set here rather than up there so that
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 3b5212c9e76b..944a8bdf16fc 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -34,7 +34,7 @@ with lib;
# Subscribe the root user to the NixOS channel by default.
if [ "$USER" = root -a ! -e "$HOME/.nix-channels" ]; then
- echo "${config.system.nixos.defaultChannel} nixos" > "$HOME/.nix-channels"
+ echo "${config.system.defaultChannel} nixos" > "$HOME/.nix-channels"
fi
# Create the per-user garbage collector roots directory.
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 5242444a60b8..40f66ccb26b2 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -4,6 +4,11 @@ with lib;
{
imports = [
+ # !!! These were renamed the other way, but got reverted later.
+ # !!! Drop these before 18.09 is released.
+ (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ])
+ (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ])
+
(mkRenamedOptionModule [ "dysnomia" ] [ "services" "dysnomia" ])
(mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ])
(mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ])
@@ -222,8 +227,6 @@ with lib;
(mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])
(mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])
(mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
- (mkRenamedOptionModule [ "system" "stateVersion" ] [ "system" "nixos" "stateVersion" ])
- (mkRenamedOptionModule [ "system" "defaultChannel" ] [ "system" "nixos" "defaultChannel" ])
# Users
(mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 3eb7879e2d9f..0dde9ee6e2e5 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -218,7 +218,7 @@ in
config = mkIf config.services.mysql.enable {
services.mysql.dataDir =
- mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql"
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
else "/var/mysql");
users.users.mysql = {
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index e33bee9db6e9..f59fb1c81772 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -146,7 +146,7 @@ in
};
superUser = mkOption {
type = types.str;
- default= if versionAtLeast config.system.nixos.stateVersion "17.09" then "postgres" else "root";
+ default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
internal = true;
description = ''
NixOS traditionally used 'root' as superuser, most other distros use 'postgres'.
@@ -165,14 +165,14 @@ in
services.postgresql.package =
# Note: when changing the default, make it conditional on
- # ‘system.nixos.stateVersion’ to maintain compatibility with existing
+ # ‘system.stateVersion’ to maintain compatibility with existing
# systems!
- mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then pkgs.postgresql96
- else if versionAtLeast config.system.nixos.stateVersion "16.03" then pkgs.postgresql95
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
+ else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
else pkgs.postgresql94);
services.postgresql.dataDir =
- mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
else "/var/db/postgresql");
services.postgresql.authentication = mkAfter
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 3e3de9114708..18e13f6ac030 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -342,7 +342,7 @@ in {
};
database_type = mkOption {
type = types.enum [ "sqlite3" "psycopg2" ];
- default = if versionAtLeast config.system.nixos.stateVersion "18.03"
+ default = if versionAtLeast config.system.stateVersion "18.03"
then "psycopg2"
else "sqlite3";
description = ''
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 21b664e5b2f9..412d57b27b82 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -14,7 +14,7 @@ let
(optionalString (cfg.defaultMode == "norouting") "--routing=none")
] ++ cfg.extraFlags);
- defaultDataDir = if versionAtLeast config.system.nixos.stateVersion "17.09" then
+ defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then
"/var/lib/ipfs" else
"/var/lib/ipfs/.ipfs";
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 2afab5ee3b3e..d6fabbcd4700 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -9,7 +9,7 @@ let
confFile = pkgs.writeText "radicale.conf" cfg.config;
# This enables us to default to version 2 while still not breaking configurations of people with version 1
- defaultPackage = if versionAtLeast config.system.nixos.stateVersion "17.09" then {
+ defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then {
pkg = pkgs.radicale2;
text = "pkgs.radicale2";
} else {
@@ -35,7 +35,7 @@ in
defaultText = defaultPackage.text;
description = ''
Radicale package to use. This defaults to version 1.x if
- system.nixos.stateVersion < 17.09 and version 2.x
+ system.stateVersion < 17.09 and version 2.x
otherwise.
'';
};
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index d61f588205af..b0831dcd1ca8 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -25,18 +25,17 @@ let
${cfg.extraConf}
'';
- configDir = pkgs.buildEnv {
- name = "elasticsearch-config";
- paths = [
- (pkgs.writeTextDir "elasticsearch.yml" esConfig)
- (if es5 then (pkgs.writeTextDir "log4j2.properties" cfg.logging)
- else (pkgs.writeTextDir "logging.yml" cfg.logging))
- ];
- postBuild = concatStringsSep "\n" (concatLists [
- # Elasticsearch 5.x won't start when the scripts directory does not exist
- (optional es5 "${pkgs.coreutils}/bin/mkdir -p $out/scripts")
- (optional es6 "ln -s ${cfg.package}/config/jvm.options $out/jvm.options")
- ]);
+ configDir = cfg.dataDir + "/config";
+
+ elasticsearchYml = pkgs.writeTextFile {
+ name = "elasticsearch.yml";
+ text = esConfig;
+ };
+
+ loggingConfigFilename = if es5 then "log4j2.properties" else "logging.yml";
+ loggingConfigFile = pkgs.writeTextFile {
+ name = loggingConfigFilename;
+ text = cfg.logging;
};
esPlugins = pkgs.buildEnv {
@@ -193,7 +192,24 @@ in {
ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins
ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
- if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
+
+ # elasticsearch needs to create the elasticsearch.keystore in the config directory
+ # so this directory needs to be writable.
+ mkdir -m 0700 -p ${configDir}
+
+ # Note that we copy config files from the nix store instead of symbolically linking them
+ # because otherwise X-Pack Security will raise the following exception:
+ # java.security.AccessControlException:
+ # access denied ("java.io.FilePermission" "/var/lib/elasticsearch/config/elasticsearch.yml" "read")
+
+ cp ${elasticsearchYml} ${configDir}/elasticsearch.yml
+ # Make sure the logging configuration for old elasticsearch versions is removed:
+ rm -f ${if es5 then "${configDir}/logging.yml" else "${configDir}/log4j2.properties"}
+ cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename}
+ ${optionalString es5 "mkdir -p ${configDir}/scripts"}
+ ${optionalString es6 "cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options"}
+
+ if [ "$(id -u)" = 0 ]; then chown -R elasticsearch:elasticsearch ${cfg.dataDir}; fi
'';
};
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 4237cfdd9198..d0b936cb019f 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -66,7 +66,7 @@ in {
description = "Caddy web server";
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
- environment = mkIf (versionAtLeast config.system.nixos.stateVersion "17.09")
+ environment = mkIf (versionAtLeast config.system.stateVersion "17.09")
{ CADDYPATH = cfg.dataDir; };
serviceConfig = {
ExecStart = ''
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 2ce04ed5342c..ecd35767e01d 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -166,6 +166,24 @@ while (my ($unit, $state) = each %{$activePrev}) {
if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") {
+ # Ignore (i.e. never stop) these units:
+ if ($unit eq "system.slice") {
+ # TODO: This can be removed a few months after 18.09 is out
+ # (i.e. after everyone switched away from 18.03).
+ # Problem: Restarting (stopping) system.slice would not only
+ # stop X11 but also most system units/services. We obviously
+ # don't want this happening to users when they switch from 18.03
+ # to 18.09 or nixos-unstable.
+ # Reason: The following change in systemd:
+ # https://github.com/systemd/systemd/commit/d8e5a9338278d6602a0c552f01f298771a384798
+ # The commit adds system.slice to the perpetual units, which
+ # means removing the unit file and adding it to the source code.
+ # This is done so that system.slice can't be stopped anymore but
+ # in our case it ironically would cause this script to stop
+ # system.slice because the unit was removed (and an older
+ # systemd version is still running).
+ next;
+ }
my $unitInfo = parseUnit($prevUnitFile);
$unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes");
}
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 114e0ca39fa2..d94e21d681f3 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -127,7 +127,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
services.xserver.displayManager.job.logToJournal = true;
# set default stateVersion to avoid warnings during eval
- system.nixos.stateVersion = mkDefault "18.03";
+ system.stateVersion = mkDefault "18.03";
};
}
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 1a45c3093b78..15de8638bbab 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -3,7 +3,7 @@
options = {
ec2 = {
hvm = lib.mkOption {
- default = lib.versionAtLeast config.system.nixos.stateVersion "17.03";
+ default = lib.versionAtLeast config.system.stateVersion "17.03";
internal = true;
description = ''
Whether the EC2 instance is a HVM instance.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 31f5f6fe7807..b91165ce3b82 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -607,7 +607,7 @@ in
{ services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql96;
- system.nixos.stateVersion = "17.03";
+ system.stateVersion = "17.03";
};
};
}
diff --git a/nixos/release.nix b/nixos/release.nix
index dfa4ee9e1278..09b0edcf9bd6 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -198,7 +198,7 @@ in rec {
modules = singleton ({ ... }:
{ fileSystems."/".device = mkDefault "/dev/sda1";
boot.loader.grub.device = mkDefault "/dev/sda";
- system.nixos.stateVersion = mkDefault "18.03";
+ system.stateVersion = mkDefault "18.03";
});
}).config.system.build.toplevel;
preferLocalBuild = true;
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 42bff6a9a3f9..93b00b5b9772 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : {
inherit (config.nixpkgs.localSystem) system;
modules = lib.singleton {
containers.foo.config = {
- system.nixos.stateVersion = "18.03";
+ system.stateVersion = "18.03";
};
};
};
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index c4d954592ef0..4affe3d9d56d 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
networking.firewall.allowPing = true;
- system.nixos.stateVersion = "18.03";
+ system.stateVersion = "18.03";
};
};
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 8dba7a905fa6..4c5c441ca265 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -1,4 +1,4 @@
-{ system ? builtins.currentSystem }:
+{ system ? builtins.currentSystem, enableUnfree ? false }:
with import ../lib/testing.nix { inherit system; };
with pkgs.lib;
let
@@ -99,9 +99,16 @@ in mapAttrs mkElkTest {
logstash = pkgs.logstash5;
kibana = pkgs.kibana5;
};
- "ELK-6" = {
- elasticsearch = pkgs.elasticsearch6;
- logstash = pkgs.logstash6;
- kibana = pkgs.kibana6;
- };
+ "ELK-6" =
+ if enableUnfree
+ then {
+ elasticsearch = pkgs.elasticsearch6;
+ logstash = pkgs.logstash6;
+ kibana = pkgs.kibana6;
+ }
+ else {
+ elasticsearch = pkgs.elasticsearch6-oss;
+ logstash = pkgs.logstash6-oss;
+ kibana = pkgs.kibana6-oss;
+ };
}
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 0a9c2d394a7a..bf22fc9291af 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -43,7 +43,7 @@ in
});
})
];
- system.nixos.stateVersion = "17.03";
+ system.stateVersion = "17.03";
};
radicale1_export = lib.recursiveUpdate radicale1 {
services.radicale.extraArgs = [
@@ -54,7 +54,7 @@ in
services.radicale.extraArgs = [ "--verify-storage" ];
};
radicale2 = lib.recursiveUpdate (common args) {
- system.nixos.stateVersion = "17.09";
+ system.stateVersion = "17.09";
};
};
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index f809b30189f4..5f89b0a0c173 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -1,8 +1,8 @@
-{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }:
+{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv, gtk2 }:
let
- version = "0.10.0";
- name = "mist-${version}";
+ version = "0.11.1";
+ name = "mist";
throwSystem = throw "Unsupported system: ${stdenv.system}";
@@ -31,11 +31,11 @@ let
src = {
i686-linux = fetchurl {
url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip";
- sha256 = "01hvxlm9w522pwvsjdy18gsrapkfjr7d1jjl4bqjjysxnjaaj2lk";
+ sha256 = "1ffzp9aa0g6w3d5pzp69fljk3sd51cbqdgxa1x16vj106sqm0gj7";
};
x86_64-linux = fetchurl {
url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip";
- sha256 = "01k17j7fdfhxfd26njdsiwap0xnka2536k9ydk32czd8db7ya9zi";
+ sha256 = "0yx4x72l8gk68yh9saki48zgqx8k92xnkm79dc651wdpd5c25cz3";
};
}.${stdenv.system} or throwSystem;
@@ -50,13 +50,14 @@ let
ln -s ${desktopItem}/share/applications/* $out/share/applications
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${atomEnv.libPath}:$out/lib/mist" \
+ --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/mist" \
$out/lib/mist/mist
'';
});
in
buildFHSUserEnv {
- inherit name meta;
+ name = "mist";
+ inherit meta;
targetPkgs = pkgs: with pkgs; [
mist
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
index 343ec8679feb..42fa8b7621a5 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
description = "Tracker music player for the terminal";
homepage = http://mikmod.shlomifish.org/;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 2e474ed3410c..56b17a865df8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -94,6 +94,14 @@ self:
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
+ # Build same version as Haskell package
+ hindent = super.hindent.overrideAttrs (attrs: {
+ version = external.hindent.version;
+ src = external.hindent.src;
+ packageRequires = [ self.haskell-mode ];
+ propagatedUserEnvPkgs = [ external.hindent ];
+ });
+
# upstream issue: missing file header
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index c0febd803cc0..f3b77c708a7b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -108,6 +108,14 @@ self:
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
+ # Build same version as Haskell package
+ hindent = super.hindent.overrideAttrs (attrs: {
+ version = external.hindent.version;
+ src = external.hindent.src;
+ packageRequires = [ self.haskell-mode ];
+ propagatedUserEnvPkgs = [ external.hindent ];
+ });
+
# upstream issue: missing file header
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index da15081173da..7a700e0956b8 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -112,12 +112,9 @@ in stdenv.mkDerivation rec {
"--enable-luainterp"
]
++ stdenv.lib.optionals pythonSupport [
- "--enable-python${if isPython3 then "3" else ""}"
- ]
- ++ stdenv.lib.optionals (pythonSupport && stdenv.isDarwin) [ # Why only for Darwin?
- "--enable-python${if isPython3 then "3" else ""}interp=yes" # Duplicate?
+ "--enable-python${if isPython3 then "3" else ""}interp=yes"
"--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib"
- "--disable-python${if isPython3 then "" else "3"}interp"
+ "--disable-python${if (!isPython3) then "3" else ""}interp"
]
++ stdenv.lib.optional nlsSupport "--enable-nls"
++ stdenv.lib.optional perlSupport "--enable-perlinterp"
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index c2ead5a19141..f9220e107f3c 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
homepage = http://www.qgis.org;
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; unix;
- maintainers = with stdenv.lib.maintainers; [viric mpickering];
+ maintainers = with stdenv.lib.maintainers; [mpickering];
};
}
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index dea3fd4e3c61..fbc84521de08 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
description = "Cross platform image and hierarchical vector viewer based";
homepage = http://giv.sourceforge.net/giv/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 8107ed8aa449..1c5b8d1b81dd 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
homepage = http://hugin.sourceforge.net/;
description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric hrdinka ];
+ maintainers = with maintainers; [ hrdinka ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 1d9956245a63..9839bb740778 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
homepage = http://www.paraview.org/;
description = "3D Data analysis and visualization application";
license = stdenv.lib.licenses.free;
- maintainers = with stdenv.lib.maintainers; [viric guibert];
+ maintainers = with stdenv.lib.maintainers; [guibert];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index a3151238438b..140903766848 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -77,7 +77,7 @@ buildDotnetPackage rec {
homepage = http://www.pinta-project.com/;
description = "Drawing/editing program modeled after Paint.NET";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index eb97a2b9b3b6..52cdc0bc0676 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
description = "RAW converter and digital photo processing software";
homepage = http://www.rawtherapee.com/;
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ];
+ maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index ca0f49e0c948..09b431fdb116 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = http://www.sane-project.org/;
description = "Graphical scanning frontend for sane";
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric peti];
+ maintainers = with stdenv.lib.maintainers; [peti];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix
index 55c856c19127..377a5ae61687 100644
--- a/pkgs/applications/graphics/smartdeblur/default.nix
+++ b/pkgs/applications/graphics/smartdeblur/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/Y-Vladimir/SmartDeblur;
description = "Tool for restoring blurry and defocused images";
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 0fa859ac84bb..0a98f387ff86 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -162,7 +162,7 @@ stdenv.mkDerivation rec {
description = "Comprehensive e-book software";
homepage = https://calibre-ebook.com;
license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
- maintainers = with maintainers; [ viric domenkozar pSub AndersonTorres ];
+ maintainers = with maintainers; [ domenkozar pSub AndersonTorres ];
platforms = platforms.linux;
inherit version;
};
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 3b620fc0606c..3ee2006ab0c0 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = https://tools.suckless.org/dmenu;
license = licenses.mit;
- maintainers = with maintainers; [ viric pSub ];
+ maintainers = with maintainers; [ pSub ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index bd7fbe863163..504ef78743c2 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "doomseeker-${version}";
- version = "2018-03-03";
+ version = "2018-03-05";
src = fetchFromBitbucket {
owner = "Doomseeker";
repo = "doomseeker";
- rev = "072110a8fe0643c4a72461e7768560813bb0a62b";
- sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p";
+ rev = "c2c7f37b1afb";
+ sha256 = "17fna3a604miqsvply3klnmypps4ifz8axgd3pj96z46ybxs8akw";
};
- patches = [ ./fix_paths.patch ];
+ patches = [ ./fix_paths.patch ./qt_build_fix.patch ];
buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
diff --git a/pkgs/applications/misc/doomseeker/qt_build_fix.patch b/pkgs/applications/misc/doomseeker/qt_build_fix.patch
new file mode 100644
index 000000000000..e21b53b3cc53
--- /dev/null
+++ b/pkgs/applications/misc/doomseeker/qt_build_fix.patch
@@ -0,0 +1,47 @@
+diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp
+--- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100
++++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700
+@@ -32,6 +32,7 @@
+ #include
+ #include
+ #include
++#include
+
+ DClass : public Ui::IRCDock
+ {
+diff -r c2c7f37b1afb src/core/gui/logdock.cpp
+--- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100
++++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700
+@@ -21,6 +21,8 @@
+ // Copyright (C) 2009 "Zalewa"
+ //------------------------------------------------------------------------------
+
++#include
++
+ #include "clipboard.h"
+ #include "logdock.h"
+ #include "log.h"
+diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp
+--- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100
++++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700
+@@ -21,6 +21,7 @@
+ // Copyright (C) 2014 Braden "Blzut3" Obrzut
+ //------------------------------------------------------------------------------
+
++#include
+ #include
+
+ #include "serverdetailsdock.h"
+diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp
+--- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100
++++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700
+@@ -20,6 +20,9 @@
+ //------------------------------------------------------------------------------
+ // Copyright (C) 2011 "Zalewa"
+ //------------------------------------------------------------------------------
++
++#include
++
+ #include "serverfilterdock.h"
+ #include "ui_serverfilterdock.h"
+
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index d83eb1ed86a7..b08ce5baa5b6 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = http://eaglemode.sourceforge.net;
description = "Zoomable User Interface";
license = licenses.gpl3;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
broken = true;
};
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index d1befec34082..70a6efb90ddc 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
description = "OpenStreetMap editor";
homepage = http://merkaartor.be/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 1857c3118ddd..bce2a79cde33 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
repositories.git = git://git.ghostscript.com/mupdf.git;
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
license = licenses.agpl3Plus;
- maintainers = with maintainers; [ viric vrthra fpletz ];
+ maintainers = with maintainers; [ vrthra fpletz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix
index 447fc4570a76..9a40e3bc1053 100644
--- a/pkgs/applications/misc/navipowm/default.nix
+++ b/pkgs/applications/misc/navipowm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
homepage = http://navipowm.sourceforge.net/;
description = "Car navigation system";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index 92269e03e58d..362d28d2607f 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = http://www.navit-project.org/;
description = "Car navigation system with routing engine using OSM maps";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 35931707ed6b..40432c18aa38 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec {
description = "Open source document analysis and OCR system";
license = licenses.asl20;
homepage = https://github.com/tmbdev/ocropy/;
- maintainers = with maintainers; [ domenkozar viric ];
+ maintainers = with maintainers; [ domenkozar ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 3562a4f9b168..efaf986a9e54 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -3,8 +3,7 @@
with stdenv.lib;
-let patches' = if patches == null then [] else patches;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "st-0.8.1";
src = fetchurl {
@@ -12,7 +11,7 @@ in stdenv.mkDerivation rec {
sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
};
- patches = patches';
+ inherit patches;
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
@@ -29,7 +28,7 @@ in stdenv.mkDerivation rec {
homepage = https://st.suckless.org/;
description = "Simple Terminal for X from Suckless.org Community";
license = licenses.mit;
- maintainers = with maintainers; [viric andsild];
+ maintainers = with maintainers; [andsild];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
index 48e0d19e20b9..5bb614ac68b1 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
description = "Free Open-Source filesystem on-the-fly encryption";
homepage = http://www.truecrypt.org/;
license = "TrueCrypt License Version 2.6";
- maintainers = with stdenv.lib.maintainers; [ viric ryantm ];
+ maintainers = with stdenv.lib.maintainers; [ ryantm ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 8b15b0307897..aa36ccd49e23 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://invisible-island.net/xterm;
license = with stdenv.lib.licenses; [ mit ];
- maintainers = with stdenv.lib.maintainers; [viric vrthra];
+ maintainers = with stdenv.lib.maintainers; [vrthra];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c2471d8a0eaa..ff9b8b10b18e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -138,10 +138,6 @@ let
# for updated patches and hints about build flags
# (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000")
./patches/fix-freetype.patch
- ] ++ optionals (versionRange "66" "68") [
- ./patches/nix_plugin_paths_52.patch
- (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc")
- ] ++ optionals (versionAtLeast version "68") [
./patches/nix_plugin_paths_68.patch
] ++ optionals (versionRange "68" "69") [
./patches/remove-webp-include-68.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch
deleted file mode 100644
index fc1b609479b2..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
-index f4e119d..d9775bd 100644
---- a/chrome/common/chrome_paths.cc
-+++ b/chrome/common/chrome_paths.cc
-@@ -68,21 +68,14 @@ static base::LazyInstance
- g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
-
- // Gets the path for internal plugins.
--bool GetInternalPluginsDirectory(base::FilePath* result) {
--#if defined(OS_MACOSX)
-- // If called from Chrome, get internal plugins from a subdirectory of the
-- // framework.
-- if (base::mac::AmIBundled()) {
-- *result = chrome::GetFrameworkBundlePath();
-- DCHECK(!result->empty());
-- *result = result->Append("Internet Plug-Ins");
-- return true;
-- }
-- // In tests, just look in the module directory (below).
--#endif
--
-- // The rest of the world expects plugins in the module directory.
-- return PathService::Get(base::DIR_MODULE, result);
-+bool GetInternalPluginsDirectory(base::FilePath* result,
-+ const std::string& ident) {
-+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
-+ const char* value = getenv(full_env.c_str());
-+ if (value == NULL)
-+ return PathService::Get(base::DIR_MODULE, result);
-+ else
-+ *result = base::FilePath(value);
- }
-
- // Gets the path for bundled implementations of components. Note that these
-@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) {
- create_dir = true;
- break;
- case chrome::DIR_INTERNAL_PLUGINS:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "ALL"))
- return false;
- break;
- case chrome::DIR_COMPONENTS:
-@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) {
- return false;
- break;
- case chrome::DIR_PEPPER_FLASH_PLUGIN:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
- return false;
- cur = cur.Append(kPepperFlashBaseDirectory);
- break;
-@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) {
- // We currently need a path here to look up whether the plugin is disabled
- // and what its permissions are.
- case chrome::FILE_NACL_PLUGIN:
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "NACL"))
- return false;
- cur = cur.Append(kInternalNaClPluginFileName);
- break;
-@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
- cur = cur.DirName();
- }
- #else
-- if (!GetInternalPluginsDirectory(&cur))
-+ if (!GetInternalPluginsDirectory(&cur, "PNACL"))
- return false;
- #endif
- cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 16873ead34f3..7f2f4387da54 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0m82ag02mydq5xkd0pamk2nq035j7yzhl47hnwl1irm632rpnfb4";
- sha256bin64 = "0xx6kjaa13al1ka0rfcrz1aj0nwhdwzqakz533ghk8qyvhanypkp";
- version = "68.0.3440.59";
+ sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57";
+ sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv";
+ version = "68.0.3440.68";
};
dev = {
- sha256 = "1gpjf213ai3sjh894jsl5ziild15049p6bnh36z0r1f5w68pzakg";
- sha256bin64 = "1slj3gj4786lqrypng48zy5030snar8pirqwm92b5pq25xd595j8";
- version = "69.0.3486.0";
+ sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv";
+ sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx";
+ version = "69.0.3497.12";
};
stable = {
- sha256 = "0am0q0wkmrvhidi4x07fvgb4ymv5q3agmwzgm808dj7ninfnnba5";
- sha256bin64 = "06baih4wf88rpmw73vfhap4dxd61vjgmr256ix8qd937x2hv7qd3";
- version = "67.0.3396.99";
+ sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw";
+ sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij";
+ version = "68.0.3440.75";
};
}
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index bb8eb83d6bf0..ff165f99ae9b 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://links.twibright.com/;
description = "A small browser with some graphics support";
- maintainers = with maintainers; [ raskin viric ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index f1d33b83fd0c..fa481b7fe663 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -44,7 +44,7 @@ in mkDerivation rec {
description = "Qt Tox client";
homepage = https://tox.chat;
license = licenses.gpl3;
- maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
+ maintainers = with maintainers; [ jgeerds akaWolf peterhoeg ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 8a45e988c07d..646b41cfe75a 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Reference CLI for Tox";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ viric jgeerds ];
+ maintainers = with maintainers; [ jgeerds ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 13f7bce49218..8f1960b58cd8 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -62,7 +62,7 @@ let
description = "Low-latency, high quality voice chat software";
homepage = https://mumble.info;
license = licenses.bsd3;
- maintainers = with maintainers; [ viric jgeerds wkennington ];
+ maintainers = with maintainers; [ jgeerds wkennington ];
platforms = platforms.linux;
};
});
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index e15c3588c298..8e1777b0ce79 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric vrthra ];
+ maintainers = with maintainers; [ vrthra ];
platforms = platforms.gnu ++ platforms.linux;
};
}
diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix
index 9763c0ee97fa..9428b2764585 100644
--- a/pkgs/applications/networking/p2p/gnunet/git.nix
+++ b/pkgs/applications/networking/p2p/gnunet/git.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index a5d861093c90..a1f275723966 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
homepage = https://www.qbittorrent.org/;
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ Anton-Latukha viric ];
+ maintainers = with maintainers; [ Anton-Latukha ];
};
}
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 2a4991b9318f..f7f989dc3a9d 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE";
homepage = http://pjsip.org/;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric olynch];
+ maintainers = with stdenv.lib.maintainers; [olynch];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix
new file mode 100644
index 000000000000..78910d1ecf6e
--- /dev/null
+++ b/pkgs/applications/networking/sieve-connect/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec {
+ name = "sieve-connect-${version}";
+ version = "0.89";
+
+ src = fetchFromGitHub {
+ owner = "philpennock";
+ repo = "sieve-connect";
+ rev = "v${version}";
+ sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp";
+ };
+
+ buildInputs = [ perl ];
+ nativeBuildInputs = [ makeWrapper ];
+
+ preBuild = ''
+ # Fixes failing build when not building in git repo
+ mkdir .git
+ touch .git/HEAD
+ echo "${version}" > versionfile
+ echo "$(date +%Y-%m-%d)" > datefile
+ '';
+
+ buildFlags = [ "PERL5LIB=${stdenv.lib.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ];
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/man/man1
+ install -m 755 sieve-connect $out/bin
+ gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz
+
+ wrapProgram $out/bin/sieve-connect \
+ --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [
+ AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage
+ TermReadKey TermReadLineGnu ])}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A client for the MANAGESIEVE Protocol";
+ longDescription = ''
+ This is sieve-connect. A client for the ManageSieve protocol,
+ as specifed in RFC 5804. Historically, this was MANAGESIEVE as
+ implemented by timsieved in Cyrus IMAP.
+ '';
+ homepage = https://github.com/philpennock/sieve-connect;
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ das_j ];
+ };
+}
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 80b1e9caeaa9..30fa41de12d1 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Advanced IRC bouncer";
homepage = https://wiki.znc.in/ZNC;
- maintainers = with maintainers; [ viric schneefux lnl7 ];
+ maintainers = with maintainers; [ schneefux lnl7 ];
license = licenses.asl20;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 28b85936a281..94e0e46767a0 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
description = "Free, easy, personal accounting for everyone";
homepage = http://homebank.free.fr/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric pSub ];
+ maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 7125343dee67..b2f063860032 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -278,7 +278,7 @@ in stdenv.mkDerivation rec {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = https://libreoffice.org/;
license = licenses.lgpl3;
- maintainers = with maintainers; [ viric raskin ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 5958a5aa79e4..eb99cac8e9ec 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -275,7 +275,7 @@ in stdenv.mkDerivation rec {
description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
homepage = https://libreoffice.org/;
license = licenses.lgpl3;
- maintainers = with maintainers; [ viric raskin ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index d4cf7f5ea907..78c981ded56f 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "VCD/Waveform viewer for Unix and Win32";
homepage = http://gtkwave.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ thoughtpolice viric ];
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index af2ee49daee9..196374706e1f 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
description = "The Next Generation Spice (Electronic Circuit Simulator)";
homepage = http://ngspice.sourceforge.net;
license = with licenses; [ "BSD" gpl2 ];
- maintainers = with maintainers; [ bgamari viric rongcuid ];
+ maintainers = with maintainers; [ bgamari rongcuid ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index d32beeef4f48..6a0b686602ff 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -9,7 +9,7 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
stdenv.mkDerivation rec {
name = "${attr}-${version}";
attr = if enableGUI then "giac-with-xcas" else "giac";
- version = "1.4.9-59";
+ version = "1.4.9-59"; # TODO try to remove preCheck phase on upgrade
src = fetchurl {
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
@@ -50,6 +50,14 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ];
doCheck = true;
+ preCheck = ''
+ # One test in this file fails. That test just tests a part of the pari
+ # interface that isn't actually used in giac. Of course it would be better
+ # to only remove that one test, but that would require a patch.
+ # Removing the whole test set should be good enough for now.
+ # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326
+ echo > check/chk_fhan11
+ '';
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index a811c9da8c27..9fe1d9df46dc 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
name = "pari-${version}";
- version = "2.9.5";
+ version = "2.11.0";
src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
- sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb";
+ sha256 = "18f9yj8ffn3dxignbxj1x36771zbxy4js0r18mv6831ymb6cld9q";
};
buildInputs = [
@@ -67,8 +67,8 @@ stdenv.mkDerivation rec {
run 3 or 4 times faster.) gp2c currently only understands a subset
of the GP language.
'';
- homepage = "http://pari.math.u-bordeaux.fr/";
- downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
+ homepage = http://pari.math.u-bordeaux.fr;
+ downloadPage = http://pari.math.u-bordeaux.fr/download.html;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes raskin AndersonTorres ];
platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 0637e813b48c..5fcab43c86ba 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://fixounet.free.fr/avidemux/;
description = "Free video editor designed for simple video editing tasks";
- maintainers = with maintainers; [ viric abbradar ma27 ];
+ maintainers = with maintainers; [ abbradar ma27 ];
# "CPU not supported" errors on AArch64
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl2;
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index 3a595da96d07..a76608bdd900 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
description = "A script system that allows advanced non-linear editing";
homepage = https://github.com/avxsynth/avxsynth;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ codyopel viric ];
+ maintainers = with maintainers; [ codyopel ];
platforms = platforms.linux;
broken = true; # 2018-04-10
};
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 05d8c1edec29..742c2fb03f7c 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
homepage = http://www.qemu.org/;
description = "A generic and open source machine emulator and virtualizer";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric eelco ];
+ maintainers = with maintainers; [ eelco ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 5e1098e97064..3bb79f6a77da 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = https://tools.suckless.org/tabbed;
description = "Simple generic tabbed fronted to xembed aware applications";
license = licenses.mit;
- maintainers = with maintainers; [ viric vrthra ];
+ maintainers = with maintainers; [ vrthra ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
index 8ed144a32ea4..3423b0e181d5 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = http://vwm.sourceforge.net/;
description = "Dynamic window manager for the console";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 91f9e7c71e35..2048220361ac 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -43,10 +43,8 @@ let
# The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
coreutils_bin = if nativeTools then "" else getBin coreutils;
- dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config;
-
# See description in cc-wrapper.
- infixSalt = dashlessTarget;
+ infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
# The dynamic linker has different names on different platforms. This is a
# shell glob that ought to match it.
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index aca96f58ed97..a981ffea7081 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -45,14 +45,12 @@ let
default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc)
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
- dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config;
-
# The "infix salt" is a arbitrary string added in the middle of env vars
# defined by cc-wrapper's hooks so that multiple cc-wrappers can be used
# without interfering. For the moment, it is defined as the target triple,
# adjusted to be a valid bash identifier. This should be considered an
# unstable implementation detail, however.
- infixSalt = dashlessTarget;
+ infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
expand-response-params =
if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 950c0c86a6e4..bc79f9ff12fd 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -36,10 +36,11 @@ rec {
in
{ imageName
# To find the digest of an image, you can use skopeo:
- # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
- # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+ # see doc/functions.xml
, imageDigest
, sha256
+ , os ? "linux"
+ , arch ? "x86_64"
# This used to set a tag to the pulled image
, finalImageTag ? "latest"
, name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
@@ -59,7 +60,7 @@ rec {
sourceURL = "docker://${imageName}@${imageDigest}";
destNameTag = "${imageName}:${finalImageTag}";
} ''
- skopeo copy "$sourceURL" "docker-archive://$out:$destNameTag"
+ skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag"
'';
# We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 4ceaf77373e6..2ee99ce973ef 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -13,7 +13,7 @@ with lib;
/*
ename: Original Emacs package name, possibly containing special symbols.
*/
-, ename ? pname
+, ename ? null
, version
, recipe
, meta ? {}
@@ -30,6 +30,11 @@ in
import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
+ ename =
+ if isNull(ename)
+ then pname
+ else ename;
+
melpa = fetchFromGitHub {
owner = "melpa";
repo = "melpa";
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index a0b09e30338f..b8f381e97149 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -11,7 +11,7 @@
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
- plasma-framework, qtsensors, libcap
+ plasma-framework, qtsensors, libcap, libdrm
}:
mkDerivation {
@@ -27,7 +27,7 @@ mkDerivation {
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
- libcap
+ libcap libdrm
];
outputs = [ "bin" "dev" "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 272088b72b7b..7f45d51d1609 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -907,10 +907,10 @@ index dd9e304d..49d456e9 100644
- }
fi
- kstartupconfig5
+-kstartupconfig5
++@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5
returncode=$?
--if test $returncode -ne 0; then
-+if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then
+ if test $returncode -ne 0; then
exit 1
fi
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index f10c8ec86ff9..26bed216acfa 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -44,25 +44,30 @@ let
# BEAM-based languages.
elixir = elixir_1_6;
+ elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
+ inherit rebar erlang;
+ debugInfo = true;
+ };
+
elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
- inherit rebar erlang;
- debugInfo = true;
- };
+ inherit rebar erlang;
+ debugInfo = true;
+ };
elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
- inherit rebar erlang;
- debugInfo = true;
- };
+ inherit rebar erlang;
+ debugInfo = true;
+ };
elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
- inherit rebar erlang;
- debugInfo = true;
- };
+ inherit rebar erlang;
+ debugInfo = true;
+ };
elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
- inherit rebar erlang;
- debugInfo = true;
- };
+ inherit rebar erlang;
+ debugInfo = true;
+ };
lfe = lfe_1_2;
lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 943391611de1..101a6feeeae3 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -443,7 +443,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';
- maintainers = with stdenv.lib.maintainers; [ viric peti ];
+ maintainers = with stdenv.lib.maintainers; [ peti ];
platforms =
stdenv.lib.platforms.linux ++
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index bf3b192e1bbd..1df87cc3d429 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -462,7 +462,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';
- maintainers = with stdenv.lib.maintainers; [ viric peti ];
+ maintainers = with stdenv.lib.maintainers; [ peti ];
platforms =
stdenv.lib.platforms.linux ++
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 0564329967e5..1215c971f239 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -461,7 +461,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';
- maintainers = with stdenv.lib.maintainers; [ viric peti ];
+ maintainers = with stdenv.lib.maintainers; [ peti ];
platforms =
stdenv.lib.platforms.linux ++
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 50d55aef2342..0fb390758954 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -469,7 +469,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';
- maintainers = with stdenv.lib.maintainers; [ viric peti ];
+ maintainers = with stdenv.lib.maintainers; [ peti ];
platforms =
stdenv.lib.platforms.linux ++
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 38d8bcd83cf5..fa19e9c533d5 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -38,7 +38,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "8.1.0";
+let version = "8.2.0";
enableParallelBuilding = true;
@@ -127,7 +127,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
+ sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
};
inherit patches;
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 25bb08284142..accdfbf23b56 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"];
};
}
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 7dc134b4fcfd..388da007d33d 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"];
};
}
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 98b6f4adbbf6..e540469c6278 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index 8cfcb1af43d4..d7324665240f 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -113,7 +113,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index c974eb6f6d39..dfeddf2fe65a 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -169,7 +169,7 @@ in stdenv.mkDerivation rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 75037f6a07db..9651dbb72f4d 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,5 +1,5 @@
-{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
@@ -16,25 +16,28 @@ let
compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53";
clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m";
- # Add man output without introducing extra dependencies.
- overrideManOutput = drv:
- let drv-manpages = drv.override { enableManpages = true; }; in
- drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
-
tools = stdenv.lib.makeExtensible (tools: let
- callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+ callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
in {
- llvm = overrideManOutput (callPackage ./llvm.nix {
+ llvm = callPackage ./llvm.nix {
inherit compiler-rt_src;
- });
- clang-unwrapped = overrideManOutput (callPackage ./clang {
+ };
+ clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src;
+ };
+
+ llvm-manpages = lowPrio (tools.llvm.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
+ });
+
+ clang-manpages = lowPrio (tools.clang-unwrapped.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
});
libclang = tools.clang-unwrapped.lib;
- llvm-manpages = lowPrio tools.llvm.man;
- clang-manpages = lowPrio tools.clang-unwrapped.man;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
@@ -54,7 +57,7 @@ let
});
libraries = stdenv.lib.makeExtensible (libraries: let
- callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+ callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 514c3a006e38..1b186c730c06 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -13,7 +13,7 @@
, compiler-rt_src
, debugVersion ? false
, enableManpages ? false
-, enableSharedLibraries ? true
+, enableSharedLibraries ? !enableManpages
}:
let
@@ -158,7 +158,7 @@ in stdenv.mkDerivation (rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 00b0083108b5..38d2b0d461d4 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,5 +1,5 @@
-{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
@@ -15,13 +15,8 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
- # Add man output without introducing extra dependencies.
- overrideManOutput = drv:
- let drv-manpages = drv.override { enableManpages = true; }; in
- drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
-
tools = stdenv.lib.makeExtensible (tools: let
- callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+ callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
mkExtraBuildCommands = cc: ''
rsrc="$out/resource-root"
mkdir "$rsrc"
@@ -33,15 +28,23 @@ let
'';
in {
- llvm = overrideManOutput (callPackage ./llvm.nix { });
+ llvm = callPackage ./llvm.nix { };
- clang-unwrapped = overrideManOutput (callPackage ./clang {
+ clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src;
+ };
+
+ llvm-manpages = lowPrio (tools.llvm.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
+ });
+
+ clang-manpages = lowPrio (tools.clang-unwrapped.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
});
libclang = tools.clang-unwrapped.lib;
- llvm-manpages = lowPrio tools.llvm.man;
- clang-manpages = lowPrio tools.clang-unwrapped.man;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
@@ -70,7 +73,7 @@ let
});
libraries = stdenv.lib.makeExtensible (libraries: let
- callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+ callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
in {
compiler-rt = callPackage ./compiler-rt.nix {};
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 68eebc33c6b9..760969f34690 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -12,7 +12,7 @@
, libcxxabi
, debugVersion ? false
, enableManpages ? false
-, enableSharedLibraries ? true
+, enableSharedLibraries ? !enableManpages
}:
let
@@ -141,7 +141,7 @@ in stdenv.mkDerivation (rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 141daa88dcff..831e4b65344c 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,5 +1,5 @@
-{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
@@ -15,13 +15,8 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
- # Add man output without introducing extra dependencies.
- overrideManOutput = drv:
- let drv-manpages = drv.override { enableManpages = true; }; in
- drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
-
tools = stdenv.lib.makeExtensible (tools: let
- callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+ callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
mkExtraBuildCommands = cc: ''
rsrc="$out/resource-root"
mkdir "$rsrc"
@@ -33,15 +28,23 @@ let
'';
in {
- llvm = overrideManOutput (callPackage ./llvm.nix { });
+ llvm = callPackage ./llvm.nix { };
- clang-unwrapped = overrideManOutput (callPackage ./clang {
+ clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src;
+ };
+
+ llvm-manpages = lowPrio (tools.llvm.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
+ });
+
+ clang-manpages = lowPrio (tools.clang-unwrapped.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
});
libclang = tools.clang-unwrapped.lib;
- llvm-manpages = lowPrio tools.llvm.man;
- clang-manpages = lowPrio tools.clang-unwrapped.man;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
@@ -70,7 +73,7 @@ let
});
libraries = stdenv.lib.makeExtensible (libraries: let
- callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+ callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
in {
compiler-rt = callPackage ./compiler-rt.nix {};
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index a86f5b5039e7..4d981398b9aa 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -142,7 +142,7 @@ in stdenv.mkDerivation (rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix
index c8afd0dcc906..57d5fc0c83b7 100644
--- a/pkgs/development/compilers/mono/generic-cmake.nix
+++ b/pkgs/development/compilers/mono/generic-cmake.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework";
platforms = with stdenv.lib.platforms; darwin ++ linux;
- maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ];
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
};
}
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index e39de76117af..06dcfb8b3933 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework";
platforms = stdenv.lib.platforms.x86;
- maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
+ maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ];
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
} // meta;
}
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index d94179e16fe9..dac8b0279ad9 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -4,23 +4,24 @@ with lib;
mkDerivation rec {
pname = "psc-package";
- version = "0.3.2";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "purescript";
repo = pname;
rev = "v${version}";
- sha256 = "1zpzcyh82xl0grvgcj8b7yzh053i9z94kbym5qrv413pcx7w50cm";
+ sha256 = "1pbgijglyqrm998a6z5ahp4phd72crzr3s8vq17a9dz3i0a9hcj5";
};
isLibrary = false;
isExecutable = true;
executableHaskellDepends = with haskellPackages; [
- aeson aeson-pretty optparse-applicative system-filepath turtle
+ aeson aeson-pretty either errors optparse-applicative
+ system-filepath turtle
];
- description = "An experimental package manager for PureScript";
+ description = "A package manager for PureScript based on package sets";
license = licenses.bsd3;
maintainers = with lib.maintainers; [ Profpatsch ];
}
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 766a10c9579d..795c177bc80d 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -3,15 +3,15 @@
let param =
{
"8.6" = {
- version = "20171214";
- rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
- sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
+ version = "20180709";
+ rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
+ sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
};
"8.7" = {
- version = "20171214";
- rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
- sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
+ version = "20180709";
+ rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
+ sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
};
}."${coq.coq-version}"
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1ec0adafef8f..3c8f94860b40 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -249,14 +249,6 @@ self: super: {
# doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably)
# This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though
hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: {
- patches = old.patches or [] ++ [
- # should land in hnix-5.2
- (pkgs.fetchpatch {
- url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
- sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
- name = "disable-hpack-test-by-default.patch";
- })
- ];
testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
})));
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
new file mode 100644
index 000000000000..426e5a4cbba0
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.7.nix
@@ -0,0 +1,7 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+ version = "1.7.0";
+ sha256 = "082924fngc6ypbkn1ghdwf199radk00daf4q09mm04h81jy4nmxm";
+ minimumOTPVersion = "18";
+}
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 78598ce3d81e..7d3c6476131d 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -37,7 +37,7 @@ in
preBuild = ''
# The build process uses ./rebar. Link it to the nixpkgs rebar
- rm -v rebar
+ rm -vf rebar
ln -s ${rebar}/bin/rebar rebar
substituteInPlace Makefile \
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index ce3ce584434f..f6bd96af40f5 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://octave.org/;
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [viric raskin];
+ maintainers = with stdenv.lib.maintainers; [raskin];
platforms = if overridePlatforms == null then
(with stdenv.lib.platforms; linux ++ darwin)
else overridePlatforms;
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7c866911c593..9bf8577923c8 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -17,7 +17,7 @@ let
, ldapSupport ? config.php.ldap or true
, mhashSupport ? config.php.mhash or true
, mysqlSupport ? (config.php.mysql or true) && (!php7)
- , mysqlndSupport ? config.php.mysqlnd or false
+ , mysqlndSupport ? config.php.mysqlnd or true
, mysqliSupport ? config.php.mysqli or true
, pdo_mysqlSupport ? config.php.pdo_mysql or true
, libxml2Support ? config.php.libxml2 or true
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 66f358e4b95b..7d6f2541d3d1 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.pkgs = builtins.throw "python-boot does not support packages, this package is only intended for bootstrapping." {};
+
meta = {
homepage = http://python.org;
description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
index 3faba45714a0..9dc0776f08a7 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Lightweight audio filtering library made from webrtc code";
license = licenses.bsd3;
- maintainers = with maintainers; [ viric jgeerds ];
+ maintainers = with maintainers; [ jgeerds ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 5790672d8e51..f524c9402558 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
homepage = http://nongnu.org/libchop/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
platforms = platforms.gnu ++ platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 0b341b38917d..f2f8aed065f0 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
description = "A modern and easy-to-use crypto library";
homepage = http://doc.libsodium.org/;
license = licenses.isc;
- maintainers = with maintainers; [ raskin viric wkennington ];
+ maintainers = with maintainers; [ raskin wkennington ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
index 785bc6f3c843..401d9c7d8a2e 100644
--- a/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ viric jgeerds ];
+ maintainers = with maintainers; [ jgeerds ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix
index 5eb08ecd6014..bddb0e1479e2 100644
--- a/pkgs/development/libraries/openct/default.nix
+++ b/pkgs/development/libraries/openct/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/OpenSC/openct/;
license = licenses.lgpl21;
description = "Drivers for several smart card readers";
- maintainers = with maintainers; [ viric wkennington ];
+ maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 264c05e1af9d..e97aa0d391e0 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -35,20 +35,20 @@
}:
let
- version = "3.4.1";
+ version = "3.4.2";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
- sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h";
+ sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
- sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3";
+ sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
};
# Contrib must be built in order to enable Tesseract support:
@@ -59,16 +59,16 @@ let
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv_3rdparty";
- rev = "dfe3162c237af211e98b8960018b564bc209261d";
- sha256 = "1k5xiwdi5r2y3fs5g70lpknxqi4pj32w6l311gfwng3q1cb2crif";
+ rev = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a";
+ sha256 = "1ys9mshfpm8iy8h4ml792gnqrq959dsrcv26axx14niivxyjbji8";
} + "/ippicv";
- files = let name = platform : "ippicv_2017u3_${platform}_general_20170822.tgz"; in
+ files = let name = platform : "ippicv_2017u3_${platform}_general_20180518.tgz"; in
if stdenv.system == "x86_64-linux" then
- { ${name "lnx_intel64"} = "4e0352ce96473837b1d671ce87f17359"; }
+ { ${name "lnx_intel64"} = "b7cc351267db2d34b9efa1cd22ff0572"; }
else if stdenv.system == "i686-linux" then
- { ${name "lnx_ia32"} = "dcdb0ba4b123f240596db1840cd59a76"; }
+ { ${name "lnx_ia32"} = "ea72de74dae3c604eb6348395366e78e"; }
else if stdenv.system == "x86_64-darwin" then
- { ${name "mac_intel64"} = "c1ebb5dfa5b7f54b0c44e1917805a463"; }
+ { ${name "mac_intel64"} = "3ae52b9be0fe73dd45bc5e9429cd3732"; }
else
throw "ICV is not available for this platform (or not yet supported by this package)";
dst = ".cache/ippicv";
@@ -132,17 +132,6 @@ let
ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
'') extra.files);
- # See opencv_contrib/modules/dnn_modern/CMakeLists.txt
- tinyDnn = rec {
- src = fetchurl {
- url = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}";
- sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2";
- };
- name = "v1.0.0a3.tar.gz";
- md5 = "adb1c512e09ca2c7a6faef36f9c53e59";
- dst = ".cache/tiny_dnn";
- };
-
opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
printEnabled = enabled : if enabled then "ON" else "OFF";
@@ -156,6 +145,11 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
'';
+ # TODO: remove the following patch once commit
+ # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
+ # is released.
+ patches = [ ./fix-dnn.patch ];
+
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
@@ -174,9 +168,6 @@ stdenv.mkDerivation rec {
${installExtraFiles vgg}
${installExtraFiles boostdesc}
${installExtraFiles face}
-
- mkdir -p "${tinyDnn.dst}"
- ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}"
'');
buildInputs =
@@ -243,9 +234,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF"
-
- # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build.
- "-DBUILD_opencv_dnn_modern=OFF"
];
enableParallelBuilding = true;
@@ -273,11 +261,11 @@ stdenv.mkDerivation rec {
passthru = lib.optionalAttrs enablePython { pythonPath = []; };
- meta = {
+ meta = with stdenv.lib; {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = https://opencv.org/;
- license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3;
- maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk];
- platforms = with stdenv.lib.platforms; linux ++ darwin;
+ license = with licenses; if enableUnfree then unfree else bsd3;
+ maintainers = with maintainers; [mdaiter basvandijk];
+ platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index d2d106827169..66a840fa2a9e 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = https://opencv.org/;
license = licenses.bsd3;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch
new file mode 100644
index 000000000000..62234a43e461
--- /dev/null
+++ b/pkgs/development/libraries/opencv/fix-dnn.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
+index 730c752ce..abbce0453 100644
+--- a/modules/dnn/src/caffe/caffe_io.cpp
++++ b/modules/dnn/src/caffe/caffe_io.cpp
+@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
+ std::ifstream fs(filename, std::ifstream::in);
+ CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
+ IstreamInputStream input(&fs);
+- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
++ return google::protobuf::TextFormat::Parser().Parse(&input, proto);
+ }
+
+ bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 6fe88fd7cea8..b3f5e12b0ecd 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.6.0.1";
+ version = "2.6.4.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/skalibs";
rev = "refs/tags/v${version}";
- sha256 = "0skdv3wff1i78hb0y771apw0cak5rzxbwbh6l922snfm01z9k1ws";
+ sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2";
};
outputs = [ "lib" "dev" "doc" "out" ];
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 8665be26925e..416cf53ab496 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/commoncpp/;
license = stdenv.lib.licenses.lgpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index bdfe3d1c5c60..b85d76640cf0 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = http://www.vtk.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 154b4890e4fc..97baca62e724 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result
+, bigstringaf
+}:
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "angstrom is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
- version = "0.8.1";
+ version = "0.10.0";
name = "ocaml${ocaml.version}-angstrom-${version}";
src = fetchFromGitHub {
owner = "inhabitedtype";
repo = "angstrom";
rev = "${version}";
- sha256 = "067r3vy5lac1bfx947gy722amna3dbcak54nlh24vx87pmcq31qc";
+ sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
};
buildInputs = [ ocaml findlib jbuilder alcotest ];
- propagatedBuildInputs = [ result ];
+ propagatedBuildInputs = [ bigstringaf result ];
buildPhase = "jbuilder build -p angstrom";
diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix
new file mode 100644
index 000000000000..21a0e3943923
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "bigstringaf is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+ version = "0.3.0";
+ name = "ocaml${ocaml.version}-bigstringaf-${version}";
+
+ src = fetchFromGitHub {
+ owner = "inhabitedtype";
+ repo = "bigstringaf";
+ rev = version;
+ sha256 = "1yx6hv8rk0ldz1h6kk00rwg8abpfc376z00aifl9f5rn7xavpscs";
+ };
+
+ buildInputs = [ ocaml findlib jbuilder alcotest ];
+
+ doCheck = true;
+ checkPhase = "dune runtest";
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
+ description = "Bigstring intrinsics and fast blits based on memcpy/memmove";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (src.meta) homepage;
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix
index c0c8eb51f71f..9f04dac343c4 100644
--- a/pkgs/development/ocaml-modules/estring/default.nix
+++ b/pkgs/development/ocaml-modules/estring/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, buildOcaml, fetchurl }:
+{ stdenv, buildOcaml, ocaml, fetchurl }:
+
+if stdenv.lib.versionAtLeast ocaml.version "4.06"
+then throw "estring is not available for OCaml ${ocaml.version}"
+else
buildOcaml rec {
name = "estring";
diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
new file mode 100644
index 000000000000..bb712d40827e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, angstrom, faraday, alcotest
+}:
+
+stdenv.mkDerivation rec {
+ version = "0.4.1";
+ name = "ocaml${ocaml.version}-httpaf-${version}";
+
+ src = fetchFromGitHub {
+ owner = "inhabitedtype";
+ repo = "httpaf";
+ rev = version;
+ sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
+ };
+
+ buildInputs = [ ocaml findlib jbuilder alcotest ];
+ propagatedBuildInputs = [ angstrom faraday ];
+
+ buildPhase = "dune build -p httpaf";
+
+ doCheck = true;
+ checkPhase = "dune runtest -p httpaf";
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
+ description = "A high-performance, memory-efficient, and scalable web server for OCaml";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (src.meta) homepage;
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index a05d49245b25..7db07e77d84e 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -33,8 +33,9 @@ rec {
};
base = janePackage {
+ version = "0.11.1";
name = "base";
- hash = "0ad5xcyds2lwy9dk7gqwygxk5y769ckrgrjcykdalwdh8qfbi6nf";
+ hash = "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir";
propagatedBuildInputs = [ sexplib0 ];
meta.description = "Full standard library replacement for OCaml";
};
diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix
index 363d5850ec60..c7ed72dc523c 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/default.nix
+++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix
@@ -1,19 +1,32 @@
-{ stdenv, buildOcaml, fetchurl, batteries, csv, ocaml_lwt, ocaml_sqlite3, estring }:
+{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml_lwt
+, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3
+}:
-buildOcaml rec {
- name = "sqlexpr";
- version = "0.5.5";
+stdenv.mkDerivation rec {
+ version = "0.9.0";
+ name = "ocaml${ocaml.version}-sqlexpr-${version}";
src = fetchurl {
- url = "https://forge.ocamlcore.org/frs/download.php/1203/ocaml-sqlexpr-${version}.tar.gz";
- sha256 = "02pi0xxr3xzalwpvcaq96k57wz2vxj20l2mga1a4d2ddvhran8kr";
+ url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz";
+ sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd";
};
- propagatedBuildInputs = [ batteries csv ocaml_lwt ocaml_sqlite3 estring ];
+ buildInputs = [ ocaml findlib jbuilder lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
- meta = with stdenv.lib; {
- homepage = https://github.com/mfp/ocaml-sqlexpr;
+ propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
+
+ buildPhase = "dune build -p sqlexpr";
+
+ doCheck = true;
+ checkPhase = "dune runtest -p sqlexpr";
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
description = "Type-safe, convenient SQLite database access";
- license = licenses.lgpl21;
+ homepage = "https://github.com/mfp/ocaml-sqlexpr";
+ license = stdenv.lib.licenses.lgpl21;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
new file mode 100644
index 000000000000..c15378e8240a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
@@ -0,0 +1,15 @@
+{ stdenv, ocaml, findlib, jbuilder, sqlexpr, ounit
+, ppx_core, ppx_tools_versioned, re, lwt_ppx
+}:
+
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-ppx_sqlexpr-${version}";
+ inherit (sqlexpr) version src installPhase meta;
+
+ buildInputs = [ ocaml findlib jbuilder sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ];
+
+ buildPhase = "dune build -p ppx_sqlexpr";
+
+ doCheck = true;
+ checkPhase = "dune runtest -p ppx_sqlexpr";
+}
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 368db7903751..f1475aed6931 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.10.64";
+ version = "1.10.65";
src = fetchPypi {
inherit pname version;
- sha256 = "977e8ab657747b3e60f4b597b9f732cbe467b12ecc52a9c5b2121c0006d41a63";
+ sha256 = "35f626029a6b17bfd503ce3379b121606e3f965edcab2612bc75ce8603fdf08c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
new file mode 100644
index 000000000000..b4c2767f9dd6
--- /dev/null
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage,
+ lxml, tzlocal, python-dateutil, pygments, future, requests-kerberos,
+ defusedxml, cached-property, isodate, requests_ntlm, dnspython,
+ psutil, requests-mock, pyyaml
+}:
+
+buildPythonPackage rec {
+ pname = "exchangelib";
+ version = "1.11.4";
+
+ # tests are not present in the PyPI version
+ src = fetchFromGitHub {
+ owner = "ecederstrand";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1fpbnjnmqm62vll3m2ys1naikch70kqm26hz86f1cl0r2l2afbab";
+ };
+
+ # one test is failing due to it trying to send a request to example.com
+ patches = [ ./skip_failing_test.patch ];
+ checkInputs = [ psutil requests-mock pyyaml ];
+ propagatedBuildInputs = [
+ lxml tzlocal python-dateutil pygments requests-kerberos
+ future defusedxml cached-property isodate requests_ntlm dnspython ];
+
+ meta = with stdenv.lib; {
+ description = "Client for Microsoft Exchange Web Services (EWS)";
+ homepage = "https://github.com/ecederstrand/exchangelib";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ catern ];
+ };
+}
diff --git a/pkgs/development/python-modules/exchangelib/skip_failing_test.patch b/pkgs/development/python-modules/exchangelib/skip_failing_test.patch
new file mode 100644
index 000000000000..6c070acaf75a
--- /dev/null
+++ b/pkgs/development/python-modules/exchangelib/skip_failing_test.patch
@@ -0,0 +1,18 @@
+--- ./tests/__init__.py 1980-01-02 00:00:00.000000000 +0000
++++ ./tests/__init__.py 1980-01-02 00:00:00.000000000 +0000
+@@ -301,6 +301,7 @@
+ self.assertEqual(id(base_p.thread_pool), id(p.thread_pool))
+ self.assertEqual(id(base_p._session_pool), id(p._session_pool))
+
++ @unittest.skip("no network connection inside the Nix sandbox")
+ def test_close(self):
+ proc = psutil.Process()
+ ip_addresses = {info[4][0] for info in socket.getaddrinfo(
+@@ -1257,6 +1258,7 @@
+ )
+
+
++@unittest.skip("no network connection inside the Nix sandbox")
+ class EWSTest(unittest.TestCase):
+ @classmethod
+ def setUpClass(cls):
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 24a938b195b2..2c0e4aaf4db6 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -3,7 +3,6 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
-, fetchpatch
# Build dependencies
, glibcLocales
# Test dependencies
@@ -35,12 +34,6 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'gnureadline'" " "
'';
- # Upgrade to prompt_toolkit 2.0
- patches = fetchpatch {
- url = https://github.com/ipython/ipython/commit/8e256bd37373f98580ba1ef1d3fcfd7976802238.patch;
- sha256 = "1d9qy2z21n4frf15g4aj7xi011d1d3qc31gs27f2v23j0gv69r9h";
- };
-
buildInputs = [ glibcLocales ];
checkInputs = [ nose pygments ];
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 8a9a82b25698..2f674c9ac343 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -20,6 +20,7 @@
, requests
, send2trash
, pexpect
+, prometheus_client
}:
buildPythonPackage rec {
@@ -39,6 +40,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
+ prometheus_client
];
# disable warning_filters
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index a3b2cd5e42fc..9e4ed217b921 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -35,8 +35,6 @@ in buildPythonPackage rec {
sha256 = "9cd3614b4e31a0889388ff1bd19ae857ad52658b33f776065793c293a29cf612";
};
- LC_ALL = "en_US.UTF-8";
-
checkInputs = [ pytest glibcLocales moto ];
buildInputs = [] ++ optional isDarwin libcxx;
@@ -80,6 +78,8 @@ in buildPythonPackage rec {
"test_datetime_name_accessors"
# Can't import from test folder
"test_oo_optimizable"
+ # Disable IO related tests because IO data is no longer distributed
+ "io"
] ++ optionals isDarwin [
"test_locale"
"test_clipboard"
@@ -97,8 +97,7 @@ in buildPythonPackage rec {
chmod a+x pbcopy pbpaste
export PATH=$(pwd):$PATH
'' + ''
- # pandas no longer seems to distribute datasets for IO tests
- py.test $out/${python.sitePackages}/pandas --ignore=io --skip-slow --skip-network -k "$disabledTests"
+ LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix
new file mode 100644
index 000000000000..7ee739752725
--- /dev/null
+++ b/pkgs/development/python-modules/pykerberos/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, krb5 }:
+
+buildPythonPackage rec {
+ pname = "pykerberos";
+ version = "1.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag";
+ };
+
+ buildInputs = [ krb5 ];
+
+ # there are no tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "High-level interface to Kerberos";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ catern ];
+ };
+}
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
new file mode 100644
index 000000000000..ab0758a84e16
--- /dev/null
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }:
+
+buildPythonPackage rec {
+ pname = "requests-kerberos";
+ version = "0.12.0";
+
+ # tests are not present in the PyPI version
+ src = fetchFromGitHub {
+ owner = "requests";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1qw96aw84nljh9cip372mfv50p1yyirfgigavvavgpc3c5g278s6";
+ };
+
+ checkInputs = [ mock ];
+ propagatedBuildInputs = [ requests pykerberos ];
+
+ # they have a setup.py which mentions a test suite that doesn't exist...
+ patches = [ ./fix_setup.patch ];
+
+ meta = with stdenv.lib; {
+ description = "An authentication handler for using Kerberos with Python Requests.";
+ homepage = "https://github.com/requests/requests-kerberos";
+ license = licenses.isc;
+ maintainers = with maintainers; [ catern ];
+ };
+}
diff --git a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch
new file mode 100644
index 000000000000..67cc3a60f77e
--- /dev/null
+++ b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch
@@ -0,0 +1,9 @@
+--- ./setup.py 1980-01-02 00:00:00.000000000 +0000
++++ ./setup.py 1980-01-02 00:00:00.000000000 +0000
+@@ -56,6 +56,5 @@
+ ':sys_platform=="win32"': ['winkerberos>=0.5.0'],
+ ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'],
+ },
+- test_suite='test_requests_kerberos',
+ tests_require=['mock'],
+ )
diff --git a/pkgs/development/python-modules/sabyenc/default.nix b/pkgs/development/python-modules/sabyenc/default.nix
new file mode 100644
index 000000000000..7c82e22efd68
--- /dev/null
+++ b/pkgs/development/python-modules/sabyenc/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "sabyenc";
+ version = "3.3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0fpvd5mckf1kbn0bhc5ybm08y41ps7sc5f9khz08qyjbikbcww85";
+ };
+
+ # tests are not included in pypi distribution
+ doCheck = false;
+
+ meta = {
+ description = "Python yEnc package optimized for use within SABnzbd";
+ homepage = "https://github.com/sabnzbd/sabyenc/";
+ license = lib.licenses.lgpl3;
+ maintainers = [ lib.maintainers.georgewhewell ];
+ };
+
+}
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index b59a93d37324..56b64cd061b5 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -26,7 +26,7 @@ let
in
stdenv.mkDerivation rec {
- version = "0.15.1";
+ version = "0.15.2";
meta = with stdenv.lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6";
+ sha256 = "1w83zi6d9npi1jmiy022v92xp1cwdvn2qqgghlnl2v9sprryqlxz";
};
sourceRoot = ".";
@@ -128,10 +128,10 @@ stdenv.mkDerivation rec {
buildPhase = ''
export TMPDIR=/tmp/.bazel-$UID
./compile.sh
- ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \
- --spawn_strategy=standalone \
- --genrule_strategy=standalone
- cp bazel-bin/scripts/bazel-complete.bash output/
+ scripts/generate_bash_completion.sh \
+ --bazel=./output/bazel \
+ --output=output/bazel-complete.bash \
+ --prepend=scripts/bazel-complete-template.bash
'';
# Build the CPP and Java examples to verify that Bazel works.
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
mv output/bazel $out/bin
wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}"
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
- mv output/bazel-complete.bash $out/share/bash-completion/completions/
+ mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel
cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
'';
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index 388f6b0db439..7981681a6414 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = {
description = "Translator English -- C/C++ declarations";
license = stdenv.lib.licenses.publicDomain;
- maintainers = with stdenv.lib.maintainers; [viric joelteon];
+ maintainers = with stdenv.lib.maintainers; [joelteon];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index 32c888b7e62f..31e720b13f29 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = with platforms; linux ++ cygwin;
- maintainers = with maintainers; [ viric vrthra ];
+ maintainers = with maintainers; [ vrthra ];
};
}
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix
index 17620c9df6c8..1fd52f435574 100644
--- a/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/pkgs/development/tools/misc/kibana/6.x.nix
@@ -1,4 +1,13 @@
-{ stdenv, makeWrapper, fetchurl, elk6Version, nodejs, coreutils, which }:
+{ elk6Version
+, enableUnfree ? true
+, stdenv
+, makeWrapper
+, fetchzip
+, fetchurl
+, nodejs
+, coreutils
+, which
+}:
with stdenv.lib;
let
@@ -6,12 +15,31 @@ let
info = splitString "-" stdenv.system;
arch = elemAt info 0;
plat = elemAt info 1;
- shas = {
- "x86_64-linux" = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk";
- "x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii";
+ shas =
+ if enableUnfree
+ then {
+ "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
+ "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
+ }
+ else {
+ "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
+ "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
+ };
+
+ # For the correct phantomjs version see:
+ # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js
+ phantomjs = rec {
+ name = "phantomjs-${version}-linux-x86_64";
+ version = "2.1.1";
+ src = fetchzip {
+ inherit name;
+ url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2";
+ sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv";
+ };
};
+
in stdenv.mkDerivation rec {
- name = "kibana-${version}";
+ name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}";
version = elk6Version;
src = fetchurl {
@@ -28,12 +56,19 @@ in stdenv.mkDerivation rec {
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
--prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
+ '' +
+ # phantomjs is needed in the unfree version. When phantomjs doesn't exist in
+ # $out/libexec/kibana/data kibana will try to download and unpack it during
+ # runtime which will fail because the nix store is read-only. So we make sure
+ # it already exist in the nix store.
+ optionalString enableUnfree ''
+ ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name}
'';
meta = {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
- license = licenses.asl20;
+ license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
platforms = with platforms; unix;
};
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 73c5b7623184..cea86f090d6a 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://openocd.sourceforge.net/;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric bjornfor ];
+ maintainers = with maintainers; [ bjornfor ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index eb51abe03214..57de59605f30 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "universal-ctags-${version}";
- version = "2018-01-05";
+ version = "2018-07-23";
src = fetchFromGitHub {
owner = "universal-ctags";
repo = "ctags";
- rev = "c66bdfb4db99977c1bd0568e33e60853a48dca65";
- sha256 = "0fdzhr0704cj84ym00plkl5l9w83haal6i6w70lx6f4968pcliyi";
+ rev = "3522685695ad3312cf4b19399e0c44f3395dd089";
+ sha256 = "1f67hy8c2yr9z4ydsqd7wg8iagzn01qjw2ccx6g8mngv3i3jz9mv";
};
nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index ef74842da1c0..0dcc1287791d 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.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
- sha256 = "0yzjbmdhhwbg551bm06xwwdjdm5kdqw37pgd7hals8qxb0dzmmh8";
+ sha256 = "03qzqy3indqghqy7rnli1zrrlnyfkygxjpb2s7041cik54kf2krw";
};
- cargoSha256 = "1ml4a7xp40l3bhfhpwdrwj3k99zhan9dzpkw71fa689xmv6pdj62";
+ cargoSha256 = "0c3xpzff8jldqbn5a25yy6c2hlz5xy636ml6sj5d24wzcgwg5a2i";
meta = with stdenv.lib; {
description = "A project for generating C bindings from Rust code";
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index dc157b672530..48f9822ad869 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -28,7 +28,7 @@ buildGoPackage rec {
excludedPackages = "integration";
nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
- buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ];
+ buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ];
buildFlagsArray = ''
-ldflags=
@@ -37,8 +37,8 @@ buildGoPackage rec {
'';
preBuild = ''
- export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include"
- export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib"
+ export CGO_CFLAGS="$CFLAGS"
+ export CGO_LDFLAGS="$LDFLAGS"
'';
postBuild = ''
diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix
index 6b7ead6d2030..c8f5deef9240 100644
--- a/pkgs/games/asc/default.nix
+++ b/pkgs/games/asc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric raskin ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index e48ac612b32d..5334e4cbd12c 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
description = "Source Port of the Descent 1 and 2 engines";
homepage = https://www.dxx-rebirth.com/;
license = licenses.free;
- maintainers = with maintainers; [ viric peterhoeg ];
+ maintainers = with maintainers; [ peterhoeg ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index e75698e72799..274a095de6f4 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "3D simulator game where you can drive, fly and sail various vehicles";
homepage = http://rigsofrods.sourceforge.net/;
license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [viric raskin];
+ maintainers = with stdenv.lib.maintainers; [raskin];
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
};
diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index 10ce55f4e217..4bf03fec9de9 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
description = "Car racing game - TORCS fork with more experimental approach";
homepage = http://speed-dreams.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric raskin];
+ maintainers = with stdenv.lib.maintainers; [raskin];
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
};
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index e43d01d2ecaf..a0fc6d5ca718 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Obstacled race game";
homepage = http://xmoto.tuxfamily.org;
- maintainers = with maintainers; [ raskin viric pSub ];
+ maintainers = with maintainers; [ raskin pSub ];
platforms = platforms.linux;
license = licenses.gpl2;
};
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index ce911ae40d5e..111bc449d888 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
- sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2";
+ sha256 = "0ymg6y6v0mdhs1rs11fn33xdp3r6v85563z0f4p7s22j1kd3nd6r";
};
goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix
index 1d281b3ac90d..91584bfa1fe3 100644
--- a/pkgs/misc/themes/kde2/default.nix
+++ b/pkgs/misc/themes/kde2/default.nix
@@ -25,5 +25,6 @@ in stdenv.mkDerivation rec {
homepage = src.meta.homepage;
license = licenses.bsd2;
platforms = platforms.linux;
+ maintainers = with maintainers; [ gnidorah ];
};
}
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8a9580d99e17..b3dfed3d265e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -32,7 +32,7 @@ let
# Documentation & usage see vim-utils.nix.
# attribute names should be the same as used by vim-pi to make dependency
# resolution work
- self = rec {
+self = rec {
# This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
# which recreates this the following derivations based on ./vim-plugin-names
pluginnames2nix = vimUtils.pluginnames2Nix {
@@ -454,17 +454,6 @@ let
};
- deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "deoplete-nvim-2018-07-19";
- src = fetchgit {
- url = "https://github.com/Shougo/deoplete.nvim";
- rev = "0f1921799644cd662cb0a3393ba71096e5e56115";
- sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2";
- };
- dependencies = [];
-
- };
-
ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ultisnips-2018-04-30";
src = fetchgit {
@@ -609,11 +598,11 @@ let
};
clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "clighter8-2018-04-15";
+ name = "clighter8-2018-07-25";
src = fetchgit {
url = "https://github.com/bbchung/clighter8";
- rev = "6d325abd043fd1bc31bea821f751996541bfc944";
- sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq";
+ rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181";
+ sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg";
};
dependencies = [];
preFixup = ''
@@ -623,11 +612,11 @@ let
};
neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "neomake-2018-07-16";
+ name = "neomake-2018-07-23";
src = fetchgit {
url = "https://github.com/benekastah/neomake";
- rev = "f26a31a315f60150fd42682df911306b4d795dd8";
- sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w";
+ rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163";
+ sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0";
};
dependencies = [];
@@ -876,11 +865,11 @@ let
};
vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-2018-07-07";
+ name = "vim-2018-07-23";
src = fetchgit {
url = "https://github.com/dracula/vim";
- rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33";
- sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm";
+ rev = "d329d61c1752807059aef388c4e9629296760a35";
+ sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm";
};
dependencies = [];
@@ -920,11 +909,11 @@ let
};
editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "editorconfig-vim-2017-10-14";
+ name = "editorconfig-vim-2018-07-25";
src = fetchgit {
url = "https://github.com/editorconfig/editorconfig-vim";
- rev = "0abb0634a8bf3c760a283e9e7475594b83869a46";
- sha256 = "1wazl37ivn9nhsy296g1ncvvwc78930lbp8arhwavr52mzpfji21";
+ rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4";
+ sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x";
};
dependencies = [];
@@ -986,11 +975,11 @@ let
};
vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-localvimrc-2018-04-05";
+ name = "vim-localvimrc-2018-07-23";
src = fetchgit {
url = "https://github.com/embear/vim-localvimrc";
- rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648";
- sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja";
+ rev = "a3cb22a68625e022df1da402361801cc817bcec5";
+ sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc";
};
dependencies = [];
@@ -1041,16 +1030,30 @@ let
};
vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-go-2018-07-18";
+ name = "vim-go-2018-07-22";
src = fetchgit {
url = "https://github.com/fatih/vim-go";
- rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b";
- sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk";
+ rev = "5e26ce6bfa9400f645aaa5898f802f46275b9585";
+ sha256 = "1m380n3sdsqydn5dbjj1cafslbr1426ihz1a7rxr980z5jd43hj1";
};
dependencies = [];
};
+ vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-isort-2017-03-12";
+ src = fetchgit {
+ url = "https://github.com/fisadev/vim-isort";
+ rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda";
+ sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m";
+ };
+ dependencies = [];
+ postPatch = ''
+ substituteInPlace ftplugin/python_vimisort.vim \
+ --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+ '';
+ };
+
vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-colorschemes-2017-08-22";
src = fetchgit {
@@ -1349,11 +1352,11 @@ let
};
vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-orgmode-2017-11-17";
+ name = "vim-orgmode-2018-07-25";
src = fetchgit {
url = "https://github.com/jceb/vim-orgmode";
- rev = "ce17a40108a7d5051a3909bd7c5c94b0b5660637";
- sha256 = "0ni99a5zylb0sbmik2xydia87qlv1xcl18j92nwxg8d6wxsnywb9";
+ rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c";
+ sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx";
};
dependencies = [];
@@ -1371,11 +1374,11 @@ let
};
tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "tslime-vim-2016-06-14";
+ name = "tslime-vim-2018-07-23";
src = fetchgit {
url = "https://github.com/jgdavey/tslime.vim";
- rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
- sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
+ rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0";
+ sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x";
};
dependencies = [];
@@ -1448,11 +1451,11 @@ let
};
fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "fzf-vim-2018-07-11";
+ name = "fzf-vim-2018-07-22";
src = fetchgit {
url = "https://github.com/junegunn/fzf.vim";
- rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109";
- sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj";
+ rev = "6ce58caad320be3cf9ff5d275191f88524edf326";
+ sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf";
};
dependencies = [];
@@ -1580,11 +1583,11 @@ let
};
swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "swift-vim-2018-04-20";
+ name = "swift-vim-2018-07-21";
src = fetchgit {
url = "https://github.com/keith/swift.vim";
- rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996";
- sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3";
+ rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab";
+ sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153";
};
dependencies = [];
@@ -1679,11 +1682,11 @@ let
};
vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vimtex-2018-07-13";
+ name = "vimtex-2018-07-25";
src = fetchgit {
url = "https://github.com/lervag/vimtex";
- rev = "e3dabe0a369dac556508ac5d1132979d654bc753";
- sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2";
+ rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c";
+ sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n";
};
dependencies = [];
@@ -1870,22 +1873,22 @@ let
};
vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-signify-2018-07-08";
+ name = "vim-signify-2018-07-25";
src = fetchgit {
url = "https://github.com/mhinz/vim-signify";
- rev = "9303070b022c4a642a8d35361e3680622c525144";
- sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz";
+ rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc";
+ sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59";
};
dependencies = [];
};
vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-startify-2018-07-03";
+ name = "vim-startify-2018-07-21";
src = fetchgit {
url = "https://github.com/mhinz/vim-startify";
- rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde";
- sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s";
+ rev = "8cde338d1f35057fd64146090c960a55b953dcd9";
+ sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29";
};
dependencies = [];
@@ -2094,11 +2097,11 @@ let
};
python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "python-mode-2018-06-13";
+ name = "python-mode-2018-07-23";
src = fetchgit {
url = "https://github.com/python-mode/python-mode";
- rev = "bb746d0d0cba9adedbac856429e37a0dbfc599c6";
- sha256 = "1zlzlfz4arb2gi9ba5mdkpfkirhyk21g18cwx1f150b14baq734f";
+ rev = "d241974f40e8d206f9970e51fb0069951862ba35";
+ sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci";
};
dependencies = [];
@@ -2334,11 +2337,22 @@ let
};
denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "denite-nvim-2018-07-19";
+ name = "denite-nvim-2018-07-22";
src = fetchgit {
url = "https://github.com/shougo/denite.nvim";
- rev = "0cab5543d755be4a6c9d331672b07235f8473f1f";
- sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0";
+ rev = "93d8eb0bf21eb6db3f6a0bf6a84a98bd578176c8";
+ sha256 = "0bhvg9rynqr2nkj7h2h8ws6mm1s7wmgif8avwbirq4pxby5j5f8r";
+ };
+ dependencies = [];
+
+ };
+
+ deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "deoplete-nvim-2018-07-22";
+ src = fetchgit {
+ url = "https://github.com/shougo/deoplete.nvim";
+ rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73";
+ sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz";
};
dependencies = [];
@@ -2484,6 +2498,17 @@ let
'';
};
+ fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "fugitive-gitlab-vim-2018-07-04";
+ src = fetchgit {
+ url = "https://github.com/shumphrey/fugitive-gitlab.vim";
+ rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838";
+ sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d";
+ };
+ dependencies = [];
+
+ };
+
gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "gundo-vim-2017-05-09";
src = fetchgit {
@@ -2495,6 +2520,17 @@ let
};
+ splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "splice-vim-2017-09-03";
+ src = fetchgit {
+ url = "https://github.com/sjl/splice.vim";
+ rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d";
+ sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx";
+ };
+ dependencies = [];
+
+ };
+
last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "last256-2017-06-11";
src = fetchgit {
@@ -2660,6 +2696,17 @@ let
};
+ vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-abolish-2017-03-10";
+ src = fetchgit {
+ url = "https://github.com/tpope/vim-abolish";
+ rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd";
+ sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m";
+ };
+ dependencies = [];
+
+ };
+
vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-commentary-2018-07-11";
src = fetchgit {
@@ -2672,11 +2719,11 @@ let
};
vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-dispatch-2018-07-18";
+ name = "vim-dispatch-2018-07-25";
src = fetchgit {
url = "https://github.com/tpope/vim-dispatch";
- rev = "43760f9d8469d59fd629a97e19dce4491192cca6";
- sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90";
+ rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b";
+ sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh";
};
dependencies = [];
@@ -2693,12 +2740,23 @@ let
};
+ vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-flagship-2018-07-24";
+ src = fetchgit {
+ url = "https://github.com/tpope/vim-flagship";
+ rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff";
+ sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f";
+ };
+ dependencies = [];
+
+ };
+
vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-fugitive-2018-07-18";
+ name = "vim-fugitive-2018-07-25";
src = fetchgit {
url = "https://github.com/tpope/vim-fugitive";
- rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056";
- sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz";
+ rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac";
+ sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v";
};
dependencies = [];
@@ -2715,6 +2773,17 @@ let
};
+ vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-projectionist-2018-07-24";
+ src = fetchgit {
+ url = "https://github.com/tpope/vim-projectionist";
+ rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a";
+ sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz";
+ };
+ dependencies = [];
+
+ };
+
vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-repeat-2018-07-02";
src = fetchgit {
@@ -2727,11 +2796,22 @@ let
};
vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-rhubarb-2018-07-19";
+ name = "vim-rhubarb-2018-07-21";
src = fetchgit {
url = "https://github.com/tpope/vim-rhubarb";
- rev = "186bf27e05ab8713193b1d1210cd3c79f392445a";
- sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv";
+ rev = "848841083d5d4550b5ebbd3bd67dfb3e5146b64a";
+ sha256 = "19b36lbsry994y78lnnnjl83q2laz7j6xvk6h6xbl8kj10v6m4l9";
+ };
+ dependencies = [];
+
+ };
+
+ vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-scriptease-2018-07-18";
+ src = fetchgit {
+ url = "https://github.com/tpope/vim-scriptease";
+ rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300";
+ sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4";
};
dependencies = [];
@@ -2771,11 +2851,22 @@ let
};
vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-surround-2018-06-15";
+ name = "vim-surround-2018-07-23";
src = fetchgit {
url = "https://github.com/tpope/vim-surround";
- rev = "aa1f120ad3a29c27cc41d581cda3751c59343cce";
- sha256 = "1vblmvmbl9k2fzm0fjlbvvbb5izyljaxg187s29cp6p4xm0frcql";
+ rev = "597068870b8f093a8b2d11536c62ff31222ee8d0";
+ sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x";
+ };
+ dependencies = [];
+
+ };
+
+ vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-tbone-2018-06-27";
+ src = fetchgit {
+ url = "https://github.com/tpope/vim-tbone";
+ rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737";
+ sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4";
};
dependencies = [];
@@ -2848,11 +2939,11 @@ let
};
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "youcompleteme-2018-07-24";
+ name = "youcompleteme-2018-07-25";
src = fetchgit {
url = "https://github.com/valloric/youcompleteme";
- rev = "459b3e620e45191b15c48c66b02ff89f1a0674db";
- sha256 = "0s4sndx0mm13xcb559agfcqqdwhp2sr7kpp4ksc9gx41k7626rdr";
+ rev = "15362d9cb8ec054c929e9a202252825eabe47e58";
+ sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy";
};
dependencies = [];
buildPhase = ''
@@ -2874,11 +2965,11 @@ let
};
vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-airline-2018-07-13";
+ name = "vim-airline-2018-07-24";
src = fetchgit {
url = "https://github.com/vim-airline/vim-airline";
- rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2";
- sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw";
+ rev = "59f3669a42728406da6d1b948608cae120d1453f";
+ sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025";
};
dependencies = [];
@@ -2896,11 +2987,11 @@ let
};
vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-pandoc-2018-01-11";
+ name = "vim-pandoc-2018-07-23";
src = fetchgit {
url = "https://github.com/vim-pandoc/vim-pandoc";
- rev = "3a686781ab5ea622616798475deb394e48d3cc48";
- sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3";
+ rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb";
+ sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk";
};
dependencies = [];
@@ -3127,33 +3218,33 @@ let
};
vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vimwiki-2018-06-12";
+ name = "vimwiki-2018-07-21";
src = fetchgit {
url = "https://github.com/vimwiki/vimwiki";
- rev = "9f8b0082dbd99e706cc18de2076f7a66c2ca0a90";
- sha256 = "0q9ik2shvg9lcavds2y7ffsj34zl5ichprm2sylz2bfhjcqgsslw";
+ rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4";
+ sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc";
};
dependencies = [];
};
dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "dhall-vim-2018-07-15";
+ name = "dhall-vim-2018-07-23";
src = fetchgit {
url = "https://github.com/vmchale/dhall-vim";
- rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae";
- sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw";
+ rev = "5bdddb86e660f172841109a28e2a98efb76448ce";
+ sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq";
};
dependencies = [];
};
ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "ale-2018-07-17";
+ name = "ale-2018-07-25";
src = fetchgit {
url = "https://github.com/w0rp/ale";
- rev = "5453e0e1a43302226da1d1d753e162af0231f9d3";
- sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp";
+ rev = "79ffdde267323a206a96227904549c370f27decf";
+ sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg";
};
dependencies = [];
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9e7f70925a20..4d0e85e153ce 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -52,6 +52,7 @@
"github:esneider/YUNOcommit.vim"
"github:fatih/vim-go"
"github:FelikZ/ctrlp-py-matcher"
+"github:fisadev/vim-isort"
"github:flazz/vim-colorschemes"
"github:floobits/floobits-neovim"
"github:frigoeu/psc-ide-vim"
@@ -194,7 +195,7 @@
"github:sheerun/vim-polyglot"
"github:shougo/context_filetype.vim"
"github:shougo/denite.nvim"
-"github:Shougo/deoplete.nvim"
+"github:shougo/deoplete.nvim"
"github:shougo/echodoc.vim"
"github:shougo/neco-syntax"
"github:shougo/neco-vim"
@@ -207,8 +208,10 @@
"github:shougo/tabpagebuffer.vim"
"github:shougo/unite.vim"
"github:shougo/vimproc.vim"
+"github:shumphrey/fugitive-gitlab.vim"
"github:SirVer/ultisnips"
"github:sjl/gundo.vim"
+"github:sjl/splice.vim"
"github:sk1418/last256"
"github:slashmili/alchemist.vim"
"github:t9md/vim-smalls"
@@ -224,17 +227,22 @@
"github:tomasr/molokai"
"github:tomlion/vim-solidity"
"github:tomtom/tlib_vim"
+"github:tpope/vim-abolish"
"github:tpope/vim-commentary"
"github:tpope/vim-dispatch"
"github:tpope/vim-eunuch"
+"github:tpope/vim-flagship"
"github:tpope/vim-fugitive"
"github:tpope/vim-pathogen"
+"github:tpope/vim-projectionist"
"github:tpope/vim-repeat"
"github:tpope/vim-rhubarb"
+"github:tpope/vim-scriptease"
"github:tpope/vim-sensible"
"github:tpope/vim-sleuth"
"github:tpope/vim-speeddating"
"github:tpope/vim-surround"
+"github:tpope/vim-tbone"
"github:tpope/vim-vinegar"
"github:travitch/hasksyn"
"github:twinside/vim-haskellconceal"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
new file mode 100644
index 000000000000..febd2185bac3
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
@@ -0,0 +1,4 @@
+ postPatch = ''
+ substituteInPlace ftplugin/python_vimisort.vim \
+ --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+ '';
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 3b95907a7893..9ccda9178f10 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
+ maintainers = with stdenv.lib.maintainers; [ fpletz ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 79d3a0613dcc..4a98b4f169dd 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
+ maintainers = with stdenv.lib.maintainers; [ fpletz ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index c4a01ce09bd0..c5f63d6671c8 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
description = "Tiny versions of common UNIX utilities in a single small executable";
homepage = https://busybox.net/;
license = licenses.gpl2;
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index a09fa93cb782..fc13d97429c2 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = https://gitlab.com/cryptsetup/cryptsetup/;
description = "LUKS for dm-crypt";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ viric chaoflow ];
+ maintainers = with stdenv.lib.maintainers; [ chaoflow ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 83ca21719faa..b29cf88f168f 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/raspberrypi/firmware;
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
- maintainers = with maintainers; [ dezgeg viric tavyc ];
+ maintainers = with maintainers; [ dezgeg tavyc ];
};
}
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 7f4c9dae166a..91e6e7f4cc59 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/raspberrypi/userland;
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
- maintainers = with maintainers; [ dezgeg viric tavyc ];
+ maintainers = with maintainers; [ dezgeg tavyc ];
};
}
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index de9787a0fa74..833609f9fc2c 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
let
ell = fetchgit {
url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
- rev = "0.6";
- sha256 = "0cs0a7rjg9gl9gn9sc3b1y8mv2zbjg7rb87mla6kcrknjci76pgm";
+ rev = "0.7";
+ sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7";
};
in stdenv.mkDerivation rec {
name = "iwd-${version}";
- version = "0.3";
+ version = "0.4";
src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
- sha256 = "151bqc85vchl1arhl9pyvfashxq886cjrbi6js4csx4vzscbhzzm";
+ sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 2bff43c93dee..c5a53555d20f 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.58";
+ version = "4.14.59";
# 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 = "1zfyrcfsx9410gnjk1hrjs5d4p93qm6k2r9q24i5c1nhfhzf0rgz";
+ sha256 = "16ribg80jk830wyk4k7v86jysmnkj59v62rlkqil3advc7337iky";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index 2ac619232d4c..71984ec5c779 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.17.10";
+ version = "4.17.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/v4.x/linux-${version}.tar.xz";
- sha256 = "1s0vzzdcixy2m3ybd9z1h5b2wiiz2mgnwn09jxvj1v4rwjix457a";
+ sha256 = "133jyd75a0gq71m783s3ydjkpnzw5xxn4wrk1zal6fr19znq87nv";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index d4a2c56a8943..8bb2d53da9e0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.144";
+ version = "4.4.145";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "11lsf62qd9qm6n6ilxwx0zag3phvfmfjpbdc24j4p2c9gfgqpyss";
+ sha256 = "1max0d1b1y1ndrfprrcyb7c9y12pkx2whxzlr70qypcb5jz0v7ff";
};
} // (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 3fe55b2a6f38..d89d0151d9b9 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.115";
+ version = "4.9.116";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0fddhw9v5l8k2j31zlfikd2g397ngyynfbwg92z17vp510fxjf20";
+ sha256 = "07gzjfv24jrn76aga7c8f1y5xsz5if6xbdli1cpfzg60ps8q57lr";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index fee9b0c09d56..3665606e99c8 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
homepage = https://linuxtv.org/projects.php;
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ codyopel viric ];
+ maintainers = with maintainers; [ codyopel ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 94bd92abb4f8..fc7acc35c19a 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -28,7 +28,7 @@ let
description = "BIRD Internet Routing Daemon";
homepage = http://bird.network.cz;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric fpletz ];
+ maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux;
};
};
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index f72ec76cc649..53c8411a22c3 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
description = "Domain name server";
license = stdenv.lib.licenses.mpl20;
- maintainers = with stdenv.lib.maintainers; [viric peti];
+ maintainers = with stdenv.lib.maintainers; [peti];
platforms = with stdenv.lib.platforms; unix;
outputsToInstall = [ "out" "dnsutils" "host" ];
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 461b90bc978c..7c7da3612465 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -85,6 +85,7 @@ let
--replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto'
'';
+ separateDebugInfo = true;
enableParallelBuilding = true;
makeFlags = [ "all" "fdb_java" ]
@@ -92,7 +93,9 @@ let
# it gets statically linked in
++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ]
# Needed environment overrides
- ++ [ "KVRELEASE=1" ];
+ ++ [ "KVRELEASE=1"
+ "NOSTRIP=1"
+ ];
# on 6.0 and later, we can specify all this information manually
configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
@@ -152,9 +155,9 @@ in with builtins; {
};
foundationdb60 = makeFdb rec {
- version = "6.0.2pre2430_${substring 0 8 rev}";
+ version = "6.0.3pre2446_${substring 0 8 rev}";
branch = "release-6.0";
- rev = "7938d247a5eaf886a176575de6592b76374df58c";
- sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h";
+ rev = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5";
+ sha256 = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm";
};
}
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 5a9d8e61b1fe..acd08f658e66 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://dovecot.org/;
description = "Open source IMAP and POP3 email server written with security primarily in mind";
- maintainers = with stdenv.lib.maintainers; [ viric peti rickynils fpletz ];
+ maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 8c86cc6577a7..62fd3397cb63 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
- version = "0.31.2";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
- sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q";
+ sha256 = "1immk6k0wgiks1s39dhyjg79n6rgans9zy85r5wmkp4dlc3r5rx6";
};
patches = [
@@ -45,7 +45,7 @@ in pythonPackages.buildPythonApplication rec {
signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
matrix-angular-sdk bleach netaddr jinja2 psycopg2
psutil msgpack-python lxml matrix-synapse-ldap3
- phonenumbers jsonschema affinity bcrypt
+ phonenumbers jsonschema affinity bcrypt sortedcontainers
];
# Checks fail because of Tox.
@@ -59,6 +59,6 @@ in pythonPackages.buildPythonApplication rec {
homepage = https://matrix.org;
description = "Matrix reference homeserver";
license = licenses.asl20;
- maintainers = [ maintainers.ralith maintainers.roblabla ];
+ maintainers = with maintainers; [ ralith roblabla ekleog ];
};
}
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index b7fddeb854d1..afa6321fb5d3 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
let
- pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]);
+ pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]);
path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec {
version = "2.3.3";
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 06caf191587c..84872649c492 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -1,14 +1,26 @@
-{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }:
+{ elk6Version
+, enableUnfree ? true
+, stdenv
+, fetchurl
+, makeWrapper
+, jre_headless
+, utillinux
+, autoPatchelfHook
+, zlib
+}:
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
version = elk6Version;
- name = "elasticsearch-${version}";
+ name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}";
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
- sha256 = "13hf00khq33yw6zv022vcrsf6vm43isx40x7ww8r1lqx3vmg3rli";
+ sha256 =
+ if enableUnfree
+ then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh"
+ else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4";
};
patches = [ ./es-home-6.x.patch ];
@@ -32,10 +44,22 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
'';
+ passthru = { inherit enableUnfree; };
+
meta = {
description = "Open Source, Distributed, RESTful Search Engine";
- license = licenses.asl20;
+ license = if enableUnfree then licenses.elastic else licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ apeschar basvandijk ];
};
-}
+} // optionalAttrs enableUnfree {
+ dontPatchELF = true;
+ nativeBuildInputs = [ autoPatchelfHook ];
+ runtimeDependencies = [ zlib ];
+ postFixup = ''
+ for exe in $(find $out/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
+ echo "patching $exe..."
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"
+ done
+ '';
+})
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 0e31cd8fe08e..32acba433b12 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
homepage = https://freeswitch.org/;
license = stdenv.lib.licenses.mpl11;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 0ba5a3ee5adb..9a6f2b0b5e1a 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "Secure peer-to-peer VoIP server that uses the SIP protocol";
homepage = http://www.gnu.org/software/sipwitch/;
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ viric ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a1b458986e50..cc28dc73ca87 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2476,6 +2476,7 @@ let
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 xproto ];
+ configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit libX11 xproto ;};
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index 390039944c09..c82b455200a9 100644
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq";
};
+ phases = [ "installPhase" ];
+
installPhase = ''
- install -D $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time
+ install -Dm444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time
'';
meta = with stdenv.lib; {
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index b7b3640a9535..22dd700b2dda 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -339,15 +339,7 @@ in rec {
llvmPackages_5 = super.llvmPackages_5 // (let
tools = super.llvmPackages_5.tools.extend (_: super: {
- # Build man pages with final stdenv not before
- llvm = lib.extendDerivation
- true
- { inherit (super.llvm) man; }
- llvmPackages_5.llvm;
- clang-unwrapped = lib.extendDerivation
- true
- { inherit (super.clang-unwrapped) man; }
- llvmPackages_5.clang-unwrapped;
+ inherit (llvmPackages_5) llvm clang-unwrapped;
});
libraries = super.llvmPackages_5.libraries.extend (_: _: {
inherit (llvmPackages_5) compiler-rt libcxx libcxxabi;
@@ -384,9 +376,8 @@ in rec {
initialPath = import ../common-path.nix { inherit pkgs; };
shell = "${pkgs.bash}/bin/bash";
- # Hack to avoid man pages in stdenv, building bootstrap python
cc = pkgs.llvmPackages.libcxxClang.override {
- cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ];
+ cc = pkgs.llvmPackages.clang-unwrapped;
};
extraNativeBuildInputs = [];
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 331a4bffb814..c454cca0ed6f 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
in py.pkgs.buildPythonApplication rec {
pname = "awscli";
- version = "1.15.58";
+ version = "1.15.66";
src = py.pkgs.fetchPypi {
inherit pname version;
- sha256 = "19wnr498q2mwbp8l978ahy9y7p7icahx53898fki6sbhd9pn2miq";
+ sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4";
};
# No tests included
diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 99c0bd4a34ca..e0b4d1fee124 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://dar.linux.free.fr;
description = "Disk ARchiver, allows backing up files into indexed archives";
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index d4b6b9a72eba..ee14f2d6781d 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -37,7 +37,7 @@ python2Packages.buildPythonApplication rec {
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
homepage = http://www.nongnu.org/duplicity;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ viric peti ];
+ maintainers = with maintainers; [ peti ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
new file mode 100644
index 000000000000..40725defbed9
--- /dev/null
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }:
+
+stdenv.mkDerivation rec {
+ name = "android-file-transfer-${version}";
+ version = "3.4";
+ src = fetchFromGitHub {
+ owner = "whoozle";
+ repo = "android-file-transfer-linux";
+ rev = "v${version}";
+ sha256 = "1xwl0vk57174gdjhgqkzrirwzd2agdm84q30dq9q376ixgxjrifc";
+ };
+ buildInputs = [ cmake fuse readline pkgconfig qtbase ];
+ buildPhase = ''
+ cmake .
+ make
+ '';
+ installPhase = ''
+ make install
+ '';
+ meta = with stdenv.lib; {
+ description = "Reliable MTP client with minimalistic UI";
+ homepage = http://whoozle.github.io/android-file-transfer-linux/;
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.xaverdh ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
index b0c33212edb3..9fe4f90f258b 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://code.google.com/p/cryptsetup/;
description = "LUKS for dm-crypt";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ viric chaoflow ];
+ maintainers = with stdenv.lib.maintainers; [ chaoflow ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index 2fb1c9325c03..7bdb3444a4c1 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
homepage = http://www.sentex.net/~mwandel/jhead/;
description = "Exif Jpeg header manipulation tool";
license = licenses.publicDomain;
- maintainers = with maintainers; [ viric rycee ];
+ maintainers = with maintainers; [ rycee ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 8d1ee7b7bfbe..3769860d469b 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -24,5 +24,6 @@ in stdenv.mkDerivation rec {
homepage = src.meta.homepage;
license = licenses.mit;
platforms = platforms.linux;
+ maintainers = with maintainers; [ gnidorah ];
};
}
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 6cd9623ad1c0..0b606882a5c3 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.3.0.3";
+ version = "2.5.0.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/execline";
rev = "refs/tags/v${version}";
- sha256 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x";
+ sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn";
};
outputs = [ "bin" "lib" "dev" "doc" "out" ];
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 5e6db9fdc209..59c0396eebea 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -2,24 +2,25 @@
stdenv.mkDerivation {
name = "fortune-mod-1.99.1";
-
+
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz;
sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw";
};
-
+
buildInputs = [ recode ];
-
+
preConfigure = ''
- sed -i "s|/usr/|$out/|" Makefile
+ sed -i "s|/usr/|$out/|" Makefile
'';
preBuild = ''
makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=")
'';
-
+
postInstall = ''
- ln -s $out/games/fortune $out/bin/fortune
+ mv $out/games/fortune $out/bin/fortune
+ rmdir $out/games
'';
meta = {
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index e8e2152f7110..b85d2bffc341 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -42,8 +42,8 @@ buildGoPackage rec {
cp $src/bin/fzf-tmux $bin/bin
mkdir -p $man/share/man
cp -r $src/man/man1 $man/share/man
- mkdir -p $out/share/vim-plugins
- ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
+ mkdir -p $out/share/vim-plugins/${name}
+ cp -r $src/plugin $out/share/vim-plugins/${name}
cp -R $src/shell $bin/share/fzf
cat <