diff --git a/doc/functions.xml b/doc/functions.xml index c23f6aa2596..2a9cc44d5c5 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 1c953a2ba84..79124855f7f 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 47841a9eba5..b07396a9dfd 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 ad5671ac8b7..d3e8932ac1e 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 863110a1c7c..d4e5ff3f431 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 2465f370cf1..4eb2f9aa0a9 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 298b8d88bb5..36024ce9f45 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 16556691240..cbe145d5a33 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 f823c0d83bb..8ca3592f380 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 33d8a786169..3be12e4a637 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 3b5212c9e76..944a8bdf16f 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 5242444a60b..40f66ccb26b 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 3eb7879e2d9..0dde9ee6e2e 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 e33bee9db6e..f59fb1c8177 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 3e3de911470..18e13f6ac03 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 21b664e5b2f..412d57b27b8 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 2afab5ee3b3..d6fabbcd470 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 d61f588205a..b0831dcd1ca 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 4237cfdd919..d0b936cb019 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 2ce04ed5342..ecd35767e01 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 114e0ca39fa..d94e21d681f 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 1a45c3093b7..15de8638bba 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 31f5f6fe780..b91165ce3b8 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 dfa4ee9e127..09b0edcf9bd 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 42bff6a9a3f..93b00b5b977 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 c4d954592ef..4affe3d9d56 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 8dba7a905fa..4c5c441ca26 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 0a9c2d394a7..bf22fc9291a 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 f809b30189f..5f89b0a0c17 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 343ec8679fe..42fa8b7621a 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 2e474ed3410..56b17a865df 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 c0febd803cc..f3b77c708a7 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 da15081173d..7a700e0956b 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 c2ead5a1914..f9220e107f3 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 dea3fd4e3c6..fbc84521de0 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 8107ed8aa44..1c5b8d1b81d 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 1d9956245a6..9839bb74077 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 a3151238438..14090376684 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 eb97a2b9b3b..52cdc0bc067 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 ca0f49e0c94..09b431fdb11 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 55c856c1912..377a5ae6168 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 0fa859ac84b..0a98f387ff8 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 3b620fc0606..3ee2006ab0c 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 bd7fbe86316..504ef78743c 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 00000000000..e21b53b3cc5 --- /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 d83eb1ed86a..b08ce5baa5b 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 d1befec3408..70a6efb90dd 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 1857c3118dd..bce2a79cde3 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 447fc4570a7..9a40e3bc105 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 92269e03e58..362d28d2607 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 35931707ed6..40432c18aa3 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/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 5c16a02ddb8..be27e28c993 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { version = "1.23.0"; - name = "rtv-${version}"; + pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; @@ -19,7 +19,7 @@ buildPythonApplication rec { py.test ''; - buildInputs = [ + checkInputs = [ coverage coveralls docopt @@ -30,18 +30,11 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - backports_functools_lru_cache beautifulsoup4 - configparser - contextlib2 decorator kitchen - mailcap-fix - mccabe requests six - tornado - pyyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 3562a4f9b16..efaf986a9e5 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 48e0d19e20b..5bb614ac68b 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 8b15b030789..aa36ccd49e2 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 c2471d8a0ea..ff9b8b10b18 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 fc1b609479b..00000000000 --- 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 16873ead34f..7f2f4387da5 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 bb8eb83d6bf..ff165f99ae9 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/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 901229f86ca..87c7bddab6f 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -36,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.14.5"; + version = "2.14.9"; src = fetchPypi { inherit pname version; - sha256 = "05kczj10p8f9b1ll4ii5anbg6nk5dhb7lm9skbj6ix7v9hi48hz4"; + sha256 = "1a8nxfr0rzwwd7b0nxr7zmw04ygbqvnzbi4w4nw2w8xiy46zid3q"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index f1d33b83fd0..fa481b7fe66 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 8a45e988c07..646b41cfe75 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 13f7bce4921..8f1960b58cd 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 e15c3588c29..8e1777b0ce7 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 9763c0ee97f..9428b276458 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 a5d861093c9..a1f27572396 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 2a4991b9318..f7f989dc3a9 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 00000000000..78910d1ecf6 --- /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 80b1e9caeaa..30fa41de12d 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 28b85936a28..94e0e46767a 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 7125343dee6..b2f06386003 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 5958a5aa79e..eb99cac8e9e 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 d4cf7f5ea90..78c981ded56 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 af2ee49daee..196374706e1 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 d32beeef4f4..6a0b686602f 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 a811c9da8c2..9fe1d9df46d 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/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 0564f3de1b7..71def712db6 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,18 +1,10 @@ -{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem -# mandatory -, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle -# optional -, numpy ? null, scipy ? null, matplotlib ? null -# optional -, pylint ? null -}: +{ stdenv, python3, makeDesktopItem }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "spyder"; version = "3.2.8"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; }; @@ -22,7 +14,7 @@ buildPythonApplication rec { sed -i -e '/pyqt5/d' setup.py ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle ]; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 0637e813b48..5fcab43c86b 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 3a595da96d0..a76608bdd90 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 05d8c1edec2..742c2fb03f7 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 5e1098e9706..3bb79f6a77d 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 8ed144a32ea..3423b0e181d 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 91f9e7c71e3..2048220361a 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 aca96f58ed9..a981ffea708 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 950c0c86a6e..bc79f9ff12f 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 4ceaf77373e..2ee99ce973e 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 a0b09e30338..b8f381e9714 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 272088b72b7..7f45d51d160 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 f10c8ec86ff..26bed216acf 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 943391611de..101a6feeeae 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 bf3b192e1bb..1df87cc3d42 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 0564329967e..1215c971f23 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 50d55aef234..0fb39075895 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 38d8bcd83cf..fa19e9c533d 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/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix deleted file mode 100644 index e503b7a92ce..00000000000 --- a/pkgs/development/compilers/julia/0.5.nix +++ /dev/null @@ -1,186 +0,0 @@ -{ stdenv, fetchurl, fetchzip -# build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, paxctl -# libjulia dependencies -, libunwind, readline, utf8proc, zlib -, llvm -# standard library dependencies -, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 -# linear algebra -, openblas, arpack, suitesparse -# Darwin frameworks -, CoreServices, ApplicationServices -}: - -with stdenv.lib; - -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; - suitesparse_ = suitesparse; -in -let - arpack = arpack_.override { inherit openblas; }; - suitesparse = suitesparse_.override { inherit openblas; }; -in - -let - dsfmtVersion = "2.2.3"; - dsfmt = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; - sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; - }; - - libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8"; - libuv = fetchurl { - url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49"; - }; - - rmathVersion = "0.1"; - rmath-julia = fetchurl { - url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; - }; - - virtualenvVersion = "15.0.0"; - virtualenv = fetchurl { - url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; - sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; - }; -in - -stdenv.mkDerivation rec { - pname = "julia"; - version = "0.5.2"; - name = "${pname}-${version}"; - - src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1616f53dj7xc0g2iys8qfbzal6dx55nswnws5g5r44dlbf4hcl0h"; - }; - prePatch = '' - mkdir deps/srccache - cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" - cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" - cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" - cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" - ''; - - patches = [ - ./0001.1-use-system-utf8proc.patch - ./0002-use-system-suitesparse.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; - - postPatch = '' - patchShebangs . contrib - for i in backtrace replutil cmdlineargs compile; do - mv test/$i.jl{,.off} - touch test/$i.jl - done - ''; - - buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc - zlib llvm - ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] - ; - - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] - ++ stdenv.lib.optional stdenv.needsPax paxctl; - - makeFlags = - let - arch = head (splitString "-" stdenv.system); - march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${cpuTarget}" - "PREFIX=$(out)" - "prefix=$(out)" - "SHELL=${stdenv.shell}" - - "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" - - "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" - - "USE_SYSTEM_SUITESPARSE=1" - "SUITESPARSE_LIB=-lsuitesparse" - "SUITESPARSE_INC=-I${suitesparse}/include" - - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_LIBUNWIND=1" - - "USE_SYSTEM_LLVM=1" - "LLVM_VER=3.8.1" - - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_OPENSPECFUN=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" - "USE_SYSTEM_READLINE=1" - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_ZLIB=1" - ]; - - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - - LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm - openspecfun pcre2 suitesparse llvm - ]; - - dontStrip = true; - dontPatchELF = true; - - enableParallelBuilding = true; - - doCheck = !stdenv.isDarwin; - checkTarget = "testall"; - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - - preBuild = '' - sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile - sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - ''; - - postInstall = '' - for prog in "$out/bin/julia" "$out/bin/julia-debug"; do - wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" - done - ''; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; - }; -} diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix deleted file mode 100644 index fcf486b3b41..00000000000 --- a/pkgs/development/compilers/julia/0.6.nix +++ /dev/null @@ -1,203 +0,0 @@ -{ stdenv, fetchurl, fetchzip -# build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 -, paxctl -# libjulia dependencies -, libunwind, readline, utf8proc, zlib -, llvm -# standard library dependencies -, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 -# linear algebra -, openblas, arpack, suitesparse -# Darwin frameworks -, CoreServices, ApplicationServices -}: - -with stdenv.lib; - -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; - suitesparse_ = suitesparse; -in -let - arpack = arpack_.override { inherit openblas; }; - suitesparse = suitesparse_.override { inherit openblas; }; -in - -let - dsfmtVersion = "2.2.3"; - dsfmt = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; - sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; - }; - - libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d"; - libuv = fetchurl { - url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba"; - }; - - rmathVersion = "0.1"; - rmath-julia = fetchurl { - url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; - }; - - virtualenvVersion = "15.0.0"; - virtualenv = fetchurl { - url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; - sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; - }; - - majorVersion = "0"; - minorVersion = "6"; - maintenanceVersion = "4"; - version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; -in - -stdenv.mkDerivation rec { - pname = "julia"; - inherit version; - name = "${pname}-${version}"; - - src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl"; - }; - prePatch = '' - mkdir deps/srccache - cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" - cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" - cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" - cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" - ''; - - patches = [ - ./0001.1-use-system-utf8proc.patch - ./0002-use-system-suitesparse.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; - - postPatch = '' - patchShebangs . contrib - for i in backtrace replutil cmdlineargs compile; do - mv test/$i.jl{,.off} - touch test/$i.jl - done - - sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl - sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl - ''; - - buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc - zlib llvm - ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] - ; - - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] - ++ stdenv.lib.optional stdenv.needsPax paxctl; - - makeFlags = - let - arch = head (splitString "-" stdenv.system); - march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${cpuTarget}" - "PREFIX=$(out)" - "prefix=$(out)" - "SHELL=${stdenv.shell}" - - "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" - - "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" - - "USE_SYSTEM_SUITESPARSE=1" - "SUITESPARSE_LIB=-lsuitesparse" - "SUITESPARSE_INC=-I${suitesparse}/include" - - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_LIBUNWIND=1" - - "USE_SYSTEM_LLVM=1" - "LLVM_VER=3.9.1" - - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_OPENSPECFUN=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" - "USE_SYSTEM_READLINE=1" - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_ZLIB=1" - ]; - - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - - LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm - openspecfun pcre2 suitesparse llvm - ]; - - dontStrip = true; - dontPatchELF = true; - - enableParallelBuilding = true; - - doCheck = !stdenv.isDarwin; - checkTarget = "testall"; - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - - preBuild = '' - sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile - sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - ''; - - postInstall = '' - # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, - # as using a wrapper with LD_LIBRARY_PATH causes segmentation - # faults when program returns an error: - # $ julia -e 'throw(Error())' - find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do - if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then - ln -sv $lib $out/lib/julia/$(basename $lib) - fi - done - ''; - - passthru = { - inherit majorVersion minorVersion maintenanceVersion; - site = "share/julia/site/v${majorVersion}.${minorVersion}"; - }; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; - }; -} diff --git a/pkgs/development/compilers/julia/0001-use-system-utf8proc.patch b/pkgs/development/compilers/julia/0001-use-system-utf8proc.patch deleted file mode 100644 index b93654a8896..00000000000 --- a/pkgs/development/compilers/julia/0001-use-system-utf8proc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 10 Oct 2015 13:09:48 -0500 -Subject: [PATCH 1/3] use system utf8proc - ---- - src/flisp/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/flisp/Makefile b/src/flisp/Makefile -index bec8624..5437b5c 100644 ---- a/src/flisp/Makefile -+++ b/src/flisp/Makefile -@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj) - LLTDIR = ../support - LLT_release = $(BUILDDIR)/$(LLTDIR)/libsupport.a - LLT_debug = $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a --LIBFILES_release = $(LLT_release) $(LIBUV) $(LIBUTF8PROC) --LIBFILES_debug = $(LLT_debug) $(LIBUV) $(LIBUTF8PROC) --LIBS = -+LIBFILES_release = $(LLT_release) $(LIBUV) -+LIBFILES_debug = $(LLT_debug) $(LIBUV) -+LIBS = $(LIBUTF8PROC) - ifneq ($(OS),WINNT) - LIBS += -lpthread - endif --- -2.5.2 - diff --git a/pkgs/development/compilers/julia/0003-no-ldconfig.patch b/pkgs/development/compilers/julia/0003-no-ldconfig.patch deleted file mode 100644 index 06d1a57ed62..00000000000 --- a/pkgs/development/compilers/julia/0003-no-ldconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8802fe583eda93a928739cb3bc3517e19d1a6fa1 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 11 Oct 2015 07:19:42 -0500 -Subject: [PATCH 3/3] no ldconfig - ---- - src/ccall.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/ccall.cpp b/src/ccall.cpp -index 22015ff..2821192 100644 ---- a/src/ccall.cpp -+++ b/src/ccall.cpp -@@ -13,11 +13,7 @@ extern "C" DLLEXPORT void jl_read_sonames(void) - { - char *line=NULL; - size_t sz=0; --#if defined(__linux__) -- FILE *ldc = popen("/sbin/ldconfig -p", "r"); --#else -- FILE *ldc = popen("/sbin/ldconfig -r", "r"); --#endif -+ FILE *ldc = popen("true", "r"); - if (ldc == NULL) return; // ignore errors in running ldconfig (other than whatever might have been printed to stderr) - - while (!feof(ldc)) { --- -2.5.2 - diff --git a/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch b/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch deleted file mode 100644 index 1950cd7836a..00000000000 --- a/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0bdbe60325a22202f8e250a9578407648a0d29b9 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Wed, 1 Feb 2017 06:09:49 -0600 -Subject: [PATCH] Set pax flags on julia binaries to disable memory protection. - ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index 8d45a1baa..91ea33b21 100644 ---- a/Makefile -+++ b/Makefile -@@ -61,6 +61,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps - - julia-ui-release julia-ui-debug : julia-ui-% : julia-src-% - @$(MAKE) $(QUIET_MAKE) -C ui julia-$* -+ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)" -+ @paxctl -czexm $(JULIA_EXECUTABLE_$*) - - julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples - @$(MAKE) $(QUIET_MAKE) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) --- -2.11.0 - diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a504dc2ea46..84fdf8f9786 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchzip # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl # libjulia dependencies -, libunwind, llvm, readline, utf8proc, zlib +, libunwind, readline, utf8proc, zlib +, llvm # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra @@ -21,9 +22,6 @@ in let arpack = arpack_.override { inherit openblas; }; suitesparse = suitesparse_.override { inherit openblas; }; - llvmShared = if stdenv.isDarwin - then llvm.override { enableSharedLibraries = true; } - else llvm; in let @@ -33,10 +31,10 @@ let sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; }; - libuvVersion = "efb40768b7c7bd9f173a7868f74b92b1c5a61a0e"; + libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d"; libuv = fetchurl { url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "1znkxyv1cy9pjap7afypipzsn04533ni3pqjd191fdgw2sv9cal7"; + sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba"; }; rmathVersion = "0.1"; @@ -44,40 +42,59 @@ let url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; + + virtualenvVersion = "15.0.0"; + virtualenv = fetchurl { + url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; + sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; + }; + + majorVersion = "0"; + minorVersion = "6"; + maintenanceVersion = "4"; + version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; in stdenv.mkDerivation rec { pname = "julia"; - version = "0.4.7"; + inherit version; name = "${pname}-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "09f531jhs8pyd1xng5c26x994w7q0sxxr28mr3qfw9wpkbmsc2pf"; + sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl"; }; - prePatch = '' - cp "${dsfmt}" "./deps/dsfmt-${dsfmtVersion}.tar.gz" - cp "${rmath-julia}" "./deps/Rmath-julia-${rmathVersion}.tar.gz" - cp "${libuv}" "./deps/libuv-${libuvVersion}.tar.gz" + mkdir deps/srccache + cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" + cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" + cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" + cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" ''; patches = [ - ./0001-use-system-utf8proc.patch + ./0001.1-use-system-utf8proc.patch ./0002-use-system-suitesparse.patch - ./0003-no-ldconfig.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened-0.4.7.patch; + ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; postPatch = '' patchShebangs . contrib + for i in backtrace replutil cmdlineargs compile; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + + sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl + sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl ''; buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr + arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc - zlib - ] ++ - stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; + zlib llvm + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] ++ stdenv.lib.optional stdenv.needsPax paxctl; @@ -85,7 +102,7 @@ stdenv.mkDerivation rec { makeFlags = let arch = head (splitString "-" stdenv.system); - march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}" + march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" @@ -116,7 +133,10 @@ stdenv.mkDerivation rec { "USE_SYSTEM_GMP=1" "USE_SYSTEM_LIBGIT2=1" "USE_SYSTEM_LIBUNWIND=1" + "USE_SYSTEM_LLVM=1" + "LLVM_VER=3.9.1" + "USE_SYSTEM_MPFR=1" "USE_SYSTEM_OPENLIBM=1" "USE_SYSTEM_OPENSPECFUN=1" @@ -133,38 +153,50 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm - openspecfun pcre2 suitesparse + openspecfun pcre2 suitesparse llvm ]; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; - dontStrip = true; dontPatchELF = true; enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; checkTarget = "testall"; # Julia's tests require read/write access to $HOME preCheck = '' export HOME="$NIX_BUILD_TOP" ''; + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + ''; + postInstall = '' - for prog in "$out/bin/julia" "$out/bin/julia-debug"; do - wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi done ''; + passthru = { + inherit majorVersion minorVersion maintenanceVersion; + site = "share/julia/site/v${majorVersion}.${minorVersion}"; + }; + meta = { description = "High-level performance-oriented dynamical language for technical computing"; homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - #broken = stdenv.isi686; - broken = true; # 2018-04-10 + broken = stdenv.isi686; }; } diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix deleted file mode 100644 index 4b9a369e8d2..00000000000 --- a/pkgs/development/compilers/julia/git.nix +++ /dev/null @@ -1,180 +0,0 @@ -{ stdenv, fetchgit, fetchurl -# build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl -# libjulia dependencies -, libunwind, readline, utf8proc, zlib -, llvm -# standard library dependencies -, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 -# linear algebra -, openblas, arpack, suitesparse -# Darwin frameworks -, CoreServices, ApplicationServices -}: - -with stdenv.lib; - -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; - suitesparse_ = suitesparse; -in -let - arpack = arpack_.override { inherit openblas; }; - suitesparse = suitesparse_.override { inherit openblas; }; -in - -let - dsfmtVersion = "2.2.3"; - dsfmt = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; - sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; - }; - - libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8"; - libuv = fetchurl { - url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49"; - }; - - rmathVersion = "0.1"; - rmath-julia = fetchurl { - url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; - }; - - virtualenvVersion = "15.0.0"; - virtualenv = fetchurl { - url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; - sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; - }; -in - -stdenv.mkDerivation rec { - pname = "julia"; - version = "0.6.0-dev-2016-11-25"; - name = "${pname}-${version}"; - - src = fetchgit { - url = "https://github.com/JuliaLang/${pname}"; - rev = "03c24644815ba5320d038bb60c08565375fea1d9"; - sha256 = "103mg9dz8yda2zxbd85jv8zhdzs29jj0dxrm2ppxpfhbbf6fxqav"; - }; - - prePatch = '' - mkdir deps/srccache - cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" - cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" - cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" - cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" - ''; - - patches = [ - ./0001.1-use-system-utf8proc.patch - ./0002-use-system-suitesparse.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch; - - postPatch = '' - patchShebangs . contrib - ''; - - buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc - zlib llvm - ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] - ; - - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ] - ++ stdenv.lib.optional stdenv.needsPax paxctl; - - makeFlags = - let - arch = head (splitString "-" stdenv.system); - march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${cpuTarget}" - "PREFIX=$(out)" - "prefix=$(out)" - "SHELL=${stdenv.shell}" - - "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" - - "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" - - "USE_SYSTEM_SUITESPARSE=1" - "SUITESPARSE_LIB=-lsuitesparse" - "SUITESPARSE_INC=-I${suitesparse}/include" - - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_LIBUNWIND=1" - # 'replutil' test failure with LLVM 3.8.0, invalid libraries with 3.7.1 - "USE_SYSTEM_LLVM=1" - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_OPENSPECFUN=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" - "USE_SYSTEM_READLINE=1" - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_ZLIB=1" - ]; - - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - - LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm - openspecfun pcre2 suitesparse llvm - ]; - - dontStrip = true; - dontPatchELF = true; - - enableParallelBuilding = true; - - doCheck = true; - checkTarget = "testall"; - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - - preBuild = '' - sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile - sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile - ''; - - postInstall = '' - for prog in "$out/bin/julia" "$out/bin/julia-debug"; do - wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" - done - ''; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = true; # since 2017-04-08. - }; -} diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 25bb0828414..accdfbf23b5 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 7dc134b4fcf..388da007d33 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 98b6f4adbbf..e540469c627 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 8cfcb1af43d..d7324665240 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 c974eb6f6d3..dfeddf2fe65 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 75037f6a07d..9651dbb72f4 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 514c3a006e3..1b186c730c0 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 00b0083108b..38d2b0d461d 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 68eebc33c6b..760969f3469 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 141daa88dcf..831e4b65344 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 a86f5b5039e..4d981398b9a 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 c8afd0dcc90..57d5fc0c83b 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 e39de76117a..06dcfb8b393 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 d94179e16fe..dac8b0279ad 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 766a10c9579..795c177bc80 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/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index bb9aaeb00cf..9b6f80e0f83 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -152,6 +152,10 @@ go.stdenv.mkDerivation ( fi } + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + buildFlagsArray+=(-x) + fi + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then declare -p buildFlagsArray > $TMPDIR/buildFlagsArray else diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1ec0adafef8..3c8f94860b4 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 00000000000..426e5a4cbba --- /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 78598ce3d81..7d3c6476131 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 ce3ce584434..f6bd96af40f 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 7c866911c59..9bf8577923c 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 66f358e4b95..7d6f2541d3d 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 3faba45714a..9dc0776f08a 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 5790672d8e5..f524c940255 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 0b341b38917..f2f8aed065f 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 785bc6f3c84..401d9c7d8a2 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 5eb08ecd601..bddb0e1479e 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 264c05e1af9..e97aa0d391e 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 d2d10682716..66a840fa2a9 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 00000000000..62234a43e46 --- /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 6fe88fd7cea..b3f5e12b0ec 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 8665be26925..416cf53ab49 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 bdfe3d1c5c6..b85d76640cf 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 154b4890e4f..97baca62e72 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 00000000000..21a0e394392 --- /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 c0c8eb51f71..9f04dac343c 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 00000000000..bb712d40827 --- /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 a05d49245b2..7db07e77d84 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/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix new file mode 100644 index 00000000000..10555771fee --- /dev/null +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, ocaml, findlib, tcl, tk }: + +let param = { + "4.04" = { + version = "8.06.2"; + key = "1628"; + sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk"; + }; + "4.05" = { + version = "8.06.3"; + key = "1701"; + sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn"; + }; + "4.06" = { + version = "8.06.4"; + key = "1727"; + sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii"; + }; + "4.07" = { + version = "8.06.5"; + key = "1764"; + sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; + }; +}."${builtins.substring 0 4 ocaml.version}"; +in + +stdenv.mkDerivation rec { + inherit (param) version; + name = "ocaml${ocaml.version}-labltk-${version}"; + + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/${param.key}/labltk-${param.version}.tar.gz"; + inherit (param) sha256; + }; + + buildInputs = [ ocaml findlib tcl tk ]; + + configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; + dontAddPrefix = true; + + buildFlags = [ "all" "opt" ]; + + createFindlibDestdir = true; + + postInstall = '' + mkdir -p $OCAMLFIND_DESTDIR/stublibs + mv $OCAMLFIND_DESTDIR/labltk/dlllabltk.so $OCAMLFIND_DESTDIR/stublibs/ + ''; + + meta = { + description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser"; + homepage = "http://labltk.forge.ocamlcore.org/"; + license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix index 363d5850ec6..c7ed72dc523 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 00000000000..c15378e8240 --- /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/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix index 55b059cd7fa..6a14607ad27 100644 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-PyMongo"; - version = "0.5.2"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5"; + sha256 = "6a02add52ac245064720c2bb8b02074b9a5a0d9498279510ea2a537512fd3fa5"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 89b941c34fc..aef59ba2ab9 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { - version = "2.1.9"; + version = "2.1.11"; pname = "GitPython"; src = fetchPypi { inherit pname version; - sha256 = "0a9in1jfv9ssxhckl6sasw45bhm762y2r5ikgb2pk2g8yqdc6z64"; + sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; }; checkInputs = [ mock nose ddt ]; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 879cdb9bd09..d449ae8bbf6 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k }: +{ buildPythonPackage, fetchPypi, isPy3k, pytest }: buildPythonPackage rec { pname = "JPype1"; @@ -11,8 +11,10 @@ buildPythonPackage rec { patches = [ ./set-compiler-language.patch ]; - # Test loader complains about non-test module on python3. - doCheck = !isPy3k; + checkInputs = [ pytest ]; + + # ImportError: Failed to import test module: test.testlucene + doCheck = false; meta = { homepage = "https://github.com/originell/jpype/"; diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index 8cbbd2c767f..adad2051292 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "WSME"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976"; + sha256 = "e24fcff24392a0b176e560ffc6591b1f658342bbc992f84e0e8a3c53fd92580a"; }; postPatch = '' diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 2f4c020eb97..ab9839a2103 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "71b0e9b479320f76af4bcd268f7359580ba2e217228e83ff7529f51a9845f393"; + sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 49d0bc6c637..0f2740a90d8 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.8"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50"; + sha256 = "3fab07073648d70d8345e0eb745bd81fcd02b5e2b080c4663faea8c8ab281c0a"; }; # hardcodes a test dependency on an old version of pytest-asyncio diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 7becf1cffc4..cb70d3760c8 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "0.9.10"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cd32df9a3b8c1749082ef60ffbe05ff16617b6afadfdabc680dcb9344af33d7"; + sha256 = "52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 213bc4f1eb9..8e6fc668204 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,16 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest }: +, pytest, setuptools_scm }: buildPythonPackage rec { pname = "apipkg"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6"; + sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; - buildInputs = [ pytest ]; + buildInputs = [ setuptools_scm ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix new file mode 100644 index 00000000000..08f6fa529ca --- /dev/null +++ b/pkgs/development/python-modules/appnope/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "appnope"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71"; + }; + + meta = { + description = "Disable App Nap on macOS"; + homepage = https://pypi.python.org/pypi/appnope; + platforms = lib.platforms.darwin; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix new file mode 100644 index 00000000000..045707aee4d --- /dev/null +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +}: + +buildPythonPackage rec { + pname = "Arpeggio"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "a5258b84f76661d558492fa87e42db634df143685a0e51802d59cae7daad8732"; + }; + + # Shall not be needed for next release + LC_ALL = "en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + + meta = { + description = "Packrat parser interpreter"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 381a4a73314..687808461fe 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "astor"; - version = "0.6.2"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d"; + sha256 = "95c30d87a6c2cf89aa628b87398466840f0ad8652f88eb173125a6df8533fb8d"; }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index a7e7931d9d9..ea087ce4f5f 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,32 +1,25 @@ -{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six -, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder -, backports_functools_lru_cache +{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy +, lazy-object-proxy, six, wrapt, typing, typed-ast +, pytestrunner, pytest }: buildPythonPackage rec { pname = "astroid"; - version = "1.6.5"; + version = "2.0.1"; + + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a"; + sha256 = "218e36cf8d98a42f16214e8670819ce307fa707d1dcf7f9af84c7aede1febc7f"; }; - propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] - ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch] - ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ]; + # From astroid/__pkginfo__.py + propagatedBuildInputs = [ lazy-object-proxy six wrapt ] + ++ lib.optional (pythonOlder "3.5") typing + ++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast; - postPatch = '' - cd astroid/tests - for i in $(ls unittest*); do mv -v $i test_$i; done - cd ../.. - rm -vf astroid/tests/test_unittest_inference.py - rm -vf astroid/tests/test_unittest_manager.py - ''; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + checkInputs = [ pytestrunner pytest ]; meta = with lib; { description = "A abstract syntax tree for Python with inference support"; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 6308b1a170f..1ac393ff2d7 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.13.2"; + version = "1.13.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "e4c07577d021c68d4c8e6d1897987424cc25b58e0726f31ff72476a34ddb6deb"; + sha256 = "eb5b190badc5cd2a506a1b6ced3e92f948166974eef7d1abab61acc67aa379e6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix new file mode 100644 index 00000000000..ee029726d1c --- /dev/null +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchurl +, stdenv +, darwin +}: + +buildPythonPackage rec { + pname = "audiotools"; + version = "3.1.1"; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AudioToolbox + AudioUnit + CoreServices + ]); + + src = fetchurl { + url = "https://github.com/tuffy/python-audio-tools/archive/v${version}.tar.gz"; + sha256 = "0ymlxvqkqhzk4q088qwir3dq0zgwqlrrdfnq7f0iq97g05qshm2c"; + }; + + meta = { + description = "Utilities and Python modules for handling audio"; + homepage = "http://audiotools.sourceforge.net/"; + license = lib.licenses.gpl2Plus; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix new file mode 100644 index 00000000000..7e68265eed8 --- /dev/null +++ b/pkgs/development/python-modules/av/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pillow +, numpy +, ffmpeg_2 +, git +, libav +, pkgconfig +}: + +buildPythonPackage rec { + pname = "av"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f"; + }; + + buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ]; + + # Because of https://github.com/mikeboers/PyAV/issues/152 + doCheck = false; + + meta = { + description = "Pythonic bindings for FFmpeg/Libav"; + homepage = https://github.com/mikeboers/PyAV/; + license = lib.licenses.bsd2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index d7bdd143b69..64c75b3c092 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1da15d459150eb631af4f400ca336901da6a564b543fe3d7a75169ca2c9f36cb"; + sha256 = "23160f717bd65de810fa538b7c145eae4384d10adb460e375d148de7f283bd10"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 9dbd20cd6ee..a16f6c7415f 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "13470b95a2f55036a5d7b6642250d8f3a519a6c454cd91f55778b1bb4bf5b89d"; + sha256 = "8ec3c6c82e76c03799ec209ed59642d78f62218db6a430f7e2d20491cac3c5ef"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix index a0643e82ae0..c650076d4c0 100644 --- a/pkgs/development/python-modules/backports_lzma/default.nix +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -9,13 +9,13 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.lzma"; - version = "0.0.9"; + version = "0.0.13"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9ba5d94214a79900ee297a594b8e154cd8e4a54d26eb06243c0e2f3ad5286539"; + sha256 = "50829db66f0445442f6c796bba0ca62d1f87f54760c4682b6d1489e729a43744"; }; buildInputs = [ lzma ]; diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index 2125390d671..3baaa871adf 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "backports.unittest_mock"; - version = "1.3"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6"; + sha256 = "73df9093bc7a2cc8e7018d08d6983dc5bcb2a47d7e7e107b9e8d0711f1702ef8"; }; propagatedBuildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 6b21a1492bd..42e38d0babe 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "billiard"; - version = "3.5.0.3"; + version = "3.5.0.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1d7b22bdc47aa52841120fcd22a74ae4fc8c13e9d3935643098184f5788c3ce6"; + sha256 = "ed65448da5877b5558f19d2f7f11f8355ea76b3e63e1c0a6059f47cfae5f1c84"; }; buildInputs = [ pytest case ]; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 8229c1edce8..39be67e6e51 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.71"; + version = "1.72"; src = fetchPypi { inherit pname version; - sha256 = "4f1770a29a5b18fcaca759bbc888083cdde2b301f073439ff640570d4a93e033"; + sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 2a9cb2a2cfd..b320db51e3c 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,20 +9,20 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "39.2.0"; + version = "40.0.0"; format = "wheel"; - sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926"; + sha256 = "d68abee4eed409fbe8c302ac4d8429a1ffef912cd047a903b5701c024048dd49"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "10.0.1"; + version = "18.0"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7"; + sha256 = "070e4bf493c7c2c9f6a08dd797dd3c066d64074c38e9e8a0fb4e6541f266d96c"; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 70a5af97fda..f1475aed693 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.57"; + version = "1.10.65"; src = fetchPypi { inherit pname version; - sha256 = "0mif7c12643hac6zxq89gv0wjf4r3vqlmm01bm68psljaj40jnpi"; + sha256 = "35f626029a6b17bfd503ce3379b121606e3f965edcab2612bc75ce8603fdf08c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 91b310a2179..5a1bc4485b7 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.11.5"; + version = "2.12.1"; src = fetchPypi { inherit pname version; - sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122"; + sha256 = "1e180b62fd129a68cb3a9ec8eb0ef457e18921269a93e87ef2cc34519415332d"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 3f6b2ed3ccd..469b449483a 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.7.8"; + version = "0.7.10"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "57b71855b7659e9c8dc21722a3ed0b33efb2ead2916b22ced3b83339bcdff1a2"; + sha256 = "07917abf7e598f2a42456ca4f704c6da2a5489eaea0b9a7c61ed8a26506737c8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/buttersink/default.nix b/pkgs/development/python-modules/buttersink/default.nix index 29f5ff5dccd..b13251e1ca7 100644 --- a/pkgs/development/python-modules/buttersink/default.nix +++ b/pkgs/development/python-modules/buttersink/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "buttersink"; - version = "0.6.8"; + version = "0.6.9"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3"; + sha256 = "c9c05982c44fbb85f17b7ef0e8bee11f375c03d89bcba50cbc2520013512107a"; }; propagatedBuildInputs = [ boto crcmod psutil ]; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index f85f80ea239..1072b33bc1b 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,21 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, wrapt , pyserial , nose -, mock }: +, mock +, pytest +, pytest-timeout }: buildPythonPackage rec { pname = "python-can"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc"; + sha256 = "b5e93b2ee32bdd597d9d908afe5171c402a04c9678ba47b60f33506738b1375b"; }; - propagatedBuildInputs = [ pyserial ]; - checkInputs = [ nose mock ]; + propagatedBuildInputs = [ wrapt pyserial ]; + checkInputs = [ nose mock pytest pytest-timeout ]; + + checkPhase = '' + pytest -k "not test_writer_and_reader \ + and not test_reader \ + and not test_socketcan_on_ci_server" + ''; meta = with lib; { homepage = https://github.com/hardbyte/python-can; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 36cc20e027b..9b744957540 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cement"; - version = "2.10.2"; + version = "2.10.12"; src = fetchPypi { inherit pname version; - sha256 = "d50c5980bf3e2456e515178ba097d16e36be0fbcab7811a60589d22f45b64f55"; + sha256 = "58efb4eacd9ec977ce797a364a13851de6e42392bbde5287d44294f06c5a2f70"; }; # Disable test tests since they depend on a memcached server running on diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index cc75649119b..d332d99cf80 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "4.1.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "49a4a691708626f742cc6fc949fce6b313e3379bd64886eb19e002b1122cc329"; + sha256 = "a83044256edb1946c47cb9ae687d195c2aa0deaef46ab85a8ffc4a01f7001683"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 7a7d44339ba..d7e6abf3eb6 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cheroot"; - version = "6.3.2"; + version = "6.3.3"; src = fetchPypi { inherit pname version; - sha256 = "52f915d077ce6201e59c95c4a2ef89617d9b90e6185defb40c03ff3515d2066f"; + sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25"; }; propagatedBuildInputs = [ more-itertools six ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 47aca123998..e9ae4bde8cc 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "CherryPy"; - version = "16.0.2"; + version = "17.0.0"; src = fetchPypi { inherit pname version; - sha256 = "858fbff27235a392026b1d821ad815b587815c94fbb14312e2e64cc23766b9c3"; + sha256 = "3cdb5fbae183db49ab1f1a90643d521aa060c93f90001cc99c19d8d15b7a3fb7"; }; propagatedBuildInputs = [ cheroot portend routes six ]; diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 7229488a700..f5626859d06 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click-log"; - version = "0.2.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; + sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124"; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 967941666c8..1997c2389ab 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.1"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "1wpw4f9zix30hfncm0hwxjjdx78zq26x3r8s9nvsq9vnxf41xb49"; + sha256 = "cffc94ad46425f80dfb243f53f456b11cea3f45e683504a60b64618a6d28b417"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index bcf67ab222d..0638ea3a36d 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}: buildPythonPackage rec { - version = "0.11.4"; + version = "0.11.5"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "8cf480199685127c9692b0bf1e15eac82e71ae34b7967a016ab31a318741abb1"; + sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 888e7a92252..5c9e83b8d20 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-consul"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0feb7a14b6869bbfa9eb4868e823f040e3642b84e80c39ffdff3a8b7fd7017c4"; + sha256 = "168f1fa53948047effe4f14d53fc1dab50192e2a2cf7855703f126f469ea11f4"; }; buildInputs = [ requests six pytest ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 8fe8ccc31a9..2a8736e29de 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -21,7 +21,7 @@ }: let - version = "2.2.2"; + version = "2.3"; in assert version == cryptography_vectors.version; buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; @@ -29,7 +29,7 @@ in assert version == cryptography_vectors.version; buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63"; + sha256 = "c132bab45d4bd0fff1d3fe294d92b0a6eb8404e93337b3127bdec9f21de117e6"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index 6285ac28fce..ba896d29fc5 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "28b52c84bae3a564ce51bfb0753cbe360218bd648c64efa2808c886c18505688"; + sha256 = "356a2ded84ae379e556515eec9b68dd74957651a38465d10605bb9fbae280f15"; }; # No tests included diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index da742b31050..5d9ae10b09a 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "4.1.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3e714fa21401ab1d278b648543fae56fbce97e389076ebf03b4189f88c2d61e0"; + sha256 = "ea818ff7f36cf6e5b3d3faef5af36a501c8bdeb78805820afa2999789ed698d5"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 7c0fa32eb99..a4ad178cb34 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "6.3.1"; + version = "6.4.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7"; + sha256 = "3519bf3263c9892aaadc844735aca02d3773ed9b92f97e069cd1726882a7d1b6"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 0d69edcf9ce..e1572ab5321 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "0.18.0"; + version = "0.18.2"; src = fetchPypi { inherit pname version; - sha256 = "ebaa0f144b43a00e7b9b3b9cb557e8ebada5fcbb982cdaba1802cd8c4c5720f0"; + sha256 = "8fba559911788010ecedf58e540004d56d09f7829a1400dd72b74ffedafafabc"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 4ebb9a33690..5a27e2b746f 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.97.7"; + version = "0.97.11"; src = fetchPypi { inherit pname version; - sha256 = "855800d12df87855096eeafc58f34c9092407e8faf197f48073e7bc2b1938de0"; + sha256 = "8aa5a73d8b140aa3c511a3b5b204a67d391962e90c66b380dd048fcae6ddbb68"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index d1ec7921099..10e0d79dddf 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.4"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "2c259bfc0237f16bbe36cb32b6d81addd919b8f4bc7253738576816e82841b96"; + sha256 = "cbe7d15006bc339709be5e02b14884ecc479639c1a3714a908de3a8ca13b5ca9"; }; propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 5473d85b576..3f01d56ac91 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "dill"; - version = "0.2.8.1"; + version = "0.2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "53a6d7bf74f737a514cb89f72d0cb8b80dbd44a9cbbffaa14bffb57f4d7c3822"; + sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3"; }; # Messy test suite. Even when running the tests like tox does, it fails diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 831dbbc4a6c..63c61131261 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-sites"; - version = "0.9"; + version = "0.10"; meta = { description = '' @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "05nrydk4a5a99qrxjrcnacs8nbbq5pfjikdpj4w9yn5yfayp057s"; + sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 545eba8360a..3c35b74bab6 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.6"; + version = "2.0.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3eb25c99df1523446ec2dc1b00e25eb2ecbdf42c9d8b0b8b32a204a8db9011f8"; + sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 0eedf4f01a6..dd4aafe1aa9 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.4.0"; + version = "3.4.1"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7"; + sha256 = "ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 80a3a6d949c..01a5b4aa8e6 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.21.2"; + version = "1.22.0"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "0b0wihlyk89y6n0mly2vbljzqai1hhs6yzplskwdah2lfn9p3c38"; + sha256 = "915cdd0ea7aff349d27a8e0585124ac38695635201770a35612837b25e234677"; }; # lots of networking and other fails diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 88dc6b0fc75..9a840e5112a 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.5"; + version = "0.6.6"; src = fetchPypi { inherit pname version; - sha256 = "631197e78b4471bb0e93d0a86264c45736bc9ae43b4205d581dcc34fbe9b5f31"; + sha256 = "044d4ea0a0abc72491044f3d3df8e1fc9e8fa7a436c6e9a0da5850d23a0d16c1"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 8a5f23de899..5d344f18059 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "8.9.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e7eeac47f35e73b34023b7a3089380e74bacd0cce4b57e1e347539dfb53681d2"; + sha256 = "385c62c2983c3804ba0064762f9e5f4753ea20a132c727b4961d3b68e1372ac8"; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 61b1d0d1cd9..2617249b75a 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.3"; + version = "0.19.5"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "0d1ab6adf5e8e9bc30cce6e2f924ca06e50241fb1bb17a585fc8d98e3c09c4a4"; + sha256 = "34f99e575fe1f1e89cca92cec1ddd50b4991199cb00609203b28df9eb83ce259"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix new file mode 100644 index 00000000000..b4c2767f9dd --- /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 00000000000..6c070acaf75 --- /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/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index d1d8e8535a4..b532c7d19f7 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, stdenv, flake8, tox, pytest, glibcLocales +, face_recognition_models, stdenv, flake8, pytest, glibcLocales }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; - checkInputs = [ flake8 tox pytest glibcLocales ]; + checkInputs = [ flake8 pytest glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test ''; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 6441db945d7..74ed13da8b4 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.16"; + version = "0.8.17"; src = fetchPypi { inherit pname version; - sha256 = "04645d946256b835c675c1cef7c03817a164b0c4e452018fd50b212ddff08c22"; + sha256 = "0e9a1227a3a0f3297a485715e72ee6eb77081b17b629367042b586e38c03c867"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 642111680b3..e6d347b440d 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.12"; + version = "1.7.13"; src = fetchPypi { inherit pname version; - sha256 = "8b54eb8422d7c502bb7776b184018186bede1a489cf438a7a47f992ade6a0e51"; + sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 79ad50a63ff..5709b17c524 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.17.1"; + version = "0.18"; src = fetchPypi { inherit pname version; - sha256 = "68d430781a9ef15c85a0121500cf8462f1a4bc7672acb2a32bfdbcab044ae0b7"; + sha256 = "9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf"; }; propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 944c7f7e1fd..9d9d211dbfa 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes }: @@ -12,6 +12,37 @@ buildPythonPackage rec { sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0"; }; + # Allow newer version of pycodestyle and pyflakes + patches = [ + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch; + sha256 = "0lfsg9n92fc8whj29paqsx7ifap2szv7pxj13hy739y87gsps676"; + excludes = [ "setup.cfg" ]; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a.patch; + sha256 = "1ziy54v1cm7gn7a551qvrl0rs16q8zpzh303xf5gn4rxxz13qnzb"; + excludes = [ "setup.cfg" ]; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55.patch; + sha256 = "0170hjaxkq5ssva9rwkcgm4whb07fnxdb0z12gzmvw5w53hkqxj4"; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224.patch; + sha256 = "183lcw7aqv5yzm8pfisrfngq3fchc7h3j7254c5hy2hqq653v98s"; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0.patch; + sha256 = "1j5f0l4xryfhirixwjcl1lzayjhy6vhkizkpm7w87piylim8y26y"; + }) + (fetchpatch { + url = https://gitlab.com/pycqa/flake8/commit/527af5c214ef0eccfde3dd58d7ea15e09c483bd3.patch; + sha256 = "1y51r78770z27d43v64lrg8zvm39ycszzhh15cx8wq8wp3b7iz5x"; + excludes = [ "setup.cfg" ]; + }) + ]; + buildInputs = [ pytest mock pytestrunner ]; propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] diff --git a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch deleted file mode 100644 index d75d8e7bd0a..00000000000 --- a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -r ad8325924f04 pytest.ini ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/pytest.ini Fri Sep 30 12:28:39 2016 +0200 -@@ -0,0 +1,4 @@ -+[pytest] -+-norecursedirs = .git .* *.egg* old docs dist build -+-addopts = -rwv -+ -diff -r ad8325924f04 setup.cfg ---- a/setup.cfg Fri Sep 30 09:22:39 2016 +0200 -+++ b/setup.cfg Fri Sep 30 12:28:39 2016 +0200 -@@ -12,10 +12,6 @@ - pycodestyle >= 2.0.0, < 2.1.0 - mccabe >= 0.5.0, < 0.6.0 - --[pytest] --norecursedirs = .git .* *.egg* old docs dist build --addopts = -rw -- - [egg_info] - tag_build = - tag_date = 0 diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 1b3ab52c4c3..f9f8198e4ac 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -9,10 +9,10 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "05844c82c7c176449218fd3fc31e55e5d8b3fae460f261b11231f4c8ef2ed5e0"; + sha256 = "78ed9b6ac35f104542f3bee0386d71ddf9432d74c153065d2ea9f6baf10e5b49"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 1169dd3a4a4..cd28a4976a9 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gevent"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "53c4dc705886d028f5d81e698b1d1479994a421498cd6529cb9711b5e2a84f74"; + sha256 = "7f15861f3cc92f49663ca88c4774d26d8044783a65fbc28071a2bd1c7bf36ff0"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix index 1ebbd3de785..f5812c62e13 100644 --- a/pkgs/development/python-modules/gitdb2/default.nix +++ b/pkgs/development/python-modules/gitdb2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gitdb2"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn"; + sha256 = "bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044"; }; propagatedBuildInputs = [ smmap2 ]; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index f6e67ad4392..4324b357f29 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; buildPythonPackage rec { pname = "GooCalendar"; - version = "0.3"; + version = "0.4"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1p7qbcv06xipg48sgpdlqf72ajl3n1qlypcc0giyi1a72zpyf823"; + sha256 = "ca3950c2728916d9fb703c886f3940ac9b76739f99ec840b0e1c2c282510e1ab"; }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 7f71a4ed3ef..c8dd5ea84ae 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "e32d30563b90c4f88ff042d4d891b5e8ed1f6cdca0adab95e9c2ce2603087436"; + sha256 = "5d5cb02c6f3112c68eed51b74891a49c0e35263380672d662f8bfe85b8114d7c"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 8cf3fe5753e..f404c68921d 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "0.34.0"; + version = "0.35.0"; src = fetchPypi { inherit pname version; - sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631"; + sha256 = "5db2d69315b3d95d067c9bffe17994b6ee9252702888cc300d76252b451638e1"; }; propagatedBuildInputs = [ google_api_core ]; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 91b07516301..58b240297cf 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.13"; + version = "0.4.14"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4"; + sha256 = "f1cc268a15ade58d9a0c04569fe6613e19b8b0345b64453064e2c3c6d79051af"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 5ceadcc0f91..698da6dc91a 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -3,11 +3,11 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "be715cb74ac56db2dd888b016097aaa29ab7d7d34c1f8c706ff63f76b3553f71"; + sha256 = "76c9fda88a7178f41bf6454a06d64054c56b46f0dcbc73307f2e57bb8c25d8cc"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index efc42dedc65..85c5c011dfd 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "gunicorn"; - version = "19.8.1"; + version = "19.9.0"; src = fetchPypi { inherit pname version; - sha256 = "bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10"; + sha256 = "fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3"; }; checkInputs = [ pytest mock pytestcov coverage ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 94b9861daa9..3c86563adac 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.13"; + version = "0.8.15"; src = fetchPypi { inherit pname version; - sha256 = "31874db29375816688b5541287a051c9bd768f2499ccf1f6a4d88d266530e2a6"; + sha256 = "446f98e1ea622a39c1f396d839fa2b1c35db98234e373336de61c3bd6ffaec78"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index a72338143a1..dc9c79781f1 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "1.1.7"; + version = "1.1.13"; src = fetchPypi { inherit pname version; - sha256 = "1dx9ms0b3z3bx02paj78cyi788d8l6cpd3jqbn3j88w736i4jknz"; + sha256 = "96f5e057fd45a84379d77e46233165d95211e6b3ea869cb5c0df172aa322b566"; }; propagatedBuildInputs = [ six requests-cache pygments pyquery ]; diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 862d7af91f0..f18d8eadec8 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "e7b8425ce36894cda8b8ed3387a47119edc517302e6a72942602df54a96ee453"; + sha256 = "4bc80744df5f09882b1cc91755b03b7b62b093fc63c8c4abb26fbfb9c9e878dd"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 6701c5a5b7e..5694ea92405 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,23 +9,24 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.45.2"; + version = "3.66.2"; pname = "hypothesis"; - # Upstream prefers github tarballs + # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; - rev = version; - sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb"; + rev = "hypothesis-python-${version}"; + sha256 = "17ywbwa76z7f0pgash0003fvm25fsj7hxdrdiprdbv99y3i8bm88"; }; + postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; + propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; checkInputs = [ pytest pytest_xdist flaky mock ]; inherit doCheck; - # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' rm tox.ini # This file changes how py.test runs and breaks it py.test tests/cover diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix index eb4b859c2f6..0fcb2662801 100644 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "IBMQuantumExperience"; - version = "1.9.6"; + version = "1.9.8"; src = fetchPypi { inherit pname version; - sha256 = "83baa3c88979df67e7be929b147d253cffe45a7f7f5657f87fbe945819e9ce24"; + sha256 = "78a7d9770fa2884d79d3c8b18f374644866e4d22ec151cf703053f7530bb7b7c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix index b324705a152..a8a040d39e2 100644 --- a/pkgs/development/python-modules/idna-ssl/default.nix +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "idna-ssl"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1293f030bc608e9aa9cdee72aa93c1521bbb9c7698068c61c9ada6772162b979"; + sha256 = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c"; }; propagatedBuildInputs = [ idna ]; diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix new file mode 100644 index 00000000000..20d2973ca4f --- /dev/null +++ b/pkgs/development/python-modules/invoke/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "invoke"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0aiy1xvk1f91246zxd1zqrm679vdvd10h843a2na41cqr3cflpi6"; + }; + + # errors with vendored libs + doCheck = false; + + meta = { + description = "Pythonic task execution"; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 665d08980dc..a469ad46883 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.2.1"; + version = "6.2.2"; src = fetchPypi { inherit pname version; - sha256 = "9afb0001d6fa2eca9340e9daab5da021db05211987868f47ab5b305d701cb12d"; + sha256 = "02b225966d5c20f12b1fba0b6b10aa5d352a6b492e075f137ff0ff6e95b9358e"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index e65de4ee3ad..9f15a2fc5c2 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.2.1"; + version = "7.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ab9869cda5af7ba449d8f707b29b7e97a7db97d6366805d6b733338f51096f54"; + sha256 = "3ce93db970a94f06f38121da70757cdbcce884ecd14f79a4dd9bc49a47e0f33b"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix new file mode 100644 index 00000000000..cbff3f8b45a --- /dev/null +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm +, more-itertools, backports_functools_lru_cache }: + +buildPythonPackage rec { + pname = "jaraco.functools"; + version = "1.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b"; + }; + + propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; + + doCheck = false; + + buildInputs = [ setuptools_scm ]; + + meta = with lib; { + description = "Additional functools in the spirit of stdlib's functools"; + homepage = https://github.com/jaraco/jaraco.functools; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index eed6a8b979b..db79050077f 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "ac5646460defa5bf3d062504d870954c77d6234536365baf52433fb845b620d0"; + sha256 = "030a47ad3acbde45cb03872e2c6415c675dbb4a82462302971e93076145b5096"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 9522d2099f8..0664a6cc294 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr"; + sha256 = "b409ed0f6913a701ed474a614a3bb46e6953639033e31f769ca7581da5bd1ec1"; }; postPatch = '' diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 17896a58469..8b42e6e1ea1 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -9,10 +9,10 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.11"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; + sha256 = "68e6128e4734196616a39e2d48830ec7d61551c7f5748849e4c91478d2444524"; }; checkInputs = [ sphinx numpydoc pytest ]; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 2bdb93dfdf2..758fc0f1dd5 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "0.6"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw"; + sha256 = "6241a221b52e18265fe6bb59c60633acebb6fb5ef8c04de9a076b757aa133b86"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index 8dbe0738288..d68b031d517 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jsonrpc-base"; - version = "1.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk"; + sha256 = "21f860c915617f6475aa1ac5a1ec11de03cce6b279741f25ad97d8a4c5b76c3c"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 0914100b5aa..c753058b093 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "0.6"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cf349bee4ab96db2e457b6a71a45380e1a9cf3e1ceb08260ecfd9928040ebe71"; + sha256 = "40949836996c0a8104e7878997d3f68bda4561e9d3af64e5cd178127ec3c2778"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix index f316fe10563..79d22b6b1c9 100644 --- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: buildPythonPackage rec { pname = "jupyterlab_launcher"; - version = "0.10.5"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7"; + sha256 = "236a647f4c3f8417413643a918a893a5f662fb5d2fdccce2fd101e3cca2e7fd1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index e773bf7436a..24d1178da37 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "12.2.1"; + version = "13.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1zhg2a59rqgigl8apm4s39md6yf3f2v1d4bl6s5rmiigwfifm624"; + sha256 = "6364bb8c233f28538df4928576f4e051229e0451651073ab20b315488da16a58"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 02d10b832ff..a09fa75ce34 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "ldappool-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz"; + sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952"; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 47eea033f6e..4f6c2a96c56 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.17"; + version = "0.1.19"; src = fetchPypi { inherit pname version; - sha256 = "ac403b074337b9b58cae97ea00b3d94fc8efeea1717a80c49e79dc8aad6fc58f"; + sha256 = "3969b3c375c0f3fb60ff1645621ebf2f39fb697a53851620705f27ed7b283097"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index e606d84ede4..20312ed81d3 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.9.8"; + version = "0.11.3"; src = fetchPypi{ inherit pname version; - sha256 = "7e7d62cedef9d1291b8e77abc463d50b3d685dfd953611d55a0414c12276aa78"; + sha256 = "cb6199c3572e1223756465e758fb525e7f406a4808e9d7cfdddf089bec710047"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index f3b48eaa576..8d74a4d3c46 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.6.4"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"; + sha256 = "4707f81e933a97fed1c5bf7d4957f07bae1139cb8084bdee1f50201a40e3fd7c"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 4d702f16611..224cea4eebd 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.23.2"; + version = "0.24.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1e63f317b8fb3679d3a397920b1e8bade2d5f471f6c60c7e9bf97746f616f79e"; + sha256 = "320de4c4a1c105b91629305be069d217f3a9d7fbe32cb22bcfb016361895fc07"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 6d3b81488b9..9f932b81e7a 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "02in5555iak50gzn35bnnha9s85idmh0wwxaxz13v81z5krn077d"; + sha256 = "cdda9ed0deca7c68f87f7a404ad742e47aaa1ca5956d12988236a5ec3bda13a0"; }; propagatedBuildInputs = [ unittest2 six ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 8b321b911cc..8589e47be21 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.2.1"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b"; + sha256 = "622f7e40faef13d232fb52003661f2764ce6cdef3edb0a59af7c1559e4cc36d1"; }; buildInputs = [ libxml2 libxslt ]; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 823c8681873..4cb7744f3d9 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -2,11 +2,11 @@ mistune, docutils } : buildPythonPackage rec { pname = "m2r"; - version = "0.1.14"; + version = "0.1.15"; src = fetchPypi { inherit pname version; - sha256 = "a14635cdeedb125f0f85e014eb5898fd634e2da358a160c124818e9c9f851add"; + sha256 = "1c358d8bf21ff70e569968d604a0e3c9b05fe01b5f362389235e97bc7c0cd542"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 1515c050a3f..d44dc108ff3 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mozinfo"; - version = "0.9"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "1jwhnhbj7xipwh33wf7m12pw5g662dpr1chkp6p2fmy0mwpn2y4z"; + sha256 = "dcd53a1b1793340418e1ae42bf300e3e56d8f12047972378c6f9318b220b1023"; }; disabled = isPy3k; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index bc4b9e91465..ce24fd48dd4 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mozlog"; - version = "3.7"; + version = "3.8"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9"; + sha256 = "af3a3252bc58f8642a641601ba59096c22e4aa49cdc1ed4b0df2314f4f027f0d"; }; propagatedBuildInputs = [ blessings mozterm six ]; diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix index 98e8d5b4078..358b21893fa 100644 --- a/pkgs/development/python-modules/mozterm/default.nix +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mozterm"; - version = "0.1.0"; + version = "1.0.0"; # name 'unicode' is not defined disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561"; + sha256 = "b1e91acec188de07c704dbb7b0100a7be5c1e06567b3beb67f6ea11d00a483a4"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index cae571fe2f5..e04e9d1e802 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.3"; + version = "0.4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "9d6da0bbb04d7cab2bf9f08f78232c954f00ac95cf2384149e779a31ce859126"; + sha256 = "31fd5dd009bbee7f8b107db8c859e3a0a2793acc196f25ffbbae1e71b4c63ca5"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 46658520cb5..054d0247600 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.40.0"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "0ppfmpf60c78p4yp7in3f8y1l1fd34a38vw9swpg2fl6hz7c58mj"; + sha256 = "dab6038c7f0e17c1b67fb8f56303e8be21e73ac47760f1a8e716856f1bdf5057"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 65cdf79059d..021f3461e53 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.610"; + version = "0.620"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0fc7h7hf9042nlqczdvj2ngz2hc7rcnd35qz5pb840j38x9n8wpl"; + sha256 = "c770605a579fdd4a014e9f0a34b6c7a36ce69b08100ff728e96e27445cef3b3c"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 9aabd6d94e2..41e1d4cb10b 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.3.12"; + version = "1.3.13"; buildInputs = [ mysql.connector-c @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5"; + sha256 = "ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index e32c712560a..e952129f15d 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "5.3.2"; + version = "5.3.3"; checkInputs = [ hypothesis @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "94056276c41be501d9fad3ade61d4eb4edf3b37fea53829b3294b75dc1d23708"; + sha256 = "da930bfddce941526955dea8d35a44243c96adf919ceb758ba7bbd1ba5b0a39a"; }; # testing based on project's tox.ini diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 27fc7d11e75..d8a6499d136 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.5.3"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "fe6b9c16ed5f1b21f5591da74bfdd91a9bdf69eb4e918f1c06b3c8db307bd32b"; + sha256 = "da7f7dfb8a60711610139e894b41ebcab3cd7103b78439ad5e9e91c2d3cfa423"; }; checkInputs = [ nose rednose ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index ccfd35dc646..3785986ad28 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -8,6 +8,7 @@ , dateutil , funcsigs , future +, futures , mock , networkx , nibabel @@ -33,11 +34,11 @@ assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4c3c1eb15fc016457525d1f7eb701d1bbe595eb48a036ae8dc2d21b843f9e525"; + sha256 = "2a5ebbc9244a18e3b2d83a9639da09248e92bc0742b81a86550ef1a18c1fccbc"; }; # see https://github.com/nipy/nipype/issues/2240 @@ -46,6 +47,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" + + rm pytest.ini ''; propagatedBuildInputs = [ @@ -53,6 +56,7 @@ buildPythonPackage rec { dateutil funcsigs future + futures networkx nibabel numpy diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 9e4ba35680a..20ae56fdbc7 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: +{ stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "0.3.0"; pname = "node-semver"; - buildInputs = [ pytest tox ]; + checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 15f93878ab7..2f674c9ac34 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -20,15 +20,16 @@ , requests , send2trash , pexpect +, prometheus_client }: buildPythonPackage rec { pname = "notebook"; - version = "5.5.0"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "fa915c231e64a30d19cc2c70ccab6444cbaa93e44e92b5f8233dd9147ad0e664"; + sha256 = "e2c8e931cc19db4f8c63e6a396efbc13a228b2cb5b2919df011b946f28239a08"; }; LC_ALL = "en_US.utf8"; @@ -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/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 33d044c41aa..48ca5a80add 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.38.1"; + version = "0.39.0"; pname = "numba"; src = fetchPypi { inherit pname version; - sha256 = "48fb76b8dcde868d6426c7c7836b76a0b2b20861547770c27b6307f712c09bc5"; + sha256 = "07749d1ddac8c4c0ce8b22bf3dec52ef2fd4922174c71447126807f5f8dc2bae"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 8ba4e0061fa..09f6c6636c1 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.6.5"; + version = "2.6.6"; src = fetchPypi { inherit pname version; - sha256 = "f8ad8014085628eab91bc82fb9d10cf9ab8e04ede4884e4a1061445d395b36bb"; + sha256 = "97c1f7fa409439ae933494014cd41d43de84cfe6c98b7f93392f94d54de1b453"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 2ec5066e5fc..e4a9aa67dfd 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.4.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "33e88013ed2f4f9ec45598f0e0930a0d602ab3c49aa19e92703a867f37ffe520"; + sha256 = "ede911118cfee5a8fd4c341b418fc55bfcd70a557686febc4efb6693297e3aa2"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index e91925c75d5..9525be4cb34 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "outcome"; - version = "0.1.0a0"; + version = "0.1.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0cqwakzigw0602dxlb7c1882jwr8hn5nrxk1l8iwlmzc9whh48wn"; + sha256 = "d54e5d469088af53022f64a753b288d6bab0fe42e513eb7146137d560e2e516e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ef07f2a36e3..9e4ed217b92 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -28,15 +28,13 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.23.1"; + version = "0.23.3"; src = fetchPypi { inherit pname version; - sha256 = "50b52af2af2e15f4aeb2fe196da073a8c131fa02e433e105d95ce40016df5690"; + 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,7 +97,7 @@ in buildPythonPackage rec { chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' - py.test $out/${python.sitePackages}/pandas --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/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index daca12f66c0..718393b5e1e 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "paramz"; - version = "0.9.1"; + version = "0.9.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8a5a2fe5cdb033eb869c49e81fde2a9d0055fadb53a8af1665a7f48f320179cf"; + sha256 = "7b38c2487602c423ac402214c3b3fa6bbe22b294e2f9e5f9f3842182e1541599"; }; propagatedBuildInputs = [ numpy scipy six decorator ]; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 7f3bc9cf482..c29901b2e99 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f"; + sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix new file mode 100644 index 00000000000..7918c5bf6fa --- /dev/null +++ b/pkgs/development/python-modules/parver/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, attrs +, pytest +, hypothesis +, pretend +, arpeggio +}: + +buildPythonPackage rec { + pname = "parver"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "05dsjmk3ckd175ln8smxr1f6l6qsrjyd8s5vfqc5x7fii3vgyjmc"; + }; + + propagatedBuildInputs = [ six attrs arpeggio ]; + checkInputs = [ pytest hypothesis pretend ]; + + meta = { + description = "parver allows parsing and manipulation of PEP 440 version numbers."; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 764319a1a0d..666df965f87 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "4.0.4"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "a9c27eb8f0e24e786e544b2dbaedb729c9d8546342b5a6818d8eda098ad4340d"; + sha256 = "754e766b4f4bad3aa68cfd532456298da1aa39375da8748392dbae90860d5f18"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index b797e6e76a0..79a5a646ead 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.8"; + version = "8.9.10"; src = fetchPypi { inherit pname version; - sha256 = "7813a9d45f0d1386a23552072af20a3ef34fa34f76eeb9033743ff083f9551e1"; + sha256 = "cbb8194814cc026f476132c38c507adbd459bc8ee99be39f421650ab1b986ed7"; }; meta = { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 44399f34bda..22bd2fd8246 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"; + sha256 = "f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab"; }; doCheck = !stdenv.isDarwin && !isPyPy; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 20558312f29..f5732d2cb95 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "10.0.1"; + version = "18.0"; src = fetchPypi { inherit pname version; - sha256 = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68"; + sha256 = "a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76"; }; # pip detects that we already have bootstrapped_pip "installed", so we need diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 5675be32397..ac6cdc31f48 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "plaster_pastedeploy"; - version = "0.5"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "70a3185b2a3336996a26e9987968cf35e84cf13390b7e8a0a9a91eb8f6f85ba9"; + sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6a1993e1fd1..9d2df2a89eb 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.7.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f7305816a423fd899da20919282445703118aeece19a54fb97be4cbf302341f8"; + sha256 = "015a5b8ca616d19eb96433dd597c3ccccc80e3afba02a23bd526a017ff4fce05"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index ba1537a02c8..14baf995e6b 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -8,11 +8,11 @@ }: buildPythonPackage rec { pname = "preshed"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6"; + sha256 = "7b99ace606143a922163a7ff7ad4969b296288f5b20b9c9bda328caec3b92f71"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index 59ef547dba3..a8e8bf07ad5 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "progressbar"; - version = "2.3"; + version = "2.5"; # https://github.com/niltonvolpato/python-progressbar/issues/54 disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254"; + sha256 = "5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63"; }; # invalid command 'test' diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index f6b2bfa939c..be014bc0f7e 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1r3510jq6iryd2a8jln2qpvqy112y5502ncbfkn116xl7gj74r6r"; + sha256 = "69494dc1ac967c0f626c8193e439755c2b95dd4ed22ef31c277601778a50c7ff"; }; doCheck = false; diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index c1c9ce18c56..5de528ccd40 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ptyprocess"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365"; + sha256 = "923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"; }; meta = { diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 564946c579a..14ffb8e2773 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,16 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: buildPythonPackage rec { pname = "py"; - version = "1.5.3"; + version = "1.5.4"; src = fetchPypi { inherit pname version; - sha256 = "29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881"; + sha256 = "3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7"; }; # Circular dependency on pytest doCheck = false; + buildInputs = [ setuptools_scm ]; + meta = with stdenv.lib; { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; homepage = http://pylib.readthedocs.org/; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index ab83e54fd82..d8633488102 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.3.0"; + version = "0.4.0"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "14626aaa83cae4cd3d54f51646a0fd048e8ee0e3caf205522b33020226da8c0e"; + sha256 = "4042492db49efbdfc53e0afa89509695826b3fb74fb52444ed04f64c229a65f5"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index b5ac0f7b7b1..e47771d5ca0 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -18,10 +18,10 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.8"; + version = "3.11"; src = fetchPypi { inherit pname version; - sha256 = "1izjpf9q768m3j95y328vbdh7rycglqlslyd777b12c13i6zs6cb"; + sha256 = "ba6930427d57b79cf344262494fdcbddbf75f6e37794489d445f2ebb8bc53ec5"; }; doCheck = false; propagatedBuildInputs = [ pytz requests tzlocal ]; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 35c0d523300..8c23d2a3f30 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.1"; + version = "0.2.2"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc"; + sha256 = "a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index c1b133a0ab7..d7d266b23ff 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyasn1"; - version = "0.4.3"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc"; + sha256 = "f58f2a3d12fd754aa123e9fa74fb7345333000a035f3921dbdaa08597aa53137"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 32ef1d547b0..69b8e2bc0d1 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8"; + sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 35041f8447b..27ccc7f4687 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.6.2"; + version = "3.6.4"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "b19ed0f7752a0b1ec65834c9acb02ba64a812990854e318d32a619c709b14a69"; + sha256 = "9c7790ffd291c81b934fe0ca8155a67235d33f70d4914bbf7467a447d9dbcb09"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index aa838bc928e..b5487a24b77 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.6.2"; + version = "3.6.4"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8ed51799f6c060b4f62459e1bd9f3b3855bec6fa68202e76639d628001fdf3b7"; + sha256 = "4daabe7c0404e673b9029aa43761c779b9b4df2cbe11ccd94daded6a0acd8808"; }; } diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 06b027dd59a..d833d9a0f68 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "1.6.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805"; + sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index b6c9ae5e8ba..8fbd73dfc1f 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pygame"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz"; - sha256 = "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m"; + sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index a8946857d88..4ec77ed96c1 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.44"; + version = "0.1.46"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "09f928d33fefd1ef5d18325877d73d01c6811b6177fc97fc1190c20acc5e12a9"; + sha256 = "0a0ba8de05fc6d60bbb0beec7e808fb231abcb566c3bc17de532f72b18fe2837"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 86524b6002d..2dd014821e6 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "79351b79087f473f83fb27a5cd552bd1056f2dfa7acec5d4a68f35a7cbea6776"; + sha256 = "0d49d3bbfa0366dbe29176754ec86df75114a25525b530dcbbb75d3ac4c263e9"; }; buildInputs = [ openmp ]; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix new file mode 100644 index 00000000000..7ee73975272 --- /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/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index cd112f7c4e9..0156e92738a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,29 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, astroid, isort, - pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }: +{ stdenv, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, isort, + pytest, pytestrunner, mccabe, pytest_xdist, pyenchant }: buildPythonPackage rec { pname = "pylint"; - version = "1.9.2"; + version = "2.0.1"; + + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "fff220bcb996b4f7e2b0f6812fd81507b72ca4d8c4d05daf2655c333800cb9b3"; + sha256 = "2c90a24bee8fae22ac98061c896e61f45c5b73c2e0511a4bf53f99ba56e90434"; }; - buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; + checkInputs = [ pytest pytestrunner pytest_xdist pyenchant ]; - propagatedBuildInputs = [ astroid configparser isort mccabe ]; + propagatedBuildInputs = [ astroid isort mccabe ]; postPatch = '' - # Remove broken darwin tests - sed -i -e '/test_parallel_execution/,+2d' pylint/test/test_self.py - sed -i -e '/test_py3k_jobs_option/,+4d' pylint/test/test_self.py + # Remove broken darwin test rm -vf pylint/test/test_functional.py ''; checkPhase = '' - cd pylint/test - ${python.interpreter} -m unittest discover -p "*test*" + cat pylint/test/test_self.py + # Disable broken darwin tests + pytest pylint/test -k "not test_parallel_execution \ + and not test_py3k_jobs_option \ + and not test_good_comprehension_checks" ''; postInstall = '' diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index 79bb6dbd9a2..b0fd4f4003a 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pylru"; - version = "1.0.9"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; + sha256 = "e03a3d354eb8fdfa11638698e8a1f06cd3b3a214ebc0a120c603a79290d9ebec"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 5af6ef99228..ebf852c09a4 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.4.1"; + version = "3.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b8fe2a1ca142674f1b5cbed05a0a54ce9dade5998370005ddcea349472e7fe2d"; + sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 838adeac8a8..9c8bf84e7c5 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.6.1"; + version = "3.7.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f7ebcb846962ee40374db2d9014a89bea9c983ae63c1877957c3a0a756974796"; + sha256 = "f14fb6c4058772a0d74d82874d3b89d7264d89b4ed7fa0413ea0ef8112b268b9"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 0a972d4864b..0b073799254 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.6.2"; + version = "1.6.4"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - sha256 = "43496f0a1f363a5ecfc4cda5eba6a2a3d5056fe6c7ffb9a99fbb1c5a3c7dea05"; + sha256 = "f70e83d27c445795b6bf98c2bc826bbf2d0d63d4c7f83091c8064439042ba0dc"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix new file mode 100644 index 00000000000..e569042f729 --- /dev/null +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -0,0 +1,28 @@ +{ stdenv, python, fetchPypi, buildPythonPackage, cython }: + +buildPythonPackage rec { + pname = "PyStemmer"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91"; + }; + + nativeBuildInputs = [ cython ]; + + preBuild = '' + cython src/Stemmer.pyx + ''; + + checkPhase = '' + ${python.interpreter} runtests.py + ''; + + meta = with stdenv.lib; { + description = "Snowball stemming algorithms, for information retrieval"; + homepage = http://snowball.tartarus.org/; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 1d7447293df..2ad44c4e806 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { pytest . -k "not test_mtime_caching" ''; + # https://github.com/tholo/pytest-flake8/issues/49 + doCheck = false; + meta = { description = "py.test plugin for efficiently checking PEP8 compliance"; homepage = https://github.com/tholo/pytest-flake8; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index c50795a6669..caede4c1809 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "21eef04612ed42f73534c45ddbaef8458c800809354a5f5a96a8fde88b2a97e7"; + sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index cca3279482b..012226de053 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "08b550b498b9251901a3747f02aa2624ed53a9c8285ca482551346c85b47d641"; + sha256 = "4b261bec5782b603c98b4bb803484bc96bf1cdcb5480dae0999d21c7e0423a23"; }; buildInputs = [ pytest ]; checkInputs = [ pytest pexpect ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 84f337e1b83..2e88a765417 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.22.2"; + version = "1.22.3"; src = fetchPypi { inherit pname version; - sha256 = "e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f"; + sha256 = "48868d1f461122ac8c5fb60487b6da03c0d73dcb06a9d79e06c4eab8ef62a5c3"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 1c0ceef8365..5fda0994010 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText }: buildPythonPackage rec { - version = "3.6.2"; + version = "3.6.3"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c"; + sha256 = "0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752"; }; checkInputs = [ hypothesis mock ]; @@ -27,9 +27,11 @@ buildPythonPackage rec { runHook postCheck ''; - # Don't create .pytest-cache when using py.test in a Nix build + # Remove .pytest-cache when using py.test in a Nix build setupHook = writeText "pytest-hook" '' - export PYTEST_ADDOPTS="-p no:cacheprovider" + postFixupHooks+=( + 'find $out -name .pytest-cache -type d -exec rm -rf {} +' + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix index 91def55c5e4..e372913af7d 100644 --- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-axolotl-curve25519"; - version = "0.1"; + version = "0.4.1.post2"; src = fetchPypi { inherit pname version; - sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; + sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 1fff6bb7608..299a1887199 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -1,17 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, python-axolotl-curve25519, protobuf, pycrypto }: +{ lib, buildPythonPackage, fetchPypi, cryptography, python-axolotl-curve25519, protobuf }: buildPythonPackage rec { pname = "python-axolotl"; - version = "0.1.39"; + version = "0.1.42"; src = fetchPypi { inherit pname version; - sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; + sha256 = "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0"; }; - propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ]; - # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) - doCheck = false; + propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; meta = with lib; { homepage = https://github.com/tgalal/python-axolotl; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index d5547217910..5bb20ae8e77 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "9.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0a5b4wfc6ms7kblynw2h3ygpww98kyz5n8iibqbdyykwx8xj7hzm"; + sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639"; }; prePatch = '' diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index f476d0d4d44..1ff1f651264 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "python-fedora"; - version = "0.9.0"; + version = "0.10.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "0sf468scw52sw9pzxrnmqs54rix9c4fp1mi2r5k5n7mgjrmf6j0x"; + sha256 = "5516b8c066bb2eb5d604ae8e84c3d31e27753795c5d84f6a792979363756405c"; }; propagatedBuildInputs = [ kitchen requests bunch paver lockfile six munch urllib3 beautifulsoup4 openidc-client ]; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index d5cf709104f..d29365c86ba 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python_openzwave"; - version = "0.4.4"; + version = "0.4.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "17wdgwg212agj1gxb2kih4cvhjb5bprir4x446s8qwx0mz03azk2"; + sha256 = "b28a3abefc04d1d04dd68ee5a695b091e96ba7ab9a9eaa67db43dd55b61a4664"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 31092705d0f..41eac5d2044 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.4"; + version = "2018.5.2"; src = fetchPypi { inherit pname version; - sha256 = "f9746ef763ce4d7d59ee8506ee83dd684884e4b520244b67f253095decc8a876"; + sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 734fbbba717..7eb9ada5cae 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2018.4"; + version = "2018.5"; src = fetchPypi { inherit pname version; - sha256 = "c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749"; + sha256 = "ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 558dc37a394..f667e09892c 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.6.0"; + version = "0.6.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "1a3fqjlgbzq5hmc3yrnxxxl8nyn3rz2kfn17svbsahaq4gj0xl09"; + sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; }; # IOError: [Errno 95] Operation not supported (expected) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 4de7777fa8b..26c453e3a09 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "17.0.0"; + version = "17.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0145ae59139b41f65e047a3a9ed11bbc36e37d5e96c64382fcdff911c4d8c3f0"; + sha256 = "2199f753a230e26aec5238b0518b036780708a4c887d4944519681a920b9dee4"; }; checkInputs = [ pytest tornado ]; diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index e65329c1b69..a4274317e1b 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.1"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934"; + sha256 = "92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 660f56e1660..f3e6d1f5e0a 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.06.21"; + version = "2018.07.11"; src = fetchPypi { inherit pname version; - sha256 = "b172583f0c5f104e059a30dd6a1f9d20693031b156558590a745d6cc3192e283"; + sha256 = "9308dbce8e5ff4ee06b172a777f6c7f650a5835a5ad41a6080eb501639c27a2f"; }; postCheck = '' diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index e8e18face07..14e8f9f74ce 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.6.8"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c"; + sha256 = "e27af9a202b8cdedd07793abbd3282806ec724aba091a27c76d7ba8284cfd8ba"; }; checkInputs = [ sphinx pytestcov pytest ]; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 0b3e84c3512..6ede1b8937b 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.4.0"; + version = "3.5.2"; src = fetchPypi { inherit pname version; - sha256 = "5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343"; + sha256 = "08986267eaf25d62c3802512f0a97dc3426d0c82f52c8beb576689582eb85b7f"; }; checkInputs = [ glibcLocales ]; 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 00000000000..ab0758a84e1 --- /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 00000000000..67cc3a60f77 --- /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/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 2286d9c2dc7..3ea1bf58d8a 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests-mock"; - version = "1.5.0"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "a029fe6c5244963ef042c6224ff787049bfc5bab958a1b7e5b632ef0bbb05de4"; + sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 87a59cf7397..381a784d24a 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "0.6.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; + sha256 = "492c11b18e89af42f98e96bca7671ffee4ad4cf5e69ea23b4d2221157d81b512"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sabyenc/default.nix b/pkgs/development/python-modules/sabyenc/default.nix new file mode 100644 index 00000000000..7c82e22efd6 --- /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/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 592182d8b31..b278d26b5dd 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1p4cv99jaszhfam9qj6parij94n7yzwz4bawfl9qh5syx77wkxg2"; + sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc"; }; checkInputs = [ nose jinja2 mock ]; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index bbdc4d90b28..cf9e175490d 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sarge"; - version = "0.1.4"; + version = "0.1.5.post0"; src = fetchPypi { inherit pname version; - sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; + sha256 = "da8cc90883f8e5ab4af0d746438f608662f5f2a35da2e858517927edefa134b0"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 39af29da814..4e22110bf3d 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -6,18 +6,16 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.19.1"; + version = "0.19.2"; + # UnboundLocalError: local variable 'message' referenced before assignment + doCheck = false; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0"; + sha256 = "b276739a5f863ccacb61999a3067d0895ee291c95502929b2ae56ea1f882e888"; }; - # basically https://github.com/scikit-learn/scikit-learn/pull/10723, - # but rebased onto 0.19.1 - patches = [ ./n_iter-should-be-less-than-max_iter-using-lbgfs.patch ]; - buildInputs = [ nose pillow gfortran glibcLocales ]; propagatedBuildInputs = [ numpy scipy numpy.blas ]; @@ -29,10 +27,12 @@ buildPythonPackage rec { HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests --doctest-options=+SKIP $out/${python.sitePackages}/sklearn/ ''; + + meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; homepage = http://scikit-learn.org; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch b/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch deleted file mode 100644 index 67309a673d0..00000000000 --- a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/sklearn/linear_model/huber.py b/sklearn/linear_model/huber.py -index e17dc1e..665654d 100644 ---- a/sklearn/linear_model/huber.py -+++ b/sklearn/linear_model/huber.py -@@ -181,7 +181,11 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator): - - n_iter_ : int - Number of iterations that fmin_l_bfgs_b has run for. -- Not available if SciPy version is 0.9 and below. -+ -+ .. versionchanged:: 0.20 -+ -+ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed -+ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``. - - outliers_ : array, shape (n_samples,) - A boolean mask which is set to True where the samples are identified -@@ -272,7 +276,9 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator): - raise ValueError("HuberRegressor convergence failed:" - " l-BFGS-b solver terminated with %s" - % dict_['task'].decode('ascii')) -- self.n_iter_ = dict_.get('nit', None) -+ # In scipy <= 1.0.0, nit may exceed maxiter. -+ # See https://github.com/scipy/scipy/issues/7854. -+ self.n_iter_ = min(dict_.get('nit', None), self.max_iter) - self.scale_ = parameters[-1] - if self.fit_intercept: - self.intercept_ = parameters[-2] -diff --git a/sklearn/linear_model/logistic.py b/sklearn/linear_model/logistic.py -index 8646c9a..c72a7d9 100644 ---- a/sklearn/linear_model/logistic.py -+++ b/sklearn/linear_model/logistic.py -@@ -718,7 +718,9 @@ def logistic_regression_path(X, y, pos_class=None, Cs=10, fit_intercept=True, - warnings.warn("lbfgs failed to converge. Increase the number " - "of iterations.") - try: -- n_iter_i = info['nit'] - 1 -+ # In scipy <= 1.0.0, nit may exceed maxiter. -+ # See https://github.com/scipy/scipy/issues/7854. -+ n_iter_i = min(info['nit'], max_iter) - except: - n_iter_i = info['funcalls'] - 1 - elif solver == 'newton-cg': -@@ -1115,6 +1117,11 @@ class LogisticRegression(BaseEstimator, LinearClassifierMixin, - it returns only 1 element. For liblinear solver, only the maximum - number of iteration across all classes is given. - -+ .. versionchanged:: 0.20 -+ -+ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed -+ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``. -+ - See also - -------- - SGDClassifier : incrementally trained logistic regression (when given -diff --git a/sklearn/linear_model/tests/test_huber.py b/sklearn/linear_model/tests/test_huber.py -index 08f4fdf..ca1092f 100644 ---- a/sklearn/linear_model/tests/test_huber.py -+++ b/sklearn/linear_model/tests/test_huber.py -@@ -42,6 +42,13 @@ def test_huber_equals_lr_for_high_epsilon(): - assert_almost_equal(huber.intercept_, lr.intercept_, 2) - - -+def test_huber_max_iter(): -+ X, y = make_regression_with_outliers() -+ huber = HuberRegressor(max_iter=1) -+ huber.fit(X, y) -+ assert huber.n_iter_ == huber.max_iter -+ -+ - def test_huber_gradient(): - # Test that the gradient calculated by _huber_loss_and_gradient is correct - rng = np.random.RandomState(1) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 1c03e381bdc..fcac013b6de 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.1"; pname = "Scrapy"; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755"; + sha256 = "5a398bf6818f87dcc817c919408a195f19ba46414ae12f259119336cfa862bb6"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index cc6fed43a42..d596c640823 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -8,10 +8,10 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae"; + sha256 = "76c83f794ca320fb6b23a7c6192d5e185a5fcf4758966a0c0a54baee46d41e2f"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index de17e65d2bf..dfca0a5fa2e 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "seekpath"; - version = "1.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "0bdc0400c96952525b1165894807e4bec90aaedb11cfeb27a57414e6091eb026"; + sha256 = "8fb22231ed6fc6aa12e2f2cc6c8ca67b82648e16c1c85ddac2e2237ac4553d83"; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 2ce15521048..d3c6006bc6c 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "seqdiag"; - version = "0.9.5"; + version = "0.9.6"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; - sha256 = "994402cb19fef77ee113d18810aa397a7290553cda5f900be2bb44e2c7742657"; + sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf"; }; buildInputs = [ pep8 nose unittest2 docutils ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index ea478109722..b10cdfae5c7 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "39.2.0"; + version = "40.0.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2"; + sha256 = "012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f"; }; nativeBuildInputs = [ unzip wrapPython ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 52101b3482f..42d82566073 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.6.4.post1"; + version = "1.6.4.post2"; src = fetchPypi { inherit pname version; - sha256 = "30df7572d311514802df8dc0e229d1660bc4cbdcf027a8281e79c5fc2fcf02f2"; + sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f"; }; buildInputs = [ geos glibcLocales cython ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index b42be465a3b..2099b00ba96 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.15.0"; + version = "3.16.0"; doCheck = !stdenv.isDarwin; src = fetchPypi { inherit pname version; - sha256 = "ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb"; + sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5"; }; meta = { diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 0503e2ef04f..bfca2a6f698 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,13 +1,15 @@ { lib, fetchurl, buildPythonPackage, python, isPyPy }: -if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { +buildPythonPackage rec { pname = "sip"; - version = "4.19.6"; + version = "4.19.8"; format = "other"; + disabled = isPyPy; + src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx"; + sha256 = "1g4pq9vj753r2s061jc4y9ydzgb48ibhc9bdvmb8mlyllwp7mbvy"; }; configurePhase = '' diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index 7f437ec59c1..37ecc8bbb1c 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sleekxmpp"; - version = "1.3.1"; + version = "1.3.3"; propagatedBuildInputs = [ dns pyasn1 ]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr"; + sha256 = "d213c1de71d92505f95ced0460ee0f84fdc4ddcacb7d7dd343739ed4028e5569"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 8c66df80dc5..f1a5bf6ed9f 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.5.7"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0y1c29pdxxgxkymr7g2n59siqqaq351zbx9vz8433dxvzy4qgd7p"; + sha256 = "c2c2b44125a03d6e96efdf3e53e28be99e1f548e8a4fa8035f8fab448bbdbbda"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/smmap2/default.nix b/pkgs/development/python-modules/smmap2/default.nix index ea0f0859bbd..08264e92e5f 100644 --- a/pkgs/development/python-modules/smmap2/default.nix +++ b/pkgs/development/python-modules/smmap2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "smmap2"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1hvn28p3zvxa98sbi9lrqvv2ps4q284j4jq9a619zw0m7yv0sly7"; + sha256 = "dc216005e529d57007ace27048eb336dcecb7fc413cfb3b2f402bb25972b69c6"; }; checkInputs = [ nosexcover ]; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix new file mode 100644 index 00000000000..9b7481a62a6 --- /dev/null +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, PyStemmer, fetchPypi }: + +buildPythonPackage rec { + pname = "snowballstemmer"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128"; + }; + + # No tests included + doCheck = false; + + propagatedBuildInputs = [ PyStemmer ]; + + meta = with stdenv.lib; { + description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; + homepage = http://sigal.saimon.org/en/latest/index.html; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index d2a306356b6..dc0509e226c 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.0.9"; + version = "2.0.12"; src = fetchPypi { inherit pname version; - sha256 = "1ihkhflhyz67bp73kfjqfrbcgdxi2msz5asbrh0pkk590c4vmms5"; + sha256 = "b220ebee412c19613c26b2c1870b60473834bd686cec49553ce5f184164d3359"; }; prePatch = '' diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 07273d0fa0d..e04589f3dfc 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.10.3.65"; + version = "1.10.3.75"; src = fetchPypi { inherit pname version; - sha256 = "55b49227835396b2bcd6afe724e9f37202ad0f61e273bedebd5bf740bad2e8e3"; + sha256 = "347fea7c87f7d2162fabb780560665d21a43cbd7a0af08328130ba26e6422143"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 0c45592fc21..97f76be15cb 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -26,10 +26,10 @@ buildPythonPackage rec { pname = "Sphinx"; - version = "1.7.5"; + version = "1.7.6"; src = fetchPypi { inherit pname version; - sha256 = "d45480a229edf70d84ca9fae3784162b1bc75ee47e480ffe04a4b7f21a95d76d"; + sha256 = "217ad9ece2156ed9f8af12b5d2c82a499ddf2c70a33c5f81864a08d8c67b9efc"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index c2e454d08cd..8a5609c1cd9 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; - checkInputs = [ unittest2 scripttest pytz pylint mock testtools testrepository ]; + checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; prePatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 50d58877b7e..8c3c6fe2374 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.2.8"; + version = "1.2.10"; src = fetchPypi { inherit pname version; - sha256 = "2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c"; + sha256 = "72325e67fb85f6e9ad304c603d83626d1df684fdf0c7ab1f0352e71feeab69d8"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index bc2218f7dee..674d1e66f7e 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.6"; + version = "1.2.7"; src = fetchPypi { inherit pname version; - sha256 = "a3649f9b5219b7336b82d3a1bf6e91c8d649171b96747b927a92ac075947d619"; + sha256 = "9e570fcac05b3231d5e01398e496b88a78601938bba228e381994a1b3fe3bd88"; }; # No tests in archive diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index e7745cf8625..6d088d52d7e 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.28.0"; + version = "1.29.0"; src = fetchPypi { inherit pname version; - sha256 = "f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b"; + sha256 = "1e153545aca7a6a49d8337acca4f41c212fbfa60bf864ecd056df0cafb9627e8"; }; doCheck = false; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 07849b0f30c..f2e4b946b5d 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.82.2"; + version = "2.0.3"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9d0443d772d176faba8c8e8a2ddc3a507861dd7d882b4a88cf6062b20fa5f224"; + sha256 = "17a618541c19a48d5591f4011a282cbcbbe2d05c361109f8f5381aeec05eb270"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix new file mode 100644 index 00000000000..0e9f4f43656 --- /dev/null +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, suds-jurko +, ldap +, mechanize +, beautifulsoup4 +, pyxdg +, dateutil +, requests +, httpretty +}: + +buildPythonPackage rec { + pname = "suseapi"; + version = "0.24-31-g0fcbe96"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "python-${pname}"; + rev = version; + sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4"; + }; + + propagatedBuildInputs = [ + django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests + ]; + + buildInputs = [ httpretty ]; + + doCheck = false; + + meta = { + homepage = "https://github.com/openSUSE/python-suseapi/"; + description = "Python module to work with various SUSE services"; + license = lib.licenses.gpl3Plus; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 9f8087a305d..1aabffc05d5 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,19 +1,25 @@ -{ buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools_scm -, six, pytz}: +, six, pytz, jaraco_functools }: buildPythonPackage rec { pname = "tempora"; - version = "1.9"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "9ea980c63be54f83d2a466fccc6eeef96a409f74c5034764fb328b0d43247e96"; + sha256 = "4848df474c9d7ad9515fbeaadc88e48843176b4b90393652156ccff613bcaeb1"; }; doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six pytz ]; + propagatedBuildInputs = [ six pytz jaraco_functools ]; + + meta = with lib; { + description = "Objects and routines pertaining to date and time"; + homepage = https://github.com/jaraco/tempora; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix new file mode 100644 index 00000000000..fa4fc0b1fed --- /dev/null +++ b/pkgs/development/python-modules/testresources/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, python +, pbr, fixtures, testtools }: + +buildPythonPackage rec { + pname = "testresources"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417"; + }; + + buildInputs = [ pbr ]; + + checkInputs = [ fixtures testtools ]; + + checkPhase = '' + ${python.interpreter} -m testtools.run discover + ''; + + meta = with lib; { + description = "Pyunit extension for managing expensive test resources"; + homepage = https://launchpad.net/testresources; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 9b22ad3e545..fdfa91d292f 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "32ffb796f2abf0577af480d482608cca2baf85d366a4e2981ffd3e632ebeb76c"; + sha256 = "6019f32719c0661f41fa93c2fdd9714504d443119bf4f6426ee690bdda90835b"; }; disabled = isPy27; # 2.7 requires backports.csv diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 277d70cba6a..fed9a3fd733 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0f75f5838b775bddc19f72c5bf50eb74be3815eb505ed3084e4666ce2e6c3259"; + sha256 = "95e8cfe85f8395a7eacdfbc8f09d885b9ef3a6ac6ead0364ea721de1127aa36b"; }; meta = { diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 6e1baf2f2e9..159051b9a6a 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "0.14.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "eff44f71782dce38c604921a1b29ddad0d007ac9871d66e9c872fd6fc311334e"; + sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 37b1c7bcf5c..6d86404e192 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "5.0.2"; + version = "5.1"; propagatedBuildInputs = [ backports_abc certifi singledispatch ] @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7"; + sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582"; }; meta = { diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 4ceeb026634..7719687f2ea 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,23 +1,31 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, py -, virtualenv +, packaging , pluggy -, setuptools_scm +, py , six +, virtualenv +, setuptools_scm }: buildPythonPackage rec { pname = "tox"; - version = "3.0.0"; + version = "3.1.2"; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py virtualenv pluggy six ]; + propagatedBuildInputs = [ packaging pluggy py six virtualenv ]; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "96efa09710a3daeeb845561ebbe1497641d9cef2ee0aea30db6969058b2bda2f"; + sha256 = "9f0cbcc36e08c2c4ae90d02d3d1f9a62231f974bcbc1df85e8045946d8261059"; }; -} \ No newline at end of file + + meta = with lib; { + description = "Virtualenv-based automation of test activities"; + homepage = https://tox.readthedocs.io/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 90d8003bb34..f49c7a0d243 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "17.8.0"; + version = "18.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16"; + sha256 = "91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 0f96b100435..878de187519 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.9.1"; + version = "0.10.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; + sha256 = "4dba4d5c53d3ca22884d79fb4aa68905fb8353a5da5f96c734645d8cf537138d"; }; propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 2bd607170fd..c630668386e 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.4.0"; + version = "0.5.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0ib1x47knlad9pljb64ywfiv6m3dfrqqjwka6j1b73hixmszb5h4"; + sha256 = "ce0b4f59e2f41af0433247f92ce83116bf356a3c2ab5ca5942cf359a1105b4a8"; }; checkInputs = [ pytest pyopenssl trustme ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 14ccac5690b..49e936c1cc1 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -7,21 +7,23 @@ , automat , constantly , hyperlink +, pyhamcrest +, attrs , pyopenssl , service-identity , idna }: buildPythonPackage rec { pname = "Twisted"; - version = "18.4.0"; + version = "18.7.0"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9"; + sha256 = "95ae985716e8107816d8d0df249d558dbaabb677987cc2ace45272c166b267e4"; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; + propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs ]; passthru.extras.tls = [ pyopenssl service-identity idna ]; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index e369e13cb95..2fb7e83c3b1 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.0.0"; + version = "18.0.2"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0z2gsyp9msxrzsm7vq2vq8231a678g4g563xni6cnq4xdb4nx3w1"; + sha256 = "ce50fdd00abb8b490b72809a2c664684f67f3c9467f392642d36f58309395a87"; }; # Skip a failing test until fixed upstream: diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 611eeba8ae0..a6eb75b53cf 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.1.4"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "40b22d18d2215b76b3ddda2564acfbddfa6e702968637fbd969187c2a6fb99da"; + sha256 = "e588ff78b7093fc31c3b00c78db09b9b3764157b03b867f25ccd1dd3efd96ffb"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 45c1428c606..368f787313b 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "2.8.33"; + version = "2.9.6"; src = fetchPypi { inherit pname version; - sha256 = "42b6482d085b699a534f0a3ec352e96d4653e31c8839855c8a852618f54e27d8"; + sha256 = "1fb8dd19bd1f1ed376a96e92b32ff44f7d3688bda55eda9055898111fdac8391"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 805941cab60..e0e842a773d 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "13c6a835a6dc1ac96d7e6cae03587525eb260d7a46c6e5dd7a25416655eecb3a"; + sha256 = "7031f9c78a70b9586d2db4a2ec135c4e04194cabff58695ef0cc95e7cd66bc01"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 3c0b8a1f593..95cf6efaa46 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: buildPythonPackage rec { - version = "0.9.6"; + version = "0.9.6.1"; pname = "vobject"; src = fetchPypi { inherit pname version; - sha256 = "cd9ede4363f83c06ba8d8f1541c736efa5c46f9a431430002b2f84f4f4e674d8"; + sha256 = "96512aec74b90abb71f6b53898dd7fe47300cc940104c4f79148f0671f790101"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 8b2584a16d3..0628b3c869a 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "websockets"; - version = "5.0.1"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674"; + sha256 = "8f3b956d11c5b301206382726210dc1d3bee1a9ccf7aadf895aaf31f71c3716c"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 5af9119508a..0f102dda106 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5417789ee6064ff515fd10be24870660af3561c02d3d48b26f6f44285d0f70cc"; + sha256 = "c5280a62d293735cdadc7b8884e2affcfb0488420ee09963577f042359726392"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a9041f9a76f..c443c8fc880 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.10.7"; + version = "0.10.8"; src = fetchPypi { inherit pname version; - sha256 = "d87241580e3eccb961dfc16e804e1b92b3d6a8000ffee82ceb076767934342cc"; + sha256 = "6a1f2c5dc5f639f8343f70ed08d0afbb477a3867298ef38f0d9bf4aafa0fb750"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 29830adb5ed..291b981bf47 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.9.8"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1img6941wvwpk71q3vi9526bfjbh949k4lphrvdwlcf4igwy435m"; + sha256 = "dc62e1d2fea896855ee0681f02bcb7596e3b6b5aa559348b8520a4eb0c793282"; }; propagatedBuildInputs = [ intervaltree pyflakes requests lxml ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index e27abba413d..d72b1999030 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.9.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "75295a7cbfb3529e02551d4e95c2e3eb85d66292bedcfb463d25d71308065e34"; + sha256 = "e9b7dec24921ef13180902e5dbcaae9157c773e3e3e2780ef77d3a4dd67d799f"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index b59a93d3732..56b64cd061b 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/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e77647b2fed..3725760c1d6 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,6 +1,6 @@ -{ lib, python }: +{ lib, python3, fetchpatch, git }: -let newPython = python.override { +let newPython = python3.override { packageOverrides = self: super: { distro = super.distro.overridePythonAttrs (oldAttrs: rec { version = "1.1.0"; @@ -16,30 +16,48 @@ let newPython = python.override { sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3"; }; }); + astroid = super.astroid.overridePythonAttrs (oldAttrs: rec { + version = "1.6.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a"; + }; + }); + pylint = super.pylint.overridePythonAttrs (oldAttrs: rec { + version = "1.8.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9"; + }; + + }); }; }; in newPython.pkgs.buildPythonApplication rec { - version = "1.5.2"; + version = "1.6.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0r5ymq27j60py1fb396zshq7z6adda34a857lwrj3k8hqhs0ihpp"; + sha256 = "386476d3af1fa390e4cd96e737876e7d1f1c0bca09519e51fd44c1bb45990caa"; }; - postPatch = '' - # Remove pylint constraint - substituteInPlace conans/requirements.txt --replace ", <1.9.0" "" - ''; + # Bump PyYAML to 3.13 + patches = fetchpatch { + url = https://github.com/conan-io/conan/commit/9d3d7a5c6e89b3aa321735557e5ad3397bb80568.patch; + sha256 = "1qdy6zj3ypl1bp9872mzaqg1gwigqldxb1glvrkq3p4za62p546k"; + }; - checkInputs = with newPython.pkgs; [ + checkInputs = [ + git + ] ++ (with newPython.pkgs; [ nose parameterized mock webtest codecov - ]; + ]); propagatedBuildInputs = with newPython.pkgs; [ requests fasteners pyyaml pyjwt colorama patch @@ -47,9 +65,10 @@ in newPython.pkgs.buildPythonApplication rec { future pygments mccabe deprecation ]; - preCheck = '' + checkPhase = '' export HOME="$TMP/conan-home" mkdir -p "$HOME" + nosetests conans.test ''; meta = with lib; { diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 388f6b0db43..7981681a641 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/ghp-import/default.nix b/pkgs/development/tools/ghp-import/default.nix new file mode 100644 index 00000000000..9bad3fc6870 --- /dev/null +++ b/pkgs/development/tools/ghp-import/default.nix @@ -0,0 +1,28 @@ +{ python3, glibcLocales, lib }: + +with python3.pkgs; + +buildPythonApplication rec { + version = "0.4.1"; + pname = "ghp-import"; + + src = fetchPypi { + inherit pname version; + sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053"; + }; + + disabled = isPyPy; + buildInputs = [ glibcLocales ]; + + LC_ALL="en_US.UTF-8"; + + # No tests available + doCheck = false; + + meta = { + description = "Copy your docs directly to the gh-pages branch"; + homepage = "https://github.com/davisp/ghp-import"; + license = "Tumbolia Public License"; + maintainers = with lib.maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 2badd0ed26a..890ff7b64a9 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -26,11 +26,6 @@ stdenv.mkDerivation rec { }); patches = [ - # Turn on --enable-new-dtags by default to make the linker set - # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. - ./new-dtags.patch - # Since binutils 2.22, DT_NEEDED flags aren't copied for dynamic outputs. # That requires upstream changes for things to work. So we can patch it to # get the old behaviour by now. @@ -117,6 +112,11 @@ stdenv.mkDerivation rec { "--enable-deterministic-archives" "--disable-werror" "--enable-fix-loongson2f-nop" + + # Turn on --enable-new-dtags by default to make the linker set + # RUNPATH instead of RPATH on binaries. This is important because + # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. + "--enable-new-dtags" ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ]; doCheck = false; # fails diff --git a/pkgs/development/tools/misc/binutils/new-dtags.patch b/pkgs/development/tools/misc/binutils/new-dtags.patch deleted file mode 100644 index eea6f8c39d5..00000000000 --- a/pkgs/development/tools/misc/binutils/new-dtags.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- binutils/ld/ldmain.c -+++ binutils/ld/ldmain.c -@@ -296,6 +296,7 @@ main (int argc, char **argv) - - link_info.allow_undefined_version = TRUE; - link_info.keep_memory = TRUE; -+ link_info.new_dtags = TRUE; - link_info.combreloc = TRUE; - link_info.strip_discarded = TRUE; - link_info.callbacks = &link_callbacks; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 32c888b7e62..31e720b13f2 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 17620c9df6c..1fd52f43557 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 73c5b762318..cea86f090d6 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 eb51abe0321..57de59605f3 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/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index e58cc44884c..297d2c3c666 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,16 +2,16 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.5.18"; + version = "2018.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84"; + sha256 = "0fpnfxdkymz9an3m6isq5g24ykd6hnkjc8llfnvbmnakz1sd0sxv"; }; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ pew pip requests flake8 ]; + propagatedBuildInputs = [ pew pip requests flake8 parver invoke ]; doCheck = false; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index ef74842da1c..0dcc1287791 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 dc157b67253..48f9822ad86 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 6b7ead6d203..c8f5deef924 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 e48ac612b32..5334e4cbd12 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 e75698e7279..274a095de6f 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 10ce55f4e21..4bf03fec9de 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 e43d01d2eca..a0fc6d5ca71 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 ce911ae40d5..111bc449d88 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 1d281b3ac90..91584bfa1fe 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 8a9580d99e1..b3dfed3d265 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 9e7f70925a2..4d0e85e153c 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 00000000000..febd2185bac --- /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 3b95907a789..9ccda9178f1 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 79d3a0613dc..4a98b4f169d 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 c4a01ce09bd..c5f63d6671c 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 a09fa93cb78..fc13d97429c 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 83ca21719fa..b29cf88f168 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 7f4c9dae166..91e6e7f4cc5 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 de9787a0fa7..833609f9fc2 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 2bff43c93de..c5a53555d20 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 2ac619232d4..71984ec5c77 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 d4a2c56a894..8bb2d53da9e 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 3fe55b2a6f3..d89d0151d9b 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 fee9b0c09d5..3665606e99c 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 94bd92abb4f..fc7acc35c19 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 f72ec76cc64..53c8411a22c 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 461b90bc978..7c7da361246 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 5a9d8e61b1f..acd08f658e6 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 8c86cc6577a..62fd3397cb6 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 b7fddeb854d..afa6321fb5d 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 06caf191587..84872649c49 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 0e31cd8fe08..32acba433b1 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 0ba5a3ee5ad..9a6f2b0b5e1 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 a1b458986e5..cc28dc73ca8 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 390039944c0..c82b455200a 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 b7b3640a953..22dd700b2dd 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/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 6afd4e3a05e..48ee68f4c00 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -192,14 +192,14 @@ rec { depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; - depsHostBuild = lib.elemAt (lib.elemAt dependencies 1) 0; + depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0; buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; - depsHostBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; + depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index c5feffcea99..8b98aac1146 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -504,6 +504,10 @@ activatePackage() { addToSearchPath _PATH "$pkg/bin" fi + if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then + addToSearchPath HOST_PATH "$pkg/bin" + fi + if [[ -f "$pkg/nix-support/setup-hook" ]]; then local oldOpts="$(shopt -po nounset)" set +u diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 331a4bffb81..c454cca0ed6 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/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index b6ff7e5c967..5c7ced40afb 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -97,7 +97,7 @@ let }; in pythonPackages.buildPythonApplication rec { - name = "beets-${version}"; + pname = "beets"; version = "1.4.7"; src = fetchFromGitHub { @@ -114,7 +114,6 @@ in pythonPackages.buildPythonApplication rec { pythonPackages.munkres pythonPackages.musicbrainzngs pythonPackages.mutagen - pythonPackages.pathlib pythonPackages.pyyaml pythonPackages.unidecode pythonPackages.gst-python diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 99c0bd4a34c..e0b4d1fee12 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 d4b6b9a72eb..ee14f2d6781 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 00000000000..40725defbed --- /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 b0c33212edb..9fe4f90f258 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 2fb1c9325c0..7bdb3444a4c 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 8d1ee7b7bfb..3769860d469 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 6cd9623ad1c..0b606882a5c 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 5e6db9fdc20..59c0396eebe 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 e8e2152f711..b85d2bffc34 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 <