diff options
231 files changed, 1404 insertions, 1268 deletions
diff --git a/doc/default.nix b/doc/default.nix index 9ad1b3da69c..4c04128052b 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -14,7 +14,7 @@ pkgs.stdenv.mkDerivation { # $ nix-shell --run "make clean all" # otherwise they won't reapply :) HIGHLIGHTJS = pkgs.documentation-highlighter; - XSL = "${pkgs.docbook5_xsl}/xml/xsl"; + XSL = "${pkgs.docbook_xsl_ns}/xml/xsl"; RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf; xsltFlags = lib.concatStringsSep " " [ diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index fef6b2f86c8..be28c2c17af 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -209,13 +209,13 @@ let --stringparam collect.xref.targets only \ --stringparam targets.filename "$out/manual.db" \ --nonet \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml cat > "$out/olinkdb.xml" <<EOF <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE targetset SYSTEM - "file://${docbook5_xsl}/xml/xsl/docbook/common/targetdatabase.dtd" [ + "file://${docbook_xsl_ns}/xml/xsl/docbook/common/targetdatabase.dtd" [ <!ENTITY manualtargets SYSTEM "file://$out/manual.db"> ]> <targetset> @@ -264,11 +264,11 @@ in rec { ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --output $dst/ \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml mkdir -p $dst/images/callouts - cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ + cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ cp ${../../../doc/style.css} $dst/style.css cp ${../../../doc/overrides.css} $dst/overrides.css @@ -292,11 +292,11 @@ in rec { ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --xinclude --output $dst/epub/ \ - ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ ${manual-combined}/manual-combined.xml mkdir -p $dst/epub/OEBPS/images/callouts - cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ + cp -r ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub" zip -0Xq "$manual" mimetype @@ -324,7 +324,7 @@ in rec { --param man.endnotes.are.numbered 0 \ --param man.break.after.slash 1 \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ - ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ + ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ ${manual-combined}/man-pages-combined.xml ''; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cd00bc8d6bc..e5dce84d6ee 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -682,7 +682,6 @@ ./services/web-servers/lighttpd/collectd.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix - ./services/web-servers/lighttpd/inginious.nix ./services/web-servers/meguca.nix ./services/web-servers/mighttpd2.nix ./services/web-servers/minio.nix diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 6a3f7cfd210..93ced0b9f04 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -65,7 +65,7 @@ in serviceConfig = { # Trigger the udev rule manually. This doesn't require replugging the # device when first enabling the option to get it to work - ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; + ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f"; }; }; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index fdcfe6bc2b8..0756e81612a 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -37,7 +37,7 @@ let # List of components used in config extraComponents = filter useComponent availableComponents; - package = if cfg.autoExtraComponents + package = if (cfg.autoExtraComponents && cfg.config != null) then (cfg.package.override { inherit extraComponents; }) else cfg.package; @@ -110,7 +110,9 @@ in { ''; description = '' Home Assistant package to use. - Override <literal>extraPackages</literal> in order to add additional dependencies. + Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies. + If you specify <option>config</option> and do not set <option>autoExtraComponents</option> + to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect. ''; }; diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index a418839d22b..b94b4026fd9 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -131,6 +131,9 @@ in Configuration of this OpenVPN instance. See <citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry> for details. + + To import an external config file, use the following definition: + <literal>config = "config /path/to/config.ovpn"</literal> ''; }; diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix deleted file mode 100644 index 5ff1796e92a..00000000000 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ /dev/null @@ -1,261 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - cfg = config.services.lighttpd.inginious; - inginious = pkgs.inginious; - execName = "inginious-${if cfg.useLTI then "lti" else "webapp"}"; - - inginiousConfigFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "inginious.yaml" '' - # Backend; can be: - # - "local" (run containers on the same machine) - # - "remote" (connect to distant docker daemon and auto start agents) (choose this if you use boot2docker) - # - "remote_manual" (connect to distant and manually installed agents) - backend: "${cfg.backendType}" - - ## TODO (maybe): Add an option for the "remote" backend in this NixOS module. - # List of remote docker daemon to which the backend will try - # to connect (backend: remote only) - #docker_daemons: - # - # Host of the docker daemon *from the webapp* - # remote_host: "some.remote.server" - # # Port of the distant docker daemon *from the webapp* - # remote_docker_port: "2375" - # # A mandatory port used by the backend and the agent that will be automatically started. - # # Needs to be available on the remote host, and to be open in the firewall. - # remote_agent_port: "63456" - # # Does the remote docker requires tls? Defaults to false. - # # Parameter can be set to true or path to the certificates - # #use_tls: false - # # Link to the docker daemon *from the host that runs the docker daemon*. Defaults to: - # #local_location: "unix:///var/run/docker.sock" - # # Path to the cgroups "mount" *from the host that runs the docker daemon*. Defaults to: - # #cgroups_location: "/sys/fs/cgroup" - # # Name that will be used to reference the agent - # #"agent_name": "inginious-agent" - - # List of remote agents to which the backend will try - # to connect (backend: remote_manual only) - # Example: - #agents: - # - host: "192.168.59.103" - # port: 5001 - agents: - ${lib.concatMapStrings (agent: - " - host: \"${agent.host}\"\n" + - " port: ${agent.port}\n" - ) cfg.remoteAgents} - - # Location of the task directory - tasks_directory: "${cfg.tasksDirectory}" - - # Super admins: list of user names that can do everything in the backend - superadmins: - ${lib.concatMapStrings (x: " - \"${x}\"\n") cfg.superadmins} - - # Aliases for containers - # Only containers listed here can be used by tasks - containers: - ${lib.concatStrings (lib.mapAttrsToList (name: fullname: - " ${name}: \"${fullname}\"\n" - ) cfg.containers)} - - # Use single minified javascript file (production) or multiple files (dev) ? - use_minified_js: true - - ## TODO (maybe): Add NixOS options for these parameters. - - # MongoDB options - #mongo_opt: - # host: localhost - # database: INGInious - - # Disable INGInious? - #maintenance: false - - #smtp: - # sendername: 'INGInious <no-reply@inginious.org>' - # host: 'smtp.gmail.com' - # port: 587 - # username: 'configme@gmail.com' - # password: 'secret' - # starttls: True - - ## NixOS extra config - - ${cfg.extraConfig} - ''; -in -{ - options.services.lighttpd.inginious = { - enable = mkEnableOption "INGInious, an automated code testing and grading system."; - - configFile = mkOption { - type = types.nullOr types.path; - default = null; - example = literalExample ''pkgs.writeText "configuration.yaml" "# custom config options ...";''; - description = ''The path to an INGInious configuration file.''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - example = '' - # Load the dummy auth plugin. - plugins: - - plugin_module: inginious.frontend.webapp.plugins.auth.demo_auth - users: - # register the user "test" with the password "someverycomplexpassword" - test: someverycomplexpassword - ''; - description = ''Extra option in YaML format, to be appended to the config file.''; - }; - - tasksDirectory = mkOption { - type = types.path; - example = "/var/lib/INGInious/tasks"; - description = '' - Path to the tasks folder. - Defaults to the provided test tasks folder (readonly). - ''; - }; - - useLTI = mkOption { - type = types.bool; - default = false; - description = ''Whether to start the LTI frontend in place of the webapp.''; - }; - - superadmins = mkOption { - type = types.uniq (types.listOf types.str); - default = [ "admin" ]; - example = [ "john" "pepe" "emilia" ]; - description = ''List of user logins allowed to administrate the whole server.''; - }; - - containers = mkOption { - type = types.attrsOf types.str; - default = { - default = "ingi/inginious-c-default"; - }; - example = { - default = "ingi/inginious-c-default"; - sekexe = "ingi/inginious-c-sekexe"; - java = "ingi/inginious-c-java"; - oz = "ingi/inginious-c-oz"; - pythia1compat = "ingi/inginious-c-pythia1compat"; - }; - description = '' - An attrset describing the required containers - These containers will be available in INGInious using their short name (key) - and will be automatically downloaded before INGInious starts. - ''; - }; - - hostPattern = mkOption { - type = types.str; - default = "^inginious."; - example = "^inginious.mydomain.xyz$"; - description = '' - The domain that serves INGInious. - INGInious uses absolute paths which makes it difficult to relocate in its own subdir. - The default configuration will serve INGInious when the server is accessed with a hostname starting with "inginious.". - If left blank, INGInious will take the precedence over all the other lighttpd sites, which is probably not what you want. - ''; - }; - - backendType = mkOption { - type = types.enum [ "local" "remote_manual" ]; # TODO: support backend "remote" - default = "local"; - description = '' - Select how INGINious accesses to grading containers. - The default "local" option ensures that Docker is started and provisioned. - Fore more information, see http://inginious.readthedocs.io/en/latest/install_doc/config_reference.html - Not all backends are supported. Use services.inginious.configFile for full flexibility. - ''; - }; - - remoteAgents = mkOption { - type = types.listOf (types.attrsOf types.str); - default = []; - example = [ { host = "192.0.2.25"; port = "1345"; } ]; - description = ''A list of remote agents, used only when services.inginious.backendType is "remote_manual".''; - }; - }; - - config = mkIf cfg.enable ( - mkMerge [ - # For a local install, we need docker. - (mkIf (cfg.backendType == "local") { - virtualisation.docker = { - enable = true; - # We need docker to listen on port 2375. - listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"]; - storageDriver = mkDefault "overlay"; - }; - - users.users."lighttpd".extraGroups = [ "docker" ]; - - # Ensure that docker has pulled the required images. - systemd.services.inginious-prefetch = { - script = let - images = lib.unique ( - [ "centos" "ingi/inginious-agent" ] - ++ lib.mapAttrsToList (_: image: image) cfg.containers - ); - in lib.concatMapStrings (image: '' - ${pkgs.docker}/bin/docker pull ${image} - '') images; - - serviceConfig.Type = "oneshot"; - wants = [ "docker.service" ]; - after = [ "docker.service" ]; - wantedBy = [ "lighttpd.service" ]; - before = [ "lighttpd.service" ]; - }; - }) - - # Common - { - services.lighttpd.inginious.tasksDirectory = mkDefault "${inginious}/lib/python2.7/site-packages/inginious/tasks"; - # To access inginous tools (like inginious-test-task) - environment.systemPackages = [ inginious ]; - - services.mongodb.enable = true; - - services.lighttpd.enable = true; - services.lighttpd.enableModules = [ "mod_access" "mod_alias" "mod_fastcgi" "mod_redirect" "mod_rewrite" ]; - services.lighttpd.extraConfig = '' - $HTTP["host"] =~ "${cfg.hostPattern}" { - fastcgi.server = ( "/${execName}" => - (( - "socket" => "/run/lighttpd/inginious-fastcgi.socket", - "bin-path" => "${inginious}/bin/${execName} --config=${inginiousConfigFile}", - "max-procs" => 1, - "bin-environment" => ( "REAL_SCRIPT_NAME" => "" ), - "check-local" => "disable" - )) - ) - url.rewrite-once = ( - "^/.well-known/.*" => "$0", - "^/static/.*" => "$0", - "^/.*$" => "/${execName}$0", - "^/favicon.ico$" => "/static/common/favicon.ico", - ) - alias.url += ( - "/static/webapp/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/webapp/static/", - "/static/common/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/common/static/" - ) - } - ''; - - systemd.services.lighttpd.preStart = '' - mkdir -p /run/lighttpd - chown lighttpd.lighttpd /run/lighttpd - ''; - - systemd.services.lighttpd.wants = [ "mongodb.service" "docker.service" ]; - systemd.services.lighttpd.after = [ "mongodb.service" "docker.service" ]; - } - ]); -} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 59226484bd8..96230940e87 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -234,7 +234,7 @@ let libxml2.bin libxslt.bin docbook5 - docbook5_xsl + docbook_xsl_ns unionfs-fuse ntp nixos-artwork.wallpapers.gnome-dark diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index a16593d4d1b..8f3facec09b 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper -, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain +, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain , gtk3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/flacon \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ - --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools + --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools mp3gain lame wavpack vorbisgain ]}" ''; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6e1e576043d..1ad57efda7a 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeWrapper -, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }: +, bc, dbus, gawk, gnused, libnotify, pulseaudio }: let - path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ]; + path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ]; pname = "pulseaudio-ctl"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix index 9bed504103a..529b0dbd42b 100644 --- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix +++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, - procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, - fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, - libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, +{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, + procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, + fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev, + libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages, maxRam ? "1024m" }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "1512021600670_4503"; pname = "CrashPlanSmb"; name = "${pname}_${version}_${rev}"; - + src = fetchurl { url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vardir = "/var/lib/crashplan"; manifestdir = "${vardir}/manifest"; - + postPatch = '' # patch scripts/CrashPlanEngine substituteInPlace scripts/CrashPlanEngine \ @@ -85,10 +85,10 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan - wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ - stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype - fontconfig dbus gconf nss nspr alsaLib cups expat libudev - libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite + wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype + fontconfig dbus gconf nss nspr alsaLib cups expat udev + libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libXtst libXScrnSaver]}" ''; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 6765c5f9dfd..6ba053499f9 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils +, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils , qt4 ? null , withQt5 ? false, qtbase }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt - qt4 libaudit + qt4 audit ] ++ optional withQt5 qtbase; configureFlags = [ diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 5160e02963f..12e3dad9c79 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng -, fontconfig, freetype, pam, dbus_libs, makeWrapper }: +, fontconfig, freetype, pam, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "slim-1.3.6"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig libjpeg libpng fontconfig freetype - pam dbus_libs + pam dbus xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper ]; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 142e9b78994..8139640457e 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -61,8 +61,8 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.28.1"; - sha256 = "03phnbsc45i0r799ni9br7s4qjy05fczbca64jd0sr4jhzi7qmlx"; + version = "1.28.2"; + sha256 = "07lz4lj07dbfz952l3q9vplvg41pxl1cx89gzy8bzzr3ay7kn6za"; }; atom-beta = { diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index c24866671f9..6f5f416f4f5 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, - coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: + coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: with stdenv.lib; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ - dbus_libs + dbus openssl libxml2 gnome3.gtksourceview diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 790c4ea45c0..7ba37bd14ff 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}: +{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qt5.qmake pkgconfig ]; - buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ]; + buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index d79a50855f3..cf58d5d2190 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.25.0"; + version = "1.25.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1dgn9swqax54pn5ykk97zdkkzyj46jambmnkb67cn44p29bw9s9m"; - "x86_64-linux" = "0w2lzif7iilibvwhvg13gxarwz41qsb72s8hvj87mk5iqfdms1px"; - "x86_64-darwin" = "08xhwvggflzh9lfc5s3jgrqb49yz4jdfii8sfq6v8w3c6yy8cdly"; + "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg"; + "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq"; + "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index d817424c452..30101bb9477 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, - dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, + dbus, alsaLib, cups, fontconfig, glib, icu, libpng12, xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: @@ -71,7 +71,7 @@ stdenv.mkDerivation { }; libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils - dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 + dbus alsaLib cups.lib fontconfig glib icu libpng12 xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcomposite ]; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 34e7b1f2308..562fb8c11dc 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 8817071e984..4b3a423a8ce 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: +{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }: # Warning: You will also need a working pdflatex installation containing # at least auctex and pgf. @@ -64,8 +64,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext qt5.full poppler_qt5 ]; + buildInputs = [ gettext qt5.full poppler ]; enableParallelBuilding = true; } - diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index e5385c75280..1d9956245a6 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.4.1"; + version = "5.5.2"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74"; + sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; fetchSubmodules = true; }; @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { "-DPARAVIEW_ENABLE_PYTHON=ON" "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + "-DOpenGL_GL_PREFERENCE=GLVND" ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by # default. preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; enableParallelBuilding = true; diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 5035685c64f..bb8a97e8341 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -1,7 +1,7 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, + grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase + grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase ]; - propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ]; + propagatedBuildInputs = [ grantlee kiconthemes knewstuff ]; } diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 3f6821e08ea..1628af7e220 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, + grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support, kidentitymanagement, kpimtextedit, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support + grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support kidentitymanagement kpimtextedit ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index fd3fe2d6c09..5be3d881b0c 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -4,7 +4,7 @@ akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, - libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison + libksieve, mailcommon, mailimporter, messagelib, poppler, prison }: mkDerivation { @@ -18,6 +18,6 @@ mkDerivation { akonadi-import-wizard akonadi-notes calendarsupport eventviews incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar - libksieve mailcommon mailimporter messagelib poppler_qt5 prison + libksieve mailcommon mailimporter messagelib poppler prison ]; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 17c960d1762..05d174b0554 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, + grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin + grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin sonnet syntax-highlighting qttools ]; propagatedBuildInputs = [ ktextwidgets ]; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index f12158a1f71..23920a081c0 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5, + akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, @@ -16,7 +16,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs + akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit syntax-highlighting diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 33b16e3242c..4d997519246 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , jsoncpp -, libjson_rpc_cpp +, libjson-rpc-cpp , curl , boost , leveldb @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake jsoncpp - libjson_rpc_cpp + libjson-rpc-cpp curl boost leveldb diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 144e1fa566c..daea20835c8 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: +{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: stdenv.mkDerivation rec { version = "2.1.3"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase poppler_qt5 ]; + buildInputs = [ qtbase poppler ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 09b6db3abf9..3e6a6ab53f7 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -7,7 +7,7 @@ , libevent , libtool , libqrencode -, libudev +, udev , libusb , makeWrapper , pkgconfig @@ -67,12 +67,12 @@ in stdenv.mkDerivation rec { qttools ]; - buildInputs = with stdenv.lib; [ + buildInputs = [ # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio. libcap libevent libtool - libudev + udev libusb libqrencode diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 65b85868bc5..a70506f7aaa 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 0a2a051223a..b16507c8b7b 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte -, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: let version = "0.3.1"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf intltool pkgconfig - libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs + libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; buildInputs = [ gtk3 vte ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 56cbb338a40..7d48b61793c 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, ag, tree, man, stdenv, +{ fetchFromGitHub, silver-searcher, tree, man, stdenv, pandocSupport ? true, pandoc ? null , ... }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} substituteInPlace memo \ - --replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \ + --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 42f1b58061e..5aaaa7a0e37 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, perl -, alsaLib, libevdev, libopus, libudev, SDL2 +, alsaLib, libevdev, libopus, udev, SDL2 , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - alsaLib libevdev libopus libudev SDL2 + alsaLib libevdev libopus udev SDL2 ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid ]; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 4ac152c2669..12f8c12b586 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: +{ stdenv, mkDerivation, fetchFromGitHub, boost +, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { name = "nixnote2-${version}"; @@ -11,7 +12,7 @@ mkDerivation rec { sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; }; - buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; enableParallelBuilding = true; @@ -28,7 +29,7 @@ mkDerivation rec { substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' ''; - + postInstal = '' cp images/windowIcon.png $out/share/pixmaps/nixnote2.png ''; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index de64705d832..78105ea535d 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -16,7 +16,7 @@ , intltool , isocodes , libcanberra-gtk3 -, libudev +, udev , libxkbcommon , pkgconfig , procps @@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec { hunspell isocodes libcanberra-gtk3 - libudev + udev libxkbcommon wrapGAppsHook xorg.libXtst diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 58e80e7f726..e1cc70e4277 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, x11 }: +{ stdenv, fetchurl, xorg, xlibsWrapper }: stdenv.mkDerivation rec { version = "1.2.sakura.5"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; }; - buildInputs = [ xorg.imake xorg.gccmakedep x11 ]; - + buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ]; + configurePhase = "xmkmf"; installPhase = '' @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index f836ce5b808..dfaa90d43ad 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -12,7 +12,7 @@ let }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 1d0c7d28de6..3ef5a6c4e34 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext +{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , pkgconfig, python, pythonPackages, vte @@ -22,13 +22,13 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + makeWrapper python pythonPackages.lockfile dbus dbus-glib gdk_pixbuf gsettings-desktop-schemas gtk3 hicolor-icon-theme vte ]; NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; + "-I${dbus.dev}/include/dbus-1.0" + "-I${dbus.lib}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [ diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index d2a2936680f..6df81aa1172 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -2,13 +2,13 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs -, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat udev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 9df2a2dde76..48e0d19e20b 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter: $ make NOGUI=1 */ -{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper, +{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2, wxGUI ? true }: @@ -86,7 +86,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse devicemapper wxGTK nasm ]; + buildInputs = [ fuse lvm2 wxGTK nasm ]; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 1c5c4d1dcaa..bc5b19e7737 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself, +{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself, wxGUI ? true }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeself yasm pkgconfig ]; - buildInputs = [ fuse devicemapper ] + buildInputs = [ fuse lvm2 ] ++ optional wxGUI wxGTK30; makeFlags = optionalString (!wxGUI) "NOGUI=1"; diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix new file mode 100644 index 00000000000..3ba7062b7bb --- /dev/null +++ b/pkgs/applications/misc/xlog/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: +stdenv.mkDerivation rec { + name = "xlog-${version}"; + version = "2.0.15"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; + sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j"; + }; + + buildInputs = [ glib pkgconfig gtk2 hamlib ]; + + meta = with stdenv.lib; { + description = "An amateur radio logging program"; + longDescription = + '' Xlog is an amateur radio logging program. + It supports cabrillo, ADIF, trlog (format also used by tlf), + and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. + Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, + location in latitude and longitude and distance and heading in kilometers or miles, + both for short and long path. + ''; + homepage = http://www.nongnu.org/xlog; + maintainers = [ maintainers.mafo ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6a5c9d67470..570180d4c4d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -5,7 +5,7 @@ , curl , cups , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gconf @@ -93,7 +93,7 @@ stdenv.mkDerivation { curl cups dbus-glib - dbus_libs + dbus fontconfig freetype gconf diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 62fd4f533ea..584dca63297 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration -, libudev +, udev , kerberos }: @@ -66,7 +66,7 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = [ libudev ] + libs = lib.optional stdenv.isLinux udev ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index d2d26190ce0..2df2043517a 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk +, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -52,7 +52,7 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gdk_pixbuf gcc-unwrapped.lib + dbus gdk_pixbuf gcc-unwrapped.lib systemd libexif liberation_ttf curl utillinux xdg_utils wget diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8eae85099fb..7aba25dc339 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd +, alsaLib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 7301e45a41f..4c2e1b6f4c0 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,7 +14,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.28.0"; + version = "0.28.1"; goPackagePath = "k8s.io/minikube"; @@ -22,7 +22,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1gm61w0f33mdax6im42wckfmjgdr5pziiaw2n7yj6jfjrxjnmzmf"; + sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm"; }; buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 4f45de76d16..fbcb6c8be40 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -60,7 +60,7 @@ let # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. if actualPlugins == [] then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) - else lib.appendToName "with-plugins "(stdenv.mkDerivation { + else lib.appendToName "with-plugins"(stdenv.mkDerivation { inherit (terraform) name; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index f10a88ec961..bee4c3bea20 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses -, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }: +, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }: stdenv.mkDerivation rec { name = "newsboat-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace "ncurses5.4" "ncurses" ''; - nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] + nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 681a8119ac0..820a742245e 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg +, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: stdenv.mkDerivation rec { @@ -25,13 +25,11 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath ([ stdenv.cc.cc # For libstdc++. - ] ++ lib.filter (x: x != null) [ alsaLib - dbus_libs + dbus gtk2 libpulseaudio openssl - ] ++ lib.optionals (xorg != null) [ xorg.libX11 xorg.libXext xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index e41aea497a8..af58aaa0a76 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { name = "purple-discord-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib ]; + buildInputs = [ pidgin json-glib ]; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index fcdc1610134..a8574680186 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.14.1"; + version = "1.14.3"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1f54azqdfqa2yrzlp9b7pz7nswl5n3pgln38yxcvb3y5k6x0ljqp"; + sha256 = "1z8z32d7ic28zg4mgk3cjmzb6kpism7xzym2ng25b0ndf72g1vfi"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 1ff67d02ff6..525a8a313f4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] - ++ stdenv.lib.optional doCheck dbus_daemon; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; + + checkInputs = [ dbus.daemon ]; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 3f22aa28f36..82ad57ae927 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig -, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: +, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus_libs telepathy-glib.python + dbus telepathy-glib.python ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index dec933489af..a672fa73c4f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -123,6 +123,7 @@ in if configure == null then weechat else ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/weechat "$@" '') // { + name = weechat.name; unwrapped = weechat; meta = weechat.meta; } diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 4bd0f2e73e6..0139a3f3a93 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }: +{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig qmake ]; - buildInputs = [ qtbase qtsvg boost qwt6 ]; + buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index c0f015944b0..390f68bd105 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }: +{ stdenv, fetchurl, binutils, patchelf, makeWrapper +, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype +, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: stdenv.mkDerivation rec { name = "inboxer-${version}"; @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { expat stdenv.cc.cc.lib libpulseaudio - libudev + udev ]; in '' patchelf \ @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { patchelf \ --set-rpath "$out/opt/Inboxer:${lpath}" \ $out/opt/Inboxer/libffmpeg.so - + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/Inboxer:${lpath}" \ @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" ''; - + installPhase = '' mkdir -p $out/bin cp -R usr/share opt $out/ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index bea713c9e6b..b9b553f9447 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -7,7 +7,7 @@ , cups , curl , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gdk_pixbuf @@ -86,7 +86,7 @@ stdenv.mkDerivation { cups curl dbus-glib - dbus_libs + dbus fontconfig freetype gdk_pixbuf diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 7c613a8a45a..251bef91360 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "To Do List / Time Tracker with Jira Integration."; - homepage = http://super-productivity.com; + homepage = https://super-productivity.com; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index e4bdec668a0..74ffb14f4ad 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync, - asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }: + asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { name = "lsyncd-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ rsync cmake lua pkgconfig - asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt + asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index eca3ddd32e8..e43fd59e043 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -2,7 +2,7 @@ , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp -, oceSupport ? true, opencascade_oce +, oceSupport ? true, opencascade , ngspiceSupport ? true, libngspice , scriptingSupport ? true, swig, python, wxPython }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = - optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ] + optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ] ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" ++ optionals (scriptingSupport) [ "-DKICAD_SCRIPTING=ON" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost - ] ++ optional (oceSupport) opencascade_oce + ] ++ optional (oceSupport) opencascade ++ optional (ngspiceSupport) libngspice ++ optionals (scriptingSupport) [ swig python wxPython ]; diff --git a/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch b/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch deleted file mode 100644 index b57e48b86de..00000000000 --- a/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch +++ /dev/null @@ -1,14 +0,0 @@ -reverted: ---- b/src/sage/geometry/polyhedron/backend_cdd.py -+++ a/src/sage/geometry/polyhedron/backend_cdd.py -@@ -154,7 +154,9 @@ - ... [0.62, -1.38, 0.38],[0.144, -1.04, 0.04], - ... [0.1309090909, -1.0290909091, 0.04]] - sage: Polyhedron(point_list) -+ Traceback (most recent call last): -+ ... -+ ValueError: *Error: Numerical inconsistency is found. Use the GMP exact arithmetic. -- A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 14 vertices - sage: Polyhedron(point_list, base_ring=QQ) - A 3-dimensional polyhedron in QQ^3 defined as the convex hull of 14 vertices - """ diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index d342fba2116..c97785c574c 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -156,7 +156,12 @@ stdenv.mkDerivation rec { sha256 = "0fmw7pzbaxs2dshky6iw9pr8i23p9ih2y2lw661qypdrxh5xw03k"; stripLen = 1; }) - ./patches/revert-269c1e1551285.patch + (fetchpatch { + name = "revert-cddlib-doctest-changes.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=269c1e1551285566b8ba7a2b890989e5590e9f11"; + sha256 = "12bcjhq7hm2pmmj2bgjvcffjyls2x7q61ivlnaj5v5bsvhc183iy"; + revert = true; + }) # Only formatting changes. diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 1d933d56948..babd87eb2b1 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -5,7 +5,8 @@ , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them - , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11 + , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4 + , xlibsWrapper , withIgnitionTransport ? true , libav, withLibAvSupport ? true , openal, withAudioSupport ? false @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { # TODO: add these hidden deps to cmake configuration & submit upstream curl tinyxml - x11 + xlibsWrapper qt4 ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h ++ optional withDocs doxygen diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index ed207a1e7d9..1a5ce6e369e 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, makeWrapper, flex, bison, - asciidoc, docbook_xml_dtd_45, docbook_xml_xslt, + asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt, python27, rcs, cvs, git, coreutils, rsync}: @@ -21,7 +21,7 @@ mkDerivation rec { }; buildInputs = [ - flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt + flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt python27 rcs cvs git makeWrapper ]; @@ -29,7 +29,7 @@ mkDerivation rec { preBuild = '' makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" LIBS="" prefix="$out" ) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index a6efb8d339e..284a1cc649a 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xml_xslt, pkgconfig, luajit +, docbook_xsl, pkgconfig, luajit , gzip, bzip2, xz , python, wrapPython, pygments, markdown }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit + openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; pythonPath = [ pygments markdown ]; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 238d527ce38..84b6633b883 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git -, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto +, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto , bazaar ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null, src ? null , subversion ? null, cvs_fast_export ? null }: @@ -24,16 +24,16 @@ in mkDerivation rec { }; # See https://gitlab.com/esr/reposurgeon/issues/17 - patches = [ ./fix-preserve-type.patch ]; + patches = [ ./fix-preserve-type.patch ]; buildInputs = - [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++ + [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++ optional (cython != null) cython ; preBuild = '' makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" prefix="$out" pyinclude="-I${python}/include/python2.7" pylib="-L${python}/lib -lpython2.7" @@ -64,5 +64,5 @@ in mkDerivation rec { --prefix PYTHONPATH : "${pythonpath}" done '' - ; + ; } diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index f89aa04e014..f73c5277d05 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -6,7 +6,7 @@ , cdrtools, dvdauthor, dvdplusrwtools , dvdisasterSupport ? true, dvdisaster ? null , thumbnailSupport ? true, libgnomeui ? null -, udevSupport ? true, libudev ? null +, udevSupport ? true, udev ? null , dbusSupport ? true, dbus ? null , makeWrapper }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; }; - nativeBuildInputs = + nativeBuildInputs = [ pkgconfig ]; packagesToBinPath = @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { docbook5 zip makeWrapper ] ++ packagesToBinPath ++ optionals dvdisasterSupport [ dvdisaster ] - ++ optionals udevSupport [ libudev ] + ++ optionals udevSupport [ udev ] ++ optionals dbusSupport [ dbus ] ++ optionals thumbnailSupport [ libgnomeui ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 64119d2dfc5..776d2732327 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -19,7 +19,7 @@ , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp , libplist, p11-kit, zlib -, dbusSupport ? true, dbus_libs ? null +, dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null , pulseSupport ? true, libpulseaudio ? null @@ -30,7 +30,7 @@ , vdpauSupport ? true, libvdpau ? null }: -assert dbusSupport -> dbus_libs != null; +assert dbusSupport -> dbus != null; assert nfsSupport -> libnfs != null; assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; @@ -139,7 +139,7 @@ in stdenv.mkDerivation rec { ffmpeg # libdvdcss libdvdnav libdvdread ] - ++ lib.optional dbusSupport dbus_libs + ++ lib.optional dbusSupport dbus ++ lib.optionals joystickSupport [ cwiid ] ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 61e3a7d895d..cefd5b66aed 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -38,9 +38,6 @@ , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null - -# scripts you want to be loaded by default -, scripts ? [] }: with stdenv.lib; @@ -180,7 +177,6 @@ in stdenv.mkDerivation rec { ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ - --add-flags "--scripts=${concatStringsSep "," scripts}" \ --prefix LUA_PATH : "${luaPath}" \ --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix new file mode 100644 index 00000000000..e98ba9bdc3f --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, gobjectIntrospection, mpv }: + +stdenv.mkDerivation rec { + name = "mpv-mpris-${version}.so"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "hoyon"; + repo = "mpv-mpris"; + rev = "v${version}"; + sha256 = "0rsbrbv5q7vki59wdlx4cdkd0vvd79qgbjvdb3fn3li7aznvjwiy"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ gobjectIntrospection mpv ]; + + installPhase = '' + cp mpris.so $out + ''; + + meta = with stdenv.lib; { + description = "MPRIS plugin for mpv"; + homepage = https://github.com/hoyon/mpv-mpris; + license = licenses.mit; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix new file mode 100644 index 00000000000..624c06414fd --- /dev/null +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -0,0 +1,14 @@ +{ stdenv, symlinkJoin, makeWrapper, mpv, scripts ? [] }: + +symlinkJoin { + name = "mpv-with-scripts-${mpv.version}"; + + paths = [ mpv ]; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/mpv \ + --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=" + x) scripts}" + ''; +} diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 5638fad39e5..6042f490dfa 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -10,7 +10,7 @@ , libXtst , wrapGAppsHook , defaultIconTheme -, hicolor_icon_theme +, hicolor-icon-theme }: buildPythonApplication rec { pname = "screenkey"; @@ -40,7 +40,7 @@ buildPythonApplication rec { buildInputs = [ defaultIconTheme - hicolor_icon_theme + hicolor-icon-theme ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index d9bc2ed18b1..6fedc227e44 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -6,7 +6,7 @@ , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz -, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus +, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , onlyLibVLC ? false , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive - libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full + libkate libtiger libv4l samba liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 fluidsynth wayland wayland-protocols diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1a2c850f156..6e40f9ba076 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, bridge-utils, devicemapper, systemd +, sqlite, iproute, bridge-utils, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps, libseccomp }: @@ -66,7 +66,7 @@ rec { DOCKER_BUILDTAGS = [] ++ optional (systemd != null) [ "journald" ] ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper" + ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; }) // rec { @@ -88,7 +88,7 @@ rec { buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ - sqlite devicemapper btrfs-progs systemd libseccomp + sqlite lvm2 btrfs-progs systemd libseccomp ]; dontStrip = true; @@ -197,27 +197,15 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* - docker_18_03 = dockerGen rec { - version = "18.03.1-ce"; - rev = "9ee9f402cd1eba817c5591a64f1d770c87c421a4"; # git commit - sha256 = "1jm3jmcbkvvy3s8pi3xcpir6mwxjfbad46lbif4bnpjfd2r5irrx"; - runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; - runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; - containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; - containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; - }; - - docker_18_05 = dockerGen rec { - version = "18.05.0-ce"; - rev = "f150324782643a5268a04e7d1a675587125da20e"; # git commit - sha256 = "0vgh03qwlfm25sm3yaa6vf5ap2ag575f814ccgcrp5zlcal13r0z"; - runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; - runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; - containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; - containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + docker_18_06 = dockerGen rec { + version = "18.06.0-ce"; + rev = "0ffa8257ec673ed6849b73b03fb01b0cac90fdb3"; # git commit + sha256 = "1w6jgqbc53pkgfkf2p6z5g316q1r5jvnw4lq11j4qdkw7vy8q5d9"; + runcRev = "69663f0bd4b60df09991c08812a60108003fa340"; + runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq"; + containerdRev = "d64c661f1d51c48782c9cec8fda7604785f93587"; + containerdSha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria"; + tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; + tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index bb6209ce47f..64704f73e7b 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -1,5 +1,5 @@ { stdenv, callPackage, fetchurl, fetchpatch, fetchgit -, ocamlPackages_4_02 +, ocaml-ng , withInternalQemu ? true , withInternalTraditionalQemu ? true , withInternalSeabios ? true @@ -258,4 +258,4 @@ callPackage (import ./generic.nix (rec { else throw "this xen has no qemu builtin"; }; -})) ({ ocamlPackages = ocamlPackages_4_02; } // args) +})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 20deb2c2404..46a86da1d66 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -2,7 +2,7 @@ , libjpeg, libtiff, libpng, freetype , fltk, gtk , libX11, libXext, libICE -, dbus, dbus_libs +, dbus }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ]; + buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; # A strange type of bug: dbus is not immediately found by pkgconfig preConfigure = '' diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index dd2559d2b15..90ae043fba3 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, - docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, + docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, libXrandr, libXrender, xwininfo }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 - docbook_xml_xslt + docbook_xsl pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 337ecdd651f..f72ef13173c 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms -, xlibs , i3ipc-glib , glib +, xorg , i3ipc-glib , glib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ]; + buildInputs = [ libxcb xcbutilkeysyms xproto xorg.libX11.dev i3ipc-glib glib.dev ]; # Makefile has no rule for 'install' installPhase = '' diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix index 46130680af4..6bf6f44d423 100644 --- a/pkgs/applications/window-managers/orbment/default.nix +++ b/pkgs/applications/window-managers/orbment/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage -, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng +, wlc, dbus, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng , libdrm, libX11 , westonLite }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ - wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 + wlc dbus wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ]; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 89e7b9dd088..50614534f8e 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig, asciidoc, libxslt, docbook_xsl -, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs +, wayland, wlc, libxkbcommon, pcre, json_c, dbus , pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs , libXdmcp , buildDocs ? true @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmake pkgconfig ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; buildInputs = [ - wayland wlc libxkbcommon pcre json_c dbus_libs + wayland wlc libxkbcommon pcre json_c dbus pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs libXdmcp ]; diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 3181914c40f..b1e0628ba92 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -3,7 +3,7 @@ let taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); in stdenv.mkDerivation { - name = "taffybar-with-packages"; + name = "taffybar-with-packages-${taffybarEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index 6f3d463adb2..bc7a5174e26 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -3,7 +3,7 @@ let xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self); in stdenv.mkDerivation { - name = "xmonad-with-packages"; + name = "xmonad-with-packages-${xmonadEnv.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index c185497e691..40a7675b7ac 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -5,11 +5,15 @@ # stripLen acts as the -p parameter when applying a patch. { lib, fetchurl, patchutils }: -{ stripLen ? 0, extraPrefix ? null, excludes ? [], ... }@args: +{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args: fetchurl ({ postFetch = '' tmpfile="$TMPDIR/${args.sha256}" + if [ ! -s "$out" ]; then + echo "error: Fetched patch file '$out' is empty!" 1>&2 + exit 1 + fi "${patchutils}/bin/lsdiff" "$out" \ | sort -u | sed -e 's/[*?]/\\&/g' \ | xargs -I{} \ @@ -21,10 +25,29 @@ fetchurl ({ --addnewprefix=b/${extraPrefix} \ ''} \ --clean "$out" > "$tmpfile" + if [ ! -s "$tmpfile" ]; then + echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2 + echo "Did you maybe fetch a HTML representation of a patch instead of a raw patch?" 1>&2 + echo "Fetched file was:" 1>&2 + cat "$out" 1>&2 + exit 1 + fi ${patchutils}/bin/filterdiff \ -p1 \ - ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \ + ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ + ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \ "$tmpfile" > "$out" - ${args.postFetch or ""} - ''; -} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "postFetch"]) + + if [ ! -s "$out" ]; then + echo "error: Filtered patch '$out$' is empty (while the original patch file was not)!" 1>&2 + echo "Check your includes and excludes." 1>&2 + echo "Normalizd patch file was:" 1>&2 + cat "$tmpfile" 1>&2 + exit 1 + fi + '' + lib.optionalString revert '' + ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" + mv "$tmpfile" "$out" + '' + (args.postFetch or ""); + meta.broken = excludes != [] && includes != []; +} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch"]) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d82a9204230..9d22fcf8be1 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3, + openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3, libsodium, postgresql, ... }: let @@ -41,10 +41,10 @@ in }; dbus = attrs: { - buildInputs = [ pkgconfig dbus_libs ]; + buildInputs = [ pkgconfig dbus ]; }; libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus_libs ]; + buildInputs = [ pkgconfig dbus ]; }; gobject-sys = attrs: { buildInputs = [ dbus-glib ]; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 9660bc3e4c7..5daf4c29601 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig , fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio -, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit +, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg -, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp +, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp , curl, libinput, systemd, mesa_noglu, writeText }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm + harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm libinput utillinux fribidi SDL2 ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 778a1cc920f..3eabca2d24d 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: +, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }: assert withGtk -> (gtk2 != null); @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] + buildInputs = [ ORBit2 dbus dbus-glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 9d71b999d11..c15f43b542a 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib -, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: +, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { name = "gnome-vfs-${minVer}.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus-glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 4da4c480266..98cfc686e97 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream +, dbus-glib, telepathy-glib, telepathy-farstream , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control , telepathy-logger, libnotify, clutter, libsoup, gnutls diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index beb40209bc8..bea40431a24 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus , telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests - buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs + buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; + "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index d3d14f555cf..4bd2dcbe13e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook , webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc -, telepathy-glib, gettext, dbus_libs, icu, glib-networking +, telepathy-glib, gettext, icu, glib-networking , libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos }: diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index d46cf489620..8f77944577e 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }: let pname = "libgnome-keyring"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib gobjectIntrospection dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; passthru = { diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index eed34ae523d..47a0238a7fd 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }: +{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }: stdenv.mkDerivation rec { name = "gnome-shell-system-monitor-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - glib_networking + glib-networking libgtop ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./paths_and_nonexisting_dirs.patch; gtop_path = "${libgtop}/lib/girepository-1.0"; - glib_net_path = "${glib_networking}/lib/girepository-1.0"; + glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index e3ff784b16f..7bc0ee37175 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit -, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: +, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; }; }; - NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit - libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; + libcanberra-gtk3 libnotify dbus-glib dbus ]; prePatch = "patchShebangs meson_post_install.sh"; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 7920c8e1f45..ed162229d9a 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -2,7 +2,7 @@ , cairo , fetchurl , base, gui -, x11 +, xlibsWrapper , freetype , pkgconfig , libXmu @@ -17,7 +17,7 @@ gsmakeDerivation { sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo base gui freetype x11 libXmu ]; + buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 7563e344750..00ebfd8a725 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, - qttools, poppler_qt5, wrapGAppsHook + qttools, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras - poppler_qt5 + poppler fluxbox xscreensaver desktop-file-utils diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index e1825d21ca7..21705b0fb5e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, - xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }: + xfce, libwnck3, libdbusmenu, gobjectIntrospection }: stdenv.mkDerivation rec { name = "xfce4-vala-panel-appmenu-plugin-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf - libwnck3 libdbusmenu-glib gobjectIntrospection ]; + libwnck3 libdbusmenu gobjectIntrospection ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix index 1ff1153d727..1096996ee6d 100644 --- a/pkgs/desktops/xfce4-13/exo/default.nix +++ b/pkgs/desktops/xfce4-13/exo/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3 +{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation rec { @@ -14,7 +14,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/reference/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; meta = { diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix index 31e1101c5e2..dbeb80ac9bd 100644 --- a/pkgs/desktops/xfce4-13/thunar/default.nix +++ b/pkgs/desktops/xfce4-13/thunar/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null +{ mkXfceDerivation, docbook_xsl, exo, gdk_pixbuf, gtk3, libgudev ? null , libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }: mkXfceDerivation rec { @@ -11,7 +11,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; nativeBuildInputs = [ libxslt ]; diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix index 266722c9b05..e5898687098 100644 --- a/pkgs/desktops/xfce4-13/xfburn/default.nix +++ b/pkgs/desktops/xfce4-13/xfburn/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: +{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: mkXfceDerivation rec { category = "apps"; @@ -8,7 +8,7 @@ mkXfceDerivation rec { postPatch = '' substituteInPlace docs/Makefile.am \ --replace http://docbook.sourceforge.net/release/xsl/current \ - ${docbook_xml_xslt}/share/xml/docbook-xsl + ${docbook_xsl}/share/xml/docbook-xsl ''; sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix index ab64acee050..9dedb8674dc 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }: +{ mkXfceDerivation, autoreconfHook, autoconf, automake +, glib, gtk-doc, intltool, libtool }: mkXfceDerivation rec { category = "xfce"; @@ -13,7 +14,7 @@ mkXfceDerivation rec { autoconf automake glib - gtk_doc + gtk-doc intltool libtool ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix index 96deb96e7f7..76cb22b5b5f 100644 --- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2 +{ mkXfceDerivation, automakeAddFlags, dbus-glib, gst-plugins-base, gtk2 , libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation rec { @@ -16,7 +16,7 @@ mkXfceDerivation rec { ''; buildInputs = [ - dbus_glib + dbus-glib gst-plugins-base gtk2 libICE diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index b93a13abc9c..e6e868fdf41 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -28,7 +28,7 @@ assert swingSupport -> xorg != null; let - version = "10.0.1"; + version = "10.0.2"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -51,19 +51,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; - sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; + sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre10-downloads-4417026.html"; - sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; + sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; - sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; + sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c"; } else abort "unknown package Type ${packageType}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index bdd367ef352..55faf277b15 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "171"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; - sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; - sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; - sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 901eea0f8f1..55faf277b15 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "172"; + patchVersion = "181"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; - sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; - sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; - sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; + sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; + sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; + sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; + sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c7e7cd4f4c3..c8d4000f234 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -244,19 +244,21 @@ self: super: { # base bound digit = doJailbreak super.digit; - # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat - hnix = (overrideCabal super.hnix (old: { + # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably) + # This is due to GenList having been removed from generic-random in 1.2.0.0 + # 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 ]; - broken = true; # can't cope with deriving-compat 0.5.x. - })); + }))); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -1100,4 +1102,10 @@ self: super: { unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; # dontCheck: printf double rounding behavior prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter; + + # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73 + hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch { + url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch"; + sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 86494e9323b..4e62d470506 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -442,7 +442,7 @@ self: super: builtins.intersectAttrs super { then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa else dontCheck super.fsnotify; - hidapi = addExtraLibrary super.hidapi pkgs.libudev; + hidapi = addExtraLibrary super.hidapi pkgs.udev; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; @@ -494,7 +494,7 @@ self: super: builtins.intersectAttrs super { # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; colour = dontCheck super.colour; - manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; }; + spatial-rotations = dontCheck super.spatial-rotations; LDAP = dontCheck (overrideCabal super.LDAP (drv: { librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4deadefcc4b..08672d28a1f 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -156,26 +156,17 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.1.8"; + crossVersion = "1.2"; perl-cross-src = fetchurlBoot { url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; - sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; - }; - - # https://github.com/arsv/perl-cross/issues/60 - perl-cross-gcc7-patch = fetchpatch { - url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; - sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; + sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cd perl-cross-* - patch -Np1 -i ${perl-cross-gcc7-patch} - cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ ''; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 36d1a8326e7..d002f6eb31c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -5,7 +5,7 @@ , readline, sqlite , disableDocs ? false , CoreFoundation -, gsettings_desktop_schemas +, gsettings-desktop-schemas }: let @@ -20,7 +20,7 @@ let glib gmp gtk3 - gsettings_desktop_schemas + gsettings-desktop-schemas libedit libjpeg libpng @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ] + buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; preConfigure = '' diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index a229beb5ccb..b8b55d6a874 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 -, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc -, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: +, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }: let version = "0.99.3"; @@ -28,12 +28,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection - gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper + gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ - bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xlibs.libXau + bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp + libsoup lzma ostree polkit python3 systemd xorg.libXau ]; checkInputs = [ valgrind ]; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/flatpak \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" ''; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 5796425e438..56d8cd21f84 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -3,7 +3,7 @@ , python3Packages , wrapGAppsHook , atk -, dbus_libs +, dbus , evemu , frame , gdk_pixbuf @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { [ pygobject3 ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; - buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail + buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index fafcf82258a..af0830ab704 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; + buildInputs = [ xlibsWrapper libXmu libXi ] + ++ optionals stdenv.isDarwin [ AGL ]; propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ff870f525f2..fd6e0a65abc 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -4,7 +4,8 @@ , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false +, coreutils, dbus, libxml2, tzdata, desktop-file-utils +, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 642e10ea541..75818f75692 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst_plugins_base }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }: stdenv.mkDerivation rec { name = "gupnp-dlna-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - buildInputs = [ gupnp gst_plugins_base ]; + buildInputs = [ gupnp gst-plugins-base ]; meta = { homepage = https://wiki.gnome.org/Projects/GUPnP/; diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 0a600fe8d05..68b5c08aa09 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, + extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, karchive, ki18n, qtbase, perl, perlPackages }: @@ -24,7 +24,7 @@ mkDerivation { patches = [ ./kdoctools-no-find-docbook-xml.patch ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook" ]; postFixup = '' moveToOutput "share/doc" "$dev" diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b726d9c2b42..dfe1455759a 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -21,7 +21,7 @@ assert faacSupport -> enableUnfree; let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in /* ToDo: - - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools + - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools - maybe do some more splitting into outputs */ diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index e84df0c1aed..b5402984d16 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml -, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key +, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml +, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: let @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 34ba39d799e..1342ee6773f 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -3,7 +3,7 @@ let baseName = "libdbusmenu-qt"; v = "0.9.2"; - homepage = "http://launchpad.net/${baseName}"; + homepage = "https://launchpad.net/${baseName}"; name = "${baseName}-${v}"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_DOC=OFF"; - + meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index b2a0021d53b..e7157afbaee 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, +{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; meta = { diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 1bde9336c66..1f5ee90337a 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus-glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu , gtkVersion ? "3", gtk2 ? null, gtk3 ? null , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus-glib libdbusmenu-glib + glib dbus-glib libdbusmenu python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 8168ff0edae..38ba93d4f7c 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { name = "libsass-${version}"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz"; }; - patchPhase = '' + patches = [ + # CVE-2018-11693, is in master but no release yet + (fetchpatch { + url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch"; + sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl"; + }) + ]; + + preConfigure = '' export LIBSASS_VERSION=${version} ''; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index bd54b3aa343..400a107c518 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, automake, autoconf, x11}: +{stdenv, fetchurl, automake, autoconf, xlibsWrapper}: stdenv.mkDerivation { name = "libstroke-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; - buildInputs = [ automake autoconf x11 ]; + buildInputs = [ automake autoconf xlibsWrapper ]; # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. # Also, modern automake doesn't like things and returns error code 63. But it generates the file. diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index c902a8b216a..ce8d741adf2 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/libuv/libuv/pull/1909.patch"; + url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch"; sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; }) ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index b12ed961351..02c13e413e3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, libtool, autoconf, automake -, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 3828ebcb7a7..367c4e96384 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate -, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl +, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl }: stdenv.mkDerivation rec { @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libetpan cmake icu cyrus_sasl libctemplate libuchardet glib - libtidy libxml2 libuuid openssl + html-tidy libxml2 libuuid openssl ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace " icule iculx" "" \ --replace "tidy/tidy.h" "tidy.h" \ - --replace "/usr/include/tidy" "${libtidy}/include" \ + --replace "/usr/include/tidy" "${html-tidy}/include" \ --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ --replace buffio.h tidybuffio.h diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7e7314c936d..c50fc9fb35c 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg +, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf, freefont_ttf }: @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils - alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 63060bf5553..36768acd991 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus_tools, pkgconfig +, clucene_core, fam, zlib, dbus, pkgconfig }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ]; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 24dc3667d17..d14010c857e 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus_daemon dbus-python ]; + checkInputs = [ dbus.daemon dbus-python ]; patches = [ # https://github.com/TelepathyIM/telepathy-qt/issues/25 diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 797c64729ec..e154403697f 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vulkan Header files and API registry"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4b84f696eec..e44a678194a 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: + xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: let version = "1.1.77.0"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; + buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index a672bbf52a9..2b9244ff1b1 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libX11, dbus, wayland-protocols, libdrm, mesa_noglu , libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL - libX11 libXfixes dbus_libs wayland-protocols + libX11 libXfixes dbus wayland-protocols libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 33cf5dd4af8..7acbaa260a0 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 -, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, autoconf, automake, libtool, gettext, dbus, telepathy-glib , gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; buildInputs = [ - glib sqlite dbus_libs telepathy-glib dbus-glib + glib sqlite dbus telepathy-glib dbus-glib gtk3 json-glib librdf_raptor2 python2Packages.rdflib ]; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index f207683d2b0..8f3f331fd50 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] - ++ lib.optionals doCheck [ dbus_tools pygobject3 ] + ++ lib.optionals doCheck [ dbus.out pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. ++ lib.optional (! python ? modules) ncurses; diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix new file mode 100644 index 00000000000..7f1726a2c4b --- /dev/null +++ b/pkgs/development/python-modules/graphite-api/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml +, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy +}: + +buildPythonPackage rec { + pname = "graphite-api"; + version = "1.1.3"; + + disabled = isPyPy; + + src = fetchFromGitHub { + owner = "brutasse"; + repo = "graphite-api"; + rev = version; + sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass"; + }; + + # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3 + patches = [ ./flask-caching-rebased.patch ]; + + checkPhase = "nosetests"; + + propagatedBuildInputs = [ + flask + flask-caching + cairocffi + pyparsing + pytz + pyyaml + raven + six + structlog + tzlocal + ]; + + checkInputs = [ nose mock ]; + + LD_LIBRARY_PATH = "${cairo.out}/lib"; + + meta = with lib; { + description = "Graphite-web, without the interface. Just the rendering HTTP API"; + homepage = https://github.com/brutasse/graphite-api; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch new file mode 100644 index 00000000000..2d4a2f29bc4 --- /dev/null +++ b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch @@ -0,0 +1,132 @@ +diff --git a/graphite_api/config.py b/graphite_api/config.py +index 5e1e382..dc033a8 100644 +--- a/graphite_api/config.py ++++ b/graphite_api/config.py +@@ -112,11 +112,11 @@ def configure(app): + app.cache = None + if 'cache' in config: + try: +- from flask.ext.cache import Cache ++ from flask_caching import Cache + except ImportError: + warnings.warn("'cache' is provided in the configuration but " +- "Flask-Cache is not installed. Please `pip install " +- "Flask-Cache`.") ++ "flask-caching is not installed. Please `pip " ++ "install flask-caching`.") + else: + cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60, + 'CACHE_KEY_PREFIX': 'graphite-api:'} +diff --git a/requirements.txt b/requirements.txt +index c68b446..7826b0c 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,5 +1,5 @@ + Flask +-Flask-Cache ++Flask-Caching + cairocffi + pyparsing>=1.5.7 + pytz +diff --git a/setup.py b/setup.py +index 0337cbe..df07989 100644 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ setup( + extras_require={ + 'sentry': ['raven[flask]'], + 'cyanite': ['cyanite'], +- 'cache': ['Flask-Cache'], ++ 'cache': ['Flask-Caching'], + 'statsd': ['statsd'], + }, + zip_safe=False, +diff --git a/tests/test_render.py b/tests/test_render.py +index be5609d..a0e7190 100644 +--- a/tests/test_render.py ++++ b/tests/test_render.py +@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper + from . import TestCase, WHISPER_DIR + + try: +- from flask.ext.cache import Cache ++ from flask_caching import Cache + except ImportError: + Cache = None + +diff --git a/tox.ini b/tox.ini +index 85a0abb..c820393 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -47,7 +47,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -56,7 +56,7 @@ basepython = python3.3 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:py34] +@@ -66,7 +66,7 @@ commands = + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:py35] +@@ -76,7 +76,7 @@ commands = + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + + [testenv:pyparsing1] +@@ -84,7 +84,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing==1.5.7 + mock + +@@ -93,7 +93,7 @@ basepython = pypy + deps = + {[testenv]deps} + Flask +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -102,7 +102,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask<0.9 +- Flask-Cache ++ Flask-Caching + pyparsing + mock + +@@ -111,7 +111,7 @@ basepython = python2.7 + deps = + {[testenv]deps} + Flask<0.10 +- Flask-Cache ++ Flask-Caching + pyparsing + mock + diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix new file mode 100644 index 00000000000..25c3c901a4e --- /dev/null +++ b/pkgs/development/python-modules/image-match/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, dask, scikitimage, six }: + +buildPythonPackage { + pname = "image-match"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "ascribe"; + repo = "image-match"; + rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950"; + sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + scikitimage + ]; + + # remove elasticsearch requirement due to version incompatibility + postPatch = '' + substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," "" + ''; + + # tests cannot work without elasticsearch + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ascribe/image-match; + description = "Quickly search over billions of images"; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 0be0f892d73..9aabd6d94e2 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, libmysql }: +{ stdenv, buildPythonPackage, fetchPypi, mysql }: buildPythonPackage rec { pname = "mysqlclient"; version = "1.3.12"; buildInputs = [ - libmysql + mysql.connector-c ]; # Tests need a MySQL database diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 0efb77d27b3..a747d42e418 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: +{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }: let pname = "PyQt-x11-gpl"; @@ -42,7 +42,7 @@ in buildPythonPackage { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper qt4 lndir dbus_libs ]; + buildInputs = [ makeWrapper qt4 lndir dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b669c145641..ebad81f809b 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,5 @@ { lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper -, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs +, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity }: @@ -32,7 +32,7 @@ in buildPythonPackage { nativeBuildInputs = [ pkgconfig qmake lndir ]; - buildInputs = [ dbus_libs ]; + buildInputs = [ dbus ]; propagatedBuildInputs = [ sip qtbase qtsvg qtwebkit qtwebengine @@ -53,7 +53,7 @@ in buildPythonPackage { ${python.executable} configure.py -w \ --confirm-license \ - --dbus=${dbus_libs.dev}/include/dbus-1.0 \ + --dbus=${dbus.dev}/include/dbus-1.0 \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/${python.sitePackages} \ diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix new file mode 100644 index 00000000000..c072b661cc4 --- /dev/null +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, nose +, pytest +, numpy +}: + +buildPythonPackage rec { + pname = "PyWavelets"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9"; + }; + + checkInputs = [ nose pytest ]; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy ]; + + # Somehow nosetests doesn't run the tests, so let's use pytest instead + checkPhase = '' + py.test pywt/tests + ''; + + meta = { + description = "Wavelet transform module"; + homepage = https://github.com/PyWavelets/pywt; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix new file mode 100644 index 00000000000..6ac3ab5ddb9 --- /dev/null +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, numpy +, scipy +, matplotlib +, networkx +, six +, pillow +, pywavelets +, dask +, cloudpickle +, nose +, pytest +}: + +buildPythonPackage rec { + pname = "scikit-image"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "325f75eb80fbc5371136e37f323445309ca9f65b6c6f718d0d0e2189e5de1224"; + }; + + buildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle ]; + + checkInputs = [ pytest ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "Image processing routines for SciPy"; + homepage = http://scikit-image.org; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index f8f933b96ab..79f6ddca543 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19"; }; - patches = [ ./skip-broken-test.patch ]; + patches = [ ./skip-broken-test.patch ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch new file mode 100644 index 00000000000..6b3d3266b21 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch @@ -0,0 +1,24 @@ +From 43fd87037be1c98b6afa20f179f2e2d8ef5491ba Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Fri, 20 Jul 2018 10:07:22 -0500 +Subject: [PATCH] remove test that fails w/musl (setlocale() always succeeds) + +--- + ZConfig/tests/test_datatypes.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ZConfig/tests/test_datatypes.py b/ZConfig/tests/test_datatypes.py +index 7c8d80c..addecd2 100644 +--- a/ZConfig/tests/test_datatypes.py ++++ b/ZConfig/tests/test_datatypes.py +@@ -229,7 +229,6 @@ class DatatypeTestCase(unittest.TestCase): + convert = self.types.get("locale") + # Python supports "C" even when the _locale module is not available + self.assertEqual(convert("C"), "C") +- self.assertRaises(ValueError, convert, "locale-does-not-exist") + + def test_datatype_port(self): + convert = self.types.get("port-number") +-- +2.18.0 + diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index b4e3dfa0e0f..b59a93d3732 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, runCommand, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused +{ stdenv, lib, fetchurl, runCommand, makeWrapper +, jdk, zip, unzip, bash, writeCBin, coreutils +, which, python, gnused, gnugrep, findutils # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -6,16 +8,21 @@ , libcxx, CoreFoundation, CoreServices, Foundation }: -let srcDeps = stdenv.lib.singleton ( - fetchurl { - url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"; - sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b"; - } - ); - distDir = runCommand "bazel-deps" {} '' - mkdir -p $out - for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done - ''; +let + srcDeps = stdenv.lib.singleton ( + fetchurl { + url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"; + sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b"; + } + ); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath [ bash coreutils findutils gnugrep gnused which ]; + in stdenv.mkDerivation rec { @@ -52,7 +59,7 @@ stdenv.mkDerivation rec { int main(int argc, char *argv[]) { char *path = getenv("PATH"); - char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}"; + char *pathToAppend = "${defaultShellPath}"; char *newPath; if (path != NULL) { int length = strlen(path) + 1 + strlen(pathToAppend) + 1; @@ -89,6 +96,15 @@ stdenv.mkDerivation rec { sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + + # --experimental_strict_action_env (which will soon become the + # default, see bazelbuild/bazel#2574) hardcodes the default + # action environment to a value that on NixOS at least is bogus. + # So we hardcode it to something useful. + substituteInPlace \ + src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \ + --replace /bin:/usr/bin ${defaultShellPath} + patchShebangs . ''; @@ -140,7 +156,7 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends + echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f810f97ef49..f5ca69e59c8 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.8.1"; + name = "gradle-4.9"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg"; + sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; }; }; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index b820dc997e4..2dca2b6cd42 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , go-md2man }: let @@ -26,7 +26,7 @@ in buildGoPackage rec { hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man.bin ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux libseccomp ]; + buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; # Copied from the skopeo package, doesn’t seem to make a difference? # If something related to these libs failed, uncomment these lines. diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 377791007a3..b4a35b3a21c 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -25,7 +25,7 @@ , gitMinimal , glib , gnutar -, json_glib +, json-glib , libcap , libdwarf , libsoup @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { elfutils flatpak glib - json_glib + json-glib libcap libdwarf libsoup diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix index fb91015e10c..f1c754ddff9 100644 --- a/pkgs/development/tools/haskell/leksah/default.nix +++ b/pkgs/development/tools/haskell/leksah/default.nix @@ -3,7 +3,7 @@ let leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]); in stdenv.mkDerivation { - name = "leksah"; + name = "leksah-${leksahEnv.version}"; buildInputs = [ gtk3 ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 12d3f97dfc4..29bf92d2b6e 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -4,14 +4,14 @@ let in python27Packages.buildPythonApplication rec { pname = "gdbgui"; - version = "0.11.1.2"; + version = "0.13.0.0"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7"; + sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz"; }; postPatch = '' diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 5e88384c58d..775b744f839 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -19,7 +19,7 @@ let alsaLib cups expat - libudev + udev gnome2.GConf diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 0535a11e0ce..dc157b67253 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux +, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux , go-md2man }: with stdenv.lib; @@ -28,7 +28,7 @@ buildGoPackage rec { excludedPackages = "integration"; nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; + buildInputs = [ gpgme 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 devicemapper}/include -I${getDev btrfs-progs}/include" - export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + 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" ''; postBuild = '' diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 8951f16e43c..d6d5d6d3ea6 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader, - glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-validation-layers-${version}"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ]; + buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index fbf76842c20..1487ed4e1dd 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 @@ -8,8 +8,8 @@ let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango - gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango + gtk2-x11 nspr nss stdenv.cc.cc libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index dce52d4c295..da711f59af0 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , libGLU -, x11 +, xlibsWrapper , xorg , xinput_calibrator , doxygen @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libao libpthreadstubs libGLU - x11 + xlibsWrapper xinput_calibrator xorg.libXrandr xorg.libXi diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index eed38592236..db959177eb5 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less -, x11Mode ? false, libXaw, libXext, mkfontdir +{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison +, less, makeWrapper +, x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5 }: let @@ -8,6 +9,7 @@ let else throw "Unknown platform for NetHack: ${stdenv.system}"; unixHint = if x11Mode then "linux-x11" + else if qtMode then "linux-qt4" else if stdenv.hostPlatform.isLinux then "linux" else if stdenv.hostPlatform.isDarwin then "macosx10.10" # We probably want something different for Darwin @@ -15,17 +17,27 @@ let userDir = "~/.config/nethack"; binPath = lib.makeBinPath [ coreutils less ]; -in stdenv.mkDerivation { - name = "nethack${lib.optionalString x11Mode "-x11"}-3.6.1"; +in stdenv.mkDerivation rec { + version = "3.6.1"; + name = if x11Mode then "nethack-x11-${version}" + else if qtMode then "nethack-qt-${version}" + else "nethack-${version}"; src = fetchurl { url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz"; sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b"; }; - buildInputs = [ ncurses ] ++ lib.optionals x11Mode [ libXaw libXext ]; + buildInputs = [ ncurses ] + ++ lib.optionals x11Mode [ libXaw libXext ] + ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ]; - nativeBuildInputs = [ flex bison ] ++ lib.optionals x11Mode [ mkfontdir ]; + nativeBuildInputs = [ flex bison ] + ++ lib.optionals x11Mode [ mkfontdir ] + ++ lib.optionals qtMode [ + pkgconfig mkfontdir qt5.qtbase.dev + qt5.qtmultimedia.dev makeWrapper + ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -36,6 +48,11 @@ in stdenv.mkDerivation { -e 's/^LEX *=.*/LEX = flex/' \ -i sys/unix/Makefile.utl sed \ + -e 's,^WINQT4LIB =.*,WINQT4LIB = `pkg-config Qt5Gui --libs` \\\ + `pkg-config Qt5Widgets --libs` \\\ + `pkg-config Qt5Multimedia --libs`,' \ + -i sys/unix/Makefile.src + sed \ -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux @@ -45,6 +62,12 @@ in stdenv.mkDerivation { -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ -i sys/unix/hints/macosx10.10 sed -e '/define CHDIR/d' -i include/config.h + sed \ + -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \ + -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \ + -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ + -DCOMPRESS_EXTENSION=\\".gz\\",' \ + -i sys/unix/hints/linux-qt4 ''; configurePhase = '' @@ -90,6 +113,12 @@ in stdenv.mkDerivation { EOF chmod +x $out/bin/nethack ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"} + ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"} + ''; + + postFixup = lib.optionalString qtMode '' + wrapProgram $out/bin/nethack-qt \ + --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" ''; meta = with stdenv.lib; { diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 5a8a8d244bf..63fb24dc4d7 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal +{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal , SDL2, boost, ffmpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg + cmake sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 8e24cf53c2f..e4d2da3afc2 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim }: stdenv.mkDerivation rec { - name = "foo2zjs-20171202"; + name = "foo2zjs-20180519"; src = fetchurl { url = "http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz"; - sha256 = "b63c65e8e0e7c9fd8d19b9e63f7cd85048eba01a877aac1ca13a6bfc979ea182"; + sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z"; }; buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ]; diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 590441bb6dd..31b13baf796 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libudev }: +{ stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { name = "moltengamepad-git-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ libudev ]; + buildInputs = [ udev ]; buildPhase = '' make diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 6959177b3c9..bc872bb5faa 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 , bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo , libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline -, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl +, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls , soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin @@ -36,10 +36,10 @@ in stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo - portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml + portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml qt5.qtbase ] ++ stdenv.lib.optionals stdenv.isLinux [ - bluez libudev libevdev alsaLib vulkan-loader + bluez udev libevdev alsaLib vulkan-loader ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreBluetooth cf-private OpenGL ForceFeedback IOKit ]; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 8c965e471e5..8f6e66c18c3 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL -, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis +, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis , miniupnpc, sfml, xorg, zlib }: let @@ -149,7 +149,7 @@ in with stdenv.lib.licenses; extraBuildInputs = [ cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc gettext glib gtk2 hidapi - libevdev libudev + libevdev udev ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]); }).override { cmakeFlags = [ diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0085e9280a9..8428a3b7894 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -19,8 +19,9 @@ let # TL;DR -# Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"` +# * Add your plugin to ./vim-plugin-names +# * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names +# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'x! result'"` # Note: pluginnames2nix will fetch any plugins in the file; to speed up the process, # update ./vim-plugin-names to contain only plugins which need generation # Copy the generated expression(s) into this file from the ./result file. @@ -170,11 +171,11 @@ let }; julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "julia-vim-2018-05-07"; + name = "julia-vim-2018-07-01"; src = fetchgit { url = "https://github.com/JuliaEditorSupport/julia-vim"; - rev = "3b8e8f9b03c4ffa415fb715406231efbbd1dfdd6"; - sha256 = "1dnhawb73c89x58nl0iqhn1rvyw0wrhmvfkxdsh40rnpdbjkyrcn"; + rev = "c49d4d39fa7f54387ec20b8bbf006700b1e01fe2"; + sha256 = "14wib4768vi7681iclihlj94dlqq1apkynma8n7p9nh3jfzd4d06"; }; dependencies = []; @@ -192,11 +193,11 @@ let }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-04-24"; + name = "vim-nix-2018-07-01"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d"; - sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78"; + rev = "7d71026ba7c2d0a4bdb915e884c4ac8dbdc45bf0"; + sha256 = "084vs1p0qpkc4cx049v3mkyylj1n1yvd45i1sc9qafgp4x5va457"; }; dependencies = []; @@ -412,11 +413,11 @@ let }; tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2018-03-23"; + name = "tsuquyomi-2018-07-04"; src = fetchgit { url = "https://github.com/Quramy/tsuquyomi"; - rev = "94f10d312134fc59b53b2e821d3315320f694cf0"; - sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay"; + rev = "9247e0f1ad0e1ae7d350ad5b27ef92269955cc65"; + sha256 = "09mihjiqg407n14gb4kr60fnyp3rpi18fr9nhnpg1ym2ly0nsa1l"; }; dependencies = []; @@ -444,22 +445,22 @@ let }; riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "riv-vim-2018-01-21"; + name = "riv-vim-2018-06-21"; src = fetchgit { url = "https://github.com/Rykka/riv.vim"; - rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09"; - sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j"; + rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8"; + sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-06-17"; + name = "deoplete-nvim-2018-07-19"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "62078d04aea43aceb7cbdcfc4b22cf8f7767f614"; - sha256 = "1gc6hl3yi7h2mzw2sf1phnaphwmalyfqd6lfzmzq0lzf111mq9r3"; + rev = "0f1921799644cd662cb0a3393ba71096e5e56115"; + sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2"; }; dependencies = []; @@ -488,22 +489,22 @@ let }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-06-01"; + name = "vim-gitgutter-2018-07-06"; src = fetchgit { url = "https://github.com/airblade/vim-gitgutter"; - rev = "a986ab054788776dca269d6c289b470255d54e8c"; - sha256 = "0c0rjclqz8l1w1q6dfa2sxc67ns9vvg6q7yy2l0s5p7159d423iy"; + rev = "6076c9678643a8b2fc9973f16ec9efcd5dbe1aca"; + sha256 = "1dyrll5rm61qdmzkym67hfyw80qnw10s1qrz9ryw3zvh1s2ad43l"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2018-04-07"; + name = "Spacegray-vim-2018-06-20"; src = fetchgit { url = "https://github.com/ajh17/Spacegray.vim"; - rev = "255a6086aa5af07e38e441964623029a39fa17c1"; - sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj"; + rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81"; + sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9"; }; dependencies = []; @@ -608,17 +609,6 @@ let }; - dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dhall-vim-2018-06-04"; - src = fetchgit { - url = "https://github.com/vmchale/dhall-vim"; - rev = "290c2ec86b5c3d35dd3913cbb6ab9d2139074e38"; - sha256 = "03jhcaz6r2lbd4drc8acc9kv2k0287nzvw7lyl36jjkk3qy4c499"; - }; - dependencies = []; - - }; - clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clighter8-2018-04-15"; src = fetchgit { @@ -634,11 +624,11 @@ let }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-06-02"; + name = "neomake-2018-07-16"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "ed2d2069ef7d2e919fc73c993a2c99a05d12d79e"; - sha256 = "1sf1ad8qzya8vkj8kdkkd204hs0fn7wh3ar9wv4nq1ks7v2y2855"; + rev = "f26a31a315f60150fd42682df911306b4d795dd8"; + sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w"; }; dependencies = []; @@ -678,22 +668,22 @@ let }; denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2018-06-02"; + name = "denite-extra-2018-07-19"; src = fetchgit { url = "https://github.com/chemzqm/denite-extra"; - rev = "54c2df37a2fa53e3caed4ad7391f85ff6dc7f0b1"; - sha256 = "0rsgd302h3rml98a9ddkaglp157av6yhbfbmc5i781k5pz003vvg"; + rev = "10836562703ebfe6552204e63b9b4293236d6d0f"; + sha256 = "1jq6wv6vhjpkd9xy8i6rjd0l69djvxg8395ylclr2dv21carx5z6"; }; dependencies = []; }; denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2018-06-05"; + name = "denite-git-2018-07-19"; src = fetchgit { url = "https://github.com/chemzqm/denite-git"; - rev = "dfc8c8977133b2e00efa2d5add7ff05c36b2c1a3"; - sha256 = "1p4y22wwxvhxbgavandlld2rp2204g7vr162y0vsc0dm9lygvvm6"; + rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; + sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; }; dependencies = []; @@ -722,22 +712,22 @@ let }; CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2017-03-15"; + name = "CheckAttach-2018-07-18"; src = fetchgit { url = "https://github.com/chrisbra/CheckAttach"; - rev = "b583efd45e03902438a55299623390a0f9253513"; - sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + rev = "0f1f2e78071d7f805a0a679955cb4486f692b753"; + sha256 = "11skk275ijq8hwpp0zxsdgr08brq08v1syvyawck8vzrnqrq71sc"; }; dependencies = []; }; csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-vim-2018-06-12"; + name = "csv-vim-2018-06-24"; src = fetchgit { url = "https://github.com/chrisbra/csv.vim"; - rev = "eddfe4d553d2d25ffcf294e225717ddf9ae4c357"; - sha256 = "1074x0gycwaivadsa6g7mfhdf9rvyirhsfipby2pcvjrkbzvmz7j"; + rev = "918be3bd15920fd9bc79fca5e6870b8055742a1a"; + sha256 = "01fhw55s5q23ny3n7ldg53n3raysr2wnnkpfybbba2wv55w5vpdy"; }; dependencies = []; @@ -754,23 +744,34 @@ let }; + base16-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "base16-vim-2018-05-24"; + src = fetchgit { + url = "https://github.com/chriskempson/base16-vim"; + rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d"; + sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sort-motion-2018-03-05"; + name = "vim-sort-motion-2018-07-15"; src = fetchgit { url = "https://github.com/christoomey/vim-sort-motion"; - rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4"; - sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik"; + rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; + sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; }; dependencies = []; }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2018-05-17"; + name = "vim-tmux-navigator-2018-07-13"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "d030f75e2932605cfc1417ca2ebb3fd5192c2a8e"; - sha256 = "1qfkzlg7g4ri54fhxnwwvh2xsm0hcnfxav7chdw10z3g984nzb1a"; + rev = "18b775fbccde5ff02e516c014290650bb40e257d"; + sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj"; }; dependencies = []; @@ -788,11 +789,11 @@ let }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-06-11"; + name = "ctrlp-vim-2018-06-28"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "306bc60a1bed48cee895623d03c87d84d00764b6"; - sha256 = "1ylzg9wjc1m4jgi6p3wk9nbip16cfhhgcbavly394j9w4zn3zdwy"; + rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; + sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; }; dependencies = []; @@ -876,11 +877,11 @@ let }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-05-31"; + name = "vim-2018-07-07"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "23e76f31abae2d3e090fcc25fbfcd8d8c9edd3bd"; - sha256 = "0zj749kc65dgqhsan65wagqlq45hg68m7qs07h1r12csfrr3r8x7"; + rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33"; + sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm"; }; dependencies = []; @@ -964,11 +965,11 @@ let }; elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2018-06-16"; + name = "elm-vim-2018-06-18"; src = fetchgit { url = "https://github.com/elmcast/elm-vim"; - rev = "e7c2f9ce36e69608c2f289f75e22d068255eac1f"; - sha256 = "022xan3ss4rrfhdsz9dd5n6avk4nf6lxqqbgpx9v4lrnqy01dhd8"; + rev = "e51e2e43ad617c26205a84453481d3ac152c8fec"; + sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b"; }; dependencies = []; @@ -1041,11 +1042,11 @@ let }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-06-16"; + name = "vim-go-2018-07-18"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "155836d47052ea9c9bac81ba3e937f6f22c8e384"; - sha256 = "1d16xninxwmqd6vgcjxzlqqynygb2h40lfmvwgp2cm60g2994fa3"; + rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b"; + sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk"; }; dependencies = []; @@ -1206,11 +1207,11 @@ let }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-06-11"; + name = "vim-snippets-2018-07-19"; src = fetchgit { url = "https://github.com/honza/vim-snippets"; - rev = "62f46770378ab899f40c334de264ccd64dc2db57"; - sha256 = "1g55qhy81dh9x5rkzij3k7ain561gz1amyvg69cq44n6d7pz798h"; + rev = "1143432afdb3a97b606b081700eead5b4f499d4d"; + sha256 = "1z0pgpsv8y1zhxlm6w76wgd4wx378wbq44mvgxxfxi0mfvb6vywf"; }; dependencies = []; @@ -1250,22 +1251,22 @@ let }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2018-03-12"; + name = "calendar-vim-2018-07-04"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e"; - sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs"; + rev = "f27fcf52c8a516f55ede5cff468f0a3e4014ae1b"; + sha256 = "07gg83bgj9c43jn66zlvyc1avqjyidb9cjwdv1ln3965zkl47b5r"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2018-05-19"; + name = "lightline-vim-2018-07-05"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "555f202e33987863aaa31bf4df75ef989c3c49a7"; - sha256 = "0997k1wzlclwf4y70mv5zncv6vp9xdwgp5q7nickw6j9qf86gb84"; + rev = "0532dff598abca9975d3f80128eaadadbf1d91d4"; + sha256 = "1wvhl2wc2p4vqi7zzj7wdyq0cnbfq8s7g5ifcchj8f5s8c4h4lfc"; }; dependencies = []; @@ -1315,12 +1316,23 @@ let }; + tender-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tender-vim-2017-03-14"; + src = fetchgit { + url = "https://github.com/jacoborus/tender.vim"; + rev = "6b0497a59233b3e67fb528a498069eb1d24743f9"; + sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn"; + }; + dependencies = []; + + }; + vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-05-30"; + name = "vim-test-git-2018-07-10"; src = fetchgit { url = "https://github.com/janko-m/vim-test.git"; - rev = "062c489781c995f7e81103fec8a3c07bd2ff1f4b"; - sha256 = "0q4rnaqf5c979h10pacxxn7h3zv4zs9lf7f3z90avnlarh1sjvvx"; + rev = "e24477e81e91fe90c5d914849848027cb09a7c86"; + sha256 = "1kkfzs0bmbg4kjips1jylrsd5rqd39ab2x2z1a64pjkx1fvl703b"; }; dependencies = []; @@ -1437,11 +1449,11 @@ let }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-05-28"; + name = "fzf-vim-2018-07-11"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "ce82e10630830bc37a50f706cc3b7216d24e5009"; - sha256 = "081r1a4zqcr46rb4d39m8yj2dq1kiadh7n2iv7gxaqqldhx0p8pb"; + rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109"; + sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj"; }; dependencies = []; @@ -1568,6 +1580,17 @@ let }; + swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "swift-vim-2018-04-20"; + src = fetchgit { + url = "https://github.com/keith/swift.vim"; + rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996"; + sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3"; + }; + dependencies = []; + + }; + rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "rainbow_parentheses-vim-2013-03-04"; src = fetchgit { @@ -1579,12 +1602,23 @@ let }; + fastfold = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "fastfold-2018-06-02"; + src = fetchgit { + url = "https://github.com/konfekt/fastfold"; + rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; + sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; + }; + dependencies = []; + + }; + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2018-04-04"; + name = "vim-signature-2018-07-06"; src = fetchgit { url = "https://github.com/kshenoy/vim-signature"; - rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8"; - sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72"; + rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; + sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; }; dependencies = []; @@ -1635,11 +1669,11 @@ let }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-06-17"; + name = "vimtex-2018-07-13"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "13474370fa0cc5e547abd6f40a9b6fddf2712ae4"; - sha256 = "1rwj8i5k8xaa466ld1p5nxsvfk3g20g42l2xqa60s6jmjicn7km5"; + rev = "e3dabe0a369dac556508ac5d1132979d654bc753"; + sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2"; }; dependencies = []; @@ -1679,11 +1713,11 @@ let }; rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2018-06-14"; + name = "rainbow-2018-06-19"; src = fetchgit { url = "https://github.com/luochen1990/rainbow"; - rev = "e7d115792f2a6bf6248d3f84a9025ae5e759868e"; - sha256 = "0zd7dcbrn7djx3nqnf8kkz8wzxcjla2b3bzqg2j7v9bjb3x3vdfl"; + rev = "549724c2123c5a06834676963be0d76d5c37abc1"; + sha256 = "0hh0w337qw5yk9flk4iz4vfpa4q13blvyv10hgbfrqy72s30gpdf"; }; dependencies = []; @@ -1771,11 +1805,11 @@ let }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2017-10-26"; + name = "undotree-2018-07-02"; src = fetchgit { url = "https://github.com/mbbill/undotree"; - rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; - sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; + rev = "a80159c9f5c238575b63984b8bc610bc5de6b233"; + sha256 = "10l091qbigcj053l65bs3cdnysasl7f2qdbsk8bk6k0xj7rrpgzl"; }; dependencies = []; @@ -1826,22 +1860,22 @@ let }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-05-03"; + name = "vim-signify-2018-07-08"; src = fetchgit { url = "https://github.com/mhinz/vim-signify"; - rev = "a1551dbae3b76035360b2ea2b38555194505d925"; - sha256 = "0wcfdcvbpl6hknsmzmpj86kbw1mfbfc55fza6kwad0lsw9ff5cix"; + rev = "9303070b022c4a642a8d35361e3680622c525144"; + sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-06-14"; + name = "vim-startify-2018-07-03"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "0b300f411f466f14f6832b3c97b7fb109f7b1ee3"; - sha256 = "0qjd2bnag4rr29yjkrxrzpkvfkb0912g2virj5rr26bbf8ya6s5q"; + rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde"; + sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s"; }; dependencies = []; @@ -1939,11 +1973,11 @@ let }; vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easygit-2018-05-15"; + name = "vim-easygit-2018-07-08"; src = fetchgit { url = "https://github.com/neoclide/vim-easygit"; - rev = "ada670f87f269e431b72cd7d63727683c46f3b4b"; - sha256 = "0shj52jzkhq89kw9wg4p89f1aidn9c0h6ishq56pdzzmqnjgzkdr"; + rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; + sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; }; dependencies = []; @@ -2028,11 +2062,11 @@ let }; vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-06-12"; + name = "vim-javascript-2018-07-14"; src = fetchgit { url = "https://github.com/pangloss/vim-javascript"; - rev = "935125e2c481a65d344b11ddfdb2e5f903e24e72"; - sha256 = "1n4cij2in9i4f6mcj7wn9zn9i4xmxcrf6yn00bacx4f51l6qhhkr"; + rev = "39e332a3c36c0115e1eab85c34cf121b7585869d"; + sha256 = "04ycwh298i213zw0zvj99igfmxf36swycryapsgp9jrh9jjd9hmw"; }; dependencies = []; @@ -2071,12 +2105,23 @@ let }; + awesome-vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "awesome-vim-colorschemes-2018-01-20"; + src = fetchgit { + url = "https://github.com/rafi/awesome-vim-colorschemes"; + rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d"; + sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z"; + }; + dependencies = []; + + }; + purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2018-03-31"; + name = "purescript-vim-2018-07-05"; src = fetchgit { url = "https://github.com/raichoo/purescript-vim"; - rev = "8528d2a4a84f428aefad5882212c34db5c852699"; - sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf"; + rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; + sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; }; dependencies = []; @@ -2105,22 +2150,22 @@ let }; committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "committia-vim-git-2018-04-11"; + name = "committia-vim-git-2018-07-14"; src = fetchgit { url = "https://github.com/rhysd/committia.vim.git"; - rev = "02a317cb49689b2424232d607d218511f921f2e4"; - sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5"; + rev = "6aa77b9161e75828d0be2ba40ed420cbf7a55279"; + sha256 = "0sr7wzccj805fnc48qgcshp8rypz3vb8507pkc1r3pn7wbxqkni1"; }; dependencies = []; }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-05-19"; + name = "vim-grammarous-2018-06-22"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "058db30bbd88e23fceb2f6364d9b22803d7c4c0d"; - sha256 = "1l2vhfsb0lhr5j77r8lgqnqgs9h9kdhw9bla1lj27xi0njbl4kql"; + rev = "0d8a0272389a32bd49e74bb00527c02f9aca19a8"; + sha256 = "0ji18hjhp1gx147z682b4xy1w02kqcr8rb5frccyqn4kdpqhqvbk"; }; dependencies = []; # use `:GrammarousCheck` to initialize checking @@ -2180,44 +2225,44 @@ let }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2018-01-15"; + name = "rust-vim-2018-07-17"; src = fetchgit { url = "https://github.com/rust-lang/rust.vim"; - rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6"; - sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq"; + rev = "2fa74427456a68e9e90f542567f851df50d48a8c"; + sha256 = "0vqvw5czwy3v99dv5gbgy8ljg31qhsnhqjfl0a4dfij6p66xyi46"; }; dependencies = []; }; vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2018-05-19"; + name = "vim-devicons-2018-06-21"; src = fetchgit { url = "https://github.com/ryanoasis/vim-devicons"; - rev = "8ee4c8cdef4f6ea0f27b341ac077c303d0e57a90"; - sha256 = "1mfkg9miqg42qmzamlkhjc3mlqcri69d1pj6cs4kz3bdl7326ww6"; + rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; + sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2018-06-01"; + name = "neoformat-2018-07-16"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "ebe9ed941aea254e5fc6c3e2a0219054ff873e4b"; - sha256 = "0la3nvyi8kmp8pq6pkbhjc35wg6g28f903y7bz4igsajl37nijm1"; + rev = "f20e73193f2260d4437d160759d6b623a74a5a35"; + sha256 = "0460v5h82zsgslqxkiwf2qbkah15hf3p33ddvcipfqg0rnrbwynp"; }; dependencies = []; }; nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdcommenter-2018-03-03"; + name = "nerdcommenter-2018-06-21"; src = fetchgit { url = "https://github.com/scrooloose/nerdcommenter"; - rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1"; - sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4"; + rev = "9a32fd2534427f7a1dcfe22e9c0ea6b67b6dbe78"; + sha256 = "0s862kzhvv9qpr7gxd3h52hczjvm55zyff5qn0z5095072pr3wjx"; }; dependencies = []; @@ -2235,11 +2280,11 @@ let }; syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "syntastic-2018-06-15"; + name = "syntastic-2018-07-16"; src = fetchgit { url = "https://github.com/scrooloose/syntastic"; - rev = "9e1b2a8620a0ff48a9f4e42a6e09b65a34ad2a6a"; - sha256 = "1765ish9vdm7abm7c45z4h4v1xdhfis7igm5yc3m5h7im33gl7j2"; + rev = "0dde090ed41b383b1fa56f8db49d89e0735b1ca9"; + sha256 = "027g3wmfdrhb65krlfs89xk3imbm2mgzb2ddv7xwrhch736nvb2q"; }; dependencies = []; @@ -2257,11 +2302,11 @@ let }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2018-06-05"; + name = "vim-polyglot-2018-07-08"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "33f610feb73ce782cf41a7d9a377541991c692b5"; - sha256 = "0sqsarrvy8flxlp0nj5782gzqvk3v6c7r6234pbpjwqga967h0fd"; + rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751"; + sha256 = "1q1aw0sapr2zgrxbh97g6hj22f2xym3apzfxw5xxmqzmjc0kiq4p"; }; dependencies = []; @@ -2279,11 +2324,11 @@ let }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-06-11"; + name = "denite-nvim-2018-07-19"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "ef3ffe7ffff25b0260be1e336dcd55014a6787a7"; - sha256 = "1zvin44fb9b11dciv1i14pwr3wc6yigsr4xmcg3gzaibr4mpng6b"; + rev = "0cab5543d755be4a6c9d331672b07235f8473f1f"; + sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0"; }; dependencies = []; @@ -2367,11 +2412,11 @@ let }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2018-06-17"; + name = "neosnippet-vim-2018-07-19"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "978ef36165e83ba1f8ee0a2047b6c923f7842d33"; - sha256 = "083jfdwadjdv2pwbxmwz8m384m023zvzdszjnn6qkbgwimx5ga7m"; + rev = "2959ae99f6e8f422e7d9062fd0a3cd692d2221fb"; + sha256 = "0zdyfc9lrp8g76b6qigci6dlxz0zqpqf5y9887x2zdy631dksfi4"; }; dependencies = []; @@ -2440,12 +2485,23 @@ let }; + last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "last256-2017-06-11"; + src = fetchgit { + url = "https://github.com/sk1418/last256"; + rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; + sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; + }; + dependencies = []; + + }; + alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2018-04-23"; + name = "alchemist-vim-2018-06-25"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "d15033ce1b94aa1e6ba11c1bf1249d9680b24a45"; - sha256 = "0b0r236ah56zax7s095wq18j6bvfp267a3nfrndnszihwh7h2v1j"; + rev = "5575fc8e18695b050b1c4d51623ae37f12ff7648"; + sha256 = "0s1x0avshxfrqj9vd8bahkw10sn9hmajwch285zib9aynqp5x2ma"; }; dependencies = []; @@ -2485,11 +2541,11 @@ let }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-04-17"; + name = "vim-multiple-cursors-2018-07-16"; src = fetchgit { url = "https://github.com/terryma/vim-multiple-cursors"; - rev = "b781b1461bd4b346958309e1733a9d6ad1a66b6c"; - sha256 = "0hadbp2yj0kzcwj5rp18diq3b24xgxn46n7c29dgrjg91w4vagfd"; + rev = "b9e17a51bb2d857f6a5099363232c4fc7715115d"; + sha256 = "0dd9m0a33r4diwykk5nxya199zimn0n4gmp2mi8fnwk6m1f8fwnw"; }; dependencies = []; @@ -2529,11 +2585,11 @@ let }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-05-07"; + name = "vim-quickrun-2018-06-19"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "4b493faaeb5322f11cadab52e39a53164baf9db7"; - sha256 = "0081m3v8dg4ihxsd0rzhmrra3i6vrnpz0svgjmm689rk55dkrv5i"; + rev = "825f9f195521646f7001f10cad8627c48017311f"; + sha256 = "0ckcwij5y71dxrga34jxgvf41hs44p4mrd31hbmkz1qrq1i7glpa"; }; dependencies = []; @@ -2595,44 +2651,44 @@ let }; vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-commentary-2018-05-30"; + name = "vim-commentary-2018-07-11"; src = fetchgit { url = "https://github.com/tpope/vim-commentary"; - rev = "7f2127b1dfc57811112785985b46ff2289d72334"; - sha256 = "0ck221cj0zwn19p0vlzv0vl26rjlsnfpllslrqjh5g57m5cxb8aq"; + rev = "8295187ea1210138c0b171d8e3ec3569936f4c1a"; + sha256 = "1zgbpgl0n11b4jlgx7h7rr1jbgdib7yf8vmh62cxrdj5hrngb6h6"; }; dependencies = []; }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-06-02"; + name = "vim-dispatch-2018-07-18"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "47729b7831421f20fa40a7d5b3e9b928faf18e75"; - sha256 = "0wmvfqzw785c9bda0p4vlsavm0d59dmmnhs87jvqfijzyi2prj1l"; + rev = "43760f9d8469d59fd629a97e19dce4491192cca6"; + sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2018-05-28"; + name = "vim-eunuch-2018-07-13"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "e57666aa8d3a87b42c5ec429490bbf4a54f4c31d"; - sha256 = "01sz7mhckhnwlp48rkl34cz4nkjwrkdc1rq4mbknd3yscg1w259d"; + rev = "e5f4f955d53e07192fb330ff272604c1b8290532"; + sha256 = "0cv3j3bkapb45ywlfiz8csxmz7gnsdngwgmkrgfg6sljnsgav2za"; }; dependencies = []; }; vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-06-15"; + name = "vim-fugitive-2018-07-18"; src = fetchgit { url = "https://github.com/tpope/vim-fugitive"; - rev = "d39d5ca4299569a5d1a37a511d1a5eccef71b037"; - sha256 = "1657x01ihw96hnbnflyzxc88qpyj2lm6dnl84xs1ckzw3iqsw6ki"; + rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056"; + sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz"; }; dependencies = []; @@ -2650,33 +2706,33 @@ let }; vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-repeat-2018-01-30"; + name = "vim-repeat-2018-07-02"; src = fetchgit { url = "https://github.com/tpope/vim-repeat"; - rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357"; - sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc"; + rev = "43d2678fa59d068c815d8298331c195e850ff5a7"; + sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0"; }; dependencies = []; }; vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-rhubarb-2017-06-28"; + name = "vim-rhubarb-2018-07-19"; src = fetchgit { url = "https://github.com/tpope/vim-rhubarb"; - rev = "6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a"; - sha256 = "1bmc5j9056bgdhyhvylbd93jkp1k9067mv3af6skzh0r77rx1a0g"; + rev = "186bf27e05ab8713193b1d1210cd3c79f392445a"; + sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv"; }; dependencies = []; }; vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sensible-2018-01-22"; + name = "vim-sensible-2018-07-16"; src = fetchgit { url = "https://github.com/tpope/vim-sensible"; - rev = "2d60332fa5b2b1ea346864245569df426052865a"; - sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb"; + rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525"; + sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q"; }; dependencies = []; @@ -2716,11 +2772,11 @@ let }; vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-vinegar-2018-06-06"; + name = "vim-vinegar-2018-06-20"; src = fetchgit { url = "https://github.com/tpope/vim-vinegar"; - rev = "bc2d57e2f57551171370b4458c6198041b11750c"; - sha256 = "0f0pasz9r9qqdnlcc6zj94kh4dnslydb7zfdjhdj2salqm3hnpd7"; + rev = "7b9dff85aec34a0be1a6980b2e686a5d27d70f63"; + sha256 = "033w3wsg5ijwmkq5l1d5r7l0mqfy784sbh8mbjcsx13ndl8fc2g8"; }; dependencies = []; @@ -2782,11 +2838,11 @@ let }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-06-10"; + name = "youcompleteme-2018-06-20"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "e49f817bfe7a7400efcc0b6527188ff6395f996f"; - sha256 = "19cnixx08aqirb9yw2k3glklmyna075x1d9szzpg8ml557v9qgnn"; + rev = "e1ead995c13fe20989ee3d69fd76b20c5fff5d5b"; + sha256 = "01my9m7a5m24zrh6i867fhqz42jxs0ai2pl4pra8wzvyk4ai1p5f"; }; dependencies = []; buildPhase = '' @@ -2808,11 +2864,11 @@ let }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-06-13"; + name = "vim-airline-2018-07-13"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline"; - rev = "45c9621157b5bc851804bfed57b8a504d55757b0"; - sha256 = "0g4g5fa0qy6hagic590sksa8z6xlmigdan64bya06jr9m7fd8a1a"; + rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2"; + sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw"; }; dependencies = []; @@ -2863,11 +2919,11 @@ let }; vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2018-06-02"; + name = "vim-ruby-2018-07-08"; src = fetchgit { url = "https://github.com/vim-ruby/vim-ruby"; - rev = "1e4c6fdf4450a01208911c079538e1a2ed128ec6"; - sha256 = "0xnnk0sd3z8v5hvdxy7rljvzfvdl63dqvd3kiksw4kzj7j8gcbkg"; + rev = "3e0f241b544c63d44ac925ec557ce6735b24d9cf"; + sha256 = "16ywzvb78pxinls0za1bzcds9aznsgvds8q2l4wimp4q9wrs1scs"; }; dependencies = []; @@ -3050,11 +3106,11 @@ let }; vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimoutliner-2018-04-09"; + name = "vimoutliner-2018-07-04"; src = fetchgit { url = "https://github.com/vimoutliner/vimoutliner"; - rev = "4f12628247940d98eedd594961695dc504261058"; - sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78"; + rev = "aad0a213069b8a1b5de91cca07d153fc8352c957"; + sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2"; }; dependencies = []; @@ -3071,23 +3127,34 @@ let }; + dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "dhall-vim-2018-07-15"; + src = fetchgit { + url = "https://github.com/vmchale/dhall-vim"; + rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae"; + sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw"; + }; + dependencies = []; + + }; + ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-06-17"; + name = "ale-2018-07-17"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "24fe1953110455f7f3305db2a8e5abc2aa6821af"; - sha256 = "0m47h33w73k6p0p4i8rhqpnp8jn5siyjzwyhgv5nk3ydci5y1mmy"; + rev = "5453e0e1a43302226da1d1d753e162af0231f9d3"; + sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2018-05-25"; + name = "vim-wakatime-2018-07-14"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "3d88d49551c15f6abd9fecd2480ef75f0d8cbe40"; - sha256 = "1lm4j5c67q4al1ymqnr0zlbdgql0381rl65v78vyai8vzaj98m14"; + rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; + sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; }; dependencies = []; buildInputs = [ python ]; @@ -3175,14 +3242,14 @@ let }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2018-05-20"; + name = "deoplete-go-2018-07-03"; src = fetchgit { url = "https://github.com/zchee/deoplete-go"; - rev = "977fb75b38b82528d179f1029d1852900332dedc"; - sha256 = "114ypdawgj5k2gx1ff48z7yzk14b7gc68s4ijnb1yww2qxa2g9wm"; + rev = "2d402d856d98d4a351fdcf40d837da0cf52ccdfd"; + sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -3192,22 +3259,22 @@ let }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2018-05-13"; + name = "deoplete-jedi-2018-07-10"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "45f1ac2cf44e6a0c10298e07b4d308b84e94a80d"; - sha256 = "03590rabdycbwjp0h36crb0jsavw5mln77hl107mb737rq2dgmah"; + rev = "5540e76ee3194f2eaa2df51945297cb847a1dfa8"; + sha256 = "0mqq42v4l2y0hkcs83j0cp7hxamv6gn5g8z4bccrbssgrsv61cg6"; }; dependencies = []; }; zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2018-06-10"; + name = "zig-vim-2018-07-18"; src = fetchgit { url = "https://github.com/zig-lang/zig.vim"; - rev = "e35f63823edcf1dd35fa3deb262e6eed0cac4f8c"; - sha256 = "0vr6hh4vnpi6gbr3d54xip2n6s4j5xaiiqvzpa4pl6vfnqixazq5"; + rev = "2dc38afd6af04ea563a0d0d6f61891b5c820e8fe"; + sha256 = "1nyrg87biwq6b3jk40fyjd5mlnl4pbvwsqi9095y8gjanf9a9dck"; }; dependencies = []; @@ -3263,6 +3330,7 @@ let Hoogle = vim-hoogle; ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; + maktaba = vim-maktaba; mayansmoke = mayansmoke-git; multiple-cursors = vim-multiple-cursors; necoGhc = neco-ghc; # backwards compat, added 2014-10-18 diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0137c2e6b47..188d87f9484 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -23,6 +23,7 @@ "github:chrisbra/CheckAttach" "github:chrisbra/csv.vim" "github:chrisgeo/sparkup" +"github:chriskempson/base16-vim" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" @@ -75,6 +76,7 @@ "github:itchyny/vim-cursorword" "github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" +"github:jacoborus/tender.vim" "github:janko-m/vim-test.git" "github:JazzCore/ctrlp-cmatcher" "github:jceb/vim-hier" @@ -101,7 +103,9 @@ "github:kana/vim-operator-user" "github:kana/vim-tabpagecd" "github:kchmck/vim-coffee-script" +"github:keith/swift.vim" "github:kien/rainbow_parentheses.vim" +"github:konfekt/fastfold" "github:kshenoy/vim-signature" "github:lambdalisue/vim-gista" "github:latex-box-team/latex-box" @@ -166,6 +170,7 @@ "github:python-mode/python-mode" "github:Quramy/tsuquyomi" "github:racer-rust/vim-racer" +"github:rafi/awesome-vim-colorschemes" "github:raichoo/purescript-vim" "github:reedes/vim-pencil" "github:reedes/vim-wordy" @@ -203,6 +208,7 @@ "github:shougo/vimproc.vim" "github:SirVer/ultisnips" "github:sjl/gundo.vim" +"github:sk1418/last256" "github:slashmili/alchemist.vim" "github:t9md/vim-smalls" "github:takac/vim-hardtime" diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 6828fbf6b1c..df0ef80ff4d 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, elfutils -, xorg, patchelf, openssl, libdrm, libudev +, xorg, patchelf, openssl, libdrm, udev , libxcb, libxshmfence, epoxy, perl, zlib , fetchFromGitHub, ncurses , libsOnly ? false, kernel ? null @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { depLibPath = makeLibraryPath [ stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib - xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev ncurses5 + xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils udev ncurses5 ]; installPhase = '' diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index e1da0a449c5..a09fa93cb78 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt +{ stdenv, fetchurl, fetchpatch, lvm2, json_c +, openssl, libuuid, pkgconfig, popt , enablePython ? false, python2 ? null }: assert enablePython -> python2 != null; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper json_c openssl libuuid popt ] + buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; meta = { diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index e71d36c5e48..a6f6365ae63 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper }: +{ stdenv, fetchurl, fetchpatch, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { preConfigure = "cd */"; - buildInputs = [ devicemapper ]; + buildInputs = [ lvm2 ]; meta = { description = "Old-style RAID configuration utility"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index d2eab02f675..d0a8950a508 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, libsysfs, gnutls, openssl +, sysfsutils, gnutls, openssl , libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ]; buildInputs = [ - libsysfs openssl libcap libgcrypt nettle + sysfsutils openssl libcap libgcrypt nettle ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure... diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index b1a2c0982f7..dc7c6357406 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.141"; + version = "4.4.142"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08nbz4xg43v57h0x5zw69vnjkvddl9ppi0vwzwf6yxd3ism4p3ci"; + sha256 = "0zyxlqjnxrr1a1wlg3hzk8sx77ysmy66wb34kp77iv04xr9p9kai"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index c58851bb03e..840d4cc9cf7 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,6 +1,6 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils -, libiberty, libaudit, libbfd, openssl, systemtap, numactl +, libiberty, audit, libbfd, openssl, systemtap, numactl , zlib, withGtk ? false, gtk2 ? null }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper pkgconfig python perl + flex bison libiberty audit makeWrapper pkgconfig python perl ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index ee58d8b9c05..266c94fd8c8 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://packages.ubuntu.com/source/zesty/kmod; + homepage = https://packages.ubuntu.com/source/zesty/kmod; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 45222bee6b0..1664a2afac5 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, libaudit +{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit , enablePython ? true, swig ? null, python ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex pkgconfig ]; - buildInputs = [ libsepol libselinux bzip2 libaudit ] + buildInputs = [ libsepol libselinux bzip2 audit ] ++ optionals enablePython [ swig python ]; preBuild = '' diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 8cda636e987..0f542b9e382 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, coreutils, libuuid , thin-provisioning-tools, enable_dmeventd ? false }: let @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libudev libuuid thin-provisioning-tools ]; + buildInputs = [ udev libuuid thin-provisioning-tools ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 044479c5629..b40b6125bd9 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvme-cli-${version}"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "1nl5hl5am8djwmrw1xxnd9ahp7kyzyj0yh1nxgmx43pn3d61n0vz"; + sha256 = "0pp00yzj9c398bzd7jrjhzr7q1pk7d069dnbzyq1qqssszgcj599"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 326ba444957..a5577b97b87 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod -, procps, kbd, dbus_tools }: +, procps, kbd, dbus }: let binPath = stdenv.lib.makeBinPath - [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ]; + [ coreutils gnugrep utillinux kmod procps kbd dbus ]; sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin" [ procps ]; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 0cfc266d871..de7164b2af0 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc -, ethtool, nettools, libnl, libudev, python, perl +, ethtool, nettools, libnl, udev, python, perl } : let @@ -16,7 +16,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; - buildInputs = [ libnl ethtool nettools libudev python perl ]; + buildInputs = [ libnl ethtool nettools udev python perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" @@ -37,4 +37,3 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ markuskowa ]; }; } - diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index bbc4bc7da46..99e4b09f46d 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, - pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, - libuuid, docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper, + pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, + libuuid, docbook_xsl, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson , withSudo ? false }: let - docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; + docbookFiles = "${pkgs.docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in stdenv.mkDerivation rec { name = "sssd-${version}"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba libnfsidmap doxygen python python3 popt talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos - cifs_utils glib keyutils dbus fakeroot libxslt libxml2 + cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 3dce750d255..7b421aaff3d 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl -, dbus_libs ? null, readline ? null, pcsclite ? null +, dbus, readline ? null, pcsclite ? null }: with stdenv.lib; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { CONFIG_EAP_AKA=y CONFIG_EAP_AKA_PRIME=y CONFIG_PCSC=y - '' + optionalString (dbus_libs != null) '' + '' + optionalString (dbus != null) '' CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { -I${stdenv.lib.getDev pcsclite}/include/PCSC/" ''; - buildInputs = [ openssl libnl dbus_libs readline pcsclite ]; + buildInputs = [ openssl libnl dbus readline pcsclite ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index ef99772a082..2bdd758b980 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn +{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnutls liburcu libidn + gnutls liburcu libidn2 libunistring nettle libedit libiconv lmdb libintl # without sphinx &al. for developer documentation diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 3cb0d3931db..7636dca15d8 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo +{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch # Optional Dependencies , ncurses ? null @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { }; postPatch = '' - sed '1i#include <sys/types.h>' -i src/daemon/open_console.c substituteInPlace src/prog/gpm-root.y --replace __sigemptyset sigemptyset ''; @@ -22,6 +21,22 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + patches = [ + # musl compat patches, safe everywhere + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch"; + sha256 = "1g338m6j1sba84wlqp1r6rpabj5nm6ki577hjalg46czg0lfp20h"; + }) + # Touches same code as glibc fix in postPatch above, but on the non-glibc route + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch"; + sha256 = "0hfdqm9977hd5dpzn05y0a6jbj55w1kp4hd9gyzmg9wslmxni4rg"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch"; + sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2"; + }) + ]; preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index dd076606da5..4822b5109e8 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.33"; + version = "2.4.34"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05"; + sha256 = "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix deleted file mode 100644 index fbe226d3e3d..00000000000 --- a/pkgs/servers/inginious/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ pkgs, lib, python2Packages }: -with lib; - -let - pythonPackages = python2Packages; - - docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec { - name = "docker-py-1.7.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; - }; - }); - - webpy-custom = pythonPackages.web.override { - name = "web.py-INGI"; - src = pkgs.fetchFromGitHub { - owner = "UCL-INGI"; - repo = "webpy-INGI"; - # tip of branch "ingi" - rev = "f487e78d65d6569eb70003e588d5c6ace54c384f"; - sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd"; - }; - }; - -in pythonPackages.buildPythonApplication rec { - version = "0.3a2.dev0"; - name = "inginious-${version}"; - - disabled = pythonPackages.isPy3k; - - patchPhase = '' - # transient failures - substituteInPlace inginious/backend/tests/TestRemoteAgent.py \ - --replace "test_update_task_directory" "noop" - ''; - - propagatedBuildInputs = with pythonPackages; [ - requests - cgroup-utils docker_1_7_2 docutils PyLTI mock pygments - pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib - websocket_client watchdog webpy-custom flup - ]; - - buildInputs = with pythonPackages; [ nose selenium virtual-display ]; - - /* Hydra fix exists only on github for now. - src = pkgs.fetchurl { - url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz"; - }; - */ - src = pkgs.fetchFromGitHub { - owner = "UCL-INGI"; - repo = "INGInious"; - rev = "07d111c0a3045c7cc4e464d4adb8aa28b75a6948"; - sha256 = "0kldbkc9yw1mgg5w5q5v8k2hz089c5c4rvxb5xhbagkzgm2gn230"; - }; - - # Only patch shebangs in /bin, other scripts are run within docker - # containers and will fail if patched. - dontPatchShebangs = true; - preFixup = '' - patchShebangs $prefix/bin - ''; - - meta = { - broken = true; - description = "An intelligent grader that allows secured and automated testing of code made by students"; - homepage = https://github.com/UCL-INGI/INGInious; - license = licenses.agpl3; - maintainers = with maintainers; [ layus ]; - }; -} diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 105223f31a5..2e17001abc5 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; - homepage = http://livepeer.org; + homepage = https://livepeer.org; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 8cd9287a777..bf4f36bb250 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, bison , kernel, glibc, perl }: with (import ./srcs.nix { inherit fetchurl; }); @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; inherit version src; - nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5d348c12943..c8b007b36ac 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -95,33 +95,33 @@ let in { postgresql93 = common { - version = "9.3.22"; + version = "9.3.23"; psqlSchema = "9.3"; - sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v"; + sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x"; }; postgresql94 = common { - version = "9.4.17"; + version = "9.4.18"; psqlSchema = "9.4"; - sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks"; + sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2"; }; postgresql95 = common { - version = "9.5.12"; + version = "9.5.13"; psqlSchema = "9.5"; - sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02"; + sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l"; }; postgresql96 = common { - version = "9.6.8"; + version = "9.6.9"; psqlSchema = "9.6"; - sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga"; + sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr"; }; postgresql100 = common { - version = "10.3"; + version = "10.4"; psqlSchema = "10.0"; - sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf"; + sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v"; }; } diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 2faa8ead071..b9623534140 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; - buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ]; + buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 7523bab2e8c..8bff5a2e714 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -3,7 +3,7 @@ , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama -, gst_all_1, pulseaudioLight, gobjectIntrospection +, gst_all_1, pulseaudio, gobjectIntrospection , pam }: with lib; @@ -61,7 +61,7 @@ in buildPythonApplication rec { --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]} ''; preCheck = "exit 0"; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index 6ea24ad2c6a..cc2eb50ce1f 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchbzr, x11 }: +{ stdenv, fetchbzr, xlibsWrapper }: let version = "4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ - x11 + xlibsWrapper ]; buildPhase = if stdenv.system == "x86_64-linux" then '' diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index ffc7ee192c9..5c272e3dbaf 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }: - +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }: + stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; - + src = fetchurl { url = "http://tadas.dailyda.com/software/${name}.tar.gz"; sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ]; + buildInputs = [ libusb glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; preConfigure = '' addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ''; meta = { diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 2a5250a95ac..7eca80f8400 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,6 +1,6 @@ -{ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xml_xslt + , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl , libarchive, lzma }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xml_xslt + docbook_xml_dtd_45 docbook_xsl libarchive lzma ]; preBuild = '' diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 784ca7ec4f6..20eb363b227 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -2,7 +2,7 @@ , which, git , boost, python2Packages , libxml2, zlib -, openldap, lttngUst +, openldap, lttng-ust , babeltrace, gperf , cunit, snappy , rocksdb, makeWrapper @@ -79,11 +79,11 @@ let none = [ ]; }; - ceph-python-env = python2Packages.python.withPackages (ps: [ + ceph-python-env = python2Packages.python.withPackages (ps: [ ps.sphinx ps.flask ps.argparse - ps.cython + ps.cython ps.setuptools ps.pip # Libraries needed by the python tools @@ -100,9 +100,9 @@ stdenv.mkDerivation { inherit src; - patches = [ + patches = [ # ./ceph-patch-cmake-path.patch - ./0001-kv-RocksDBStore-API-break-additional.patch + ./0001-kv-RocksDBStore-API-break-additional.patch ] ++ optionals stdenv.isLinux [ ./0002-fix-absolute-include-path.patch ]; @@ -112,10 +112,10 @@ stdenv.mkDerivation { pkgconfig which git python2Packages.wrapPython makeWrapper (ensureNewerSourcesHook { year = "1980"; }) ]; - + buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ - boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 - malloc zlib openldap lttngUst babeltrace gperf cunit + boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 + malloc zlib openldap lttng-ust babeltrace gperf cunit snappy rocksdb ] ++ optionals stdenv.isLinux [ linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs @@ -125,28 +125,28 @@ stdenv.mkDerivation { optKinetic-cpp-client ]; - + preConfigure ='' # rip off submodule that interfer with system libs rm -rf src/boost rm -rf src/rocksdb - + # require LD_LIBRARY_PATH for cython to find internal dep export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" - + # requires setuptools due to embedded in-cmake setup.py usage export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH" ''; - cmakeFlags = [ + cmakeFlags = [ "-DENABLE_GIT_VERSION=OFF" "-DWITH_SYSTEM_BOOST=ON" "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_LEVELDB=OFF" - + # enforce shared lib "-DBUILD_SHARED_LIBS=ON" - + # disable cephfs, cmake build broken for now "-DWITH_CEPHFS=OFF" "-DWITH_LIBCEPHFS=OFF" @@ -158,7 +158,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - + outputs = [ "dev" "lib" "out" "doc" ]; meta = { diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index fe713556577..8af745ed436 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { name = "convoy-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; }; - buildInputs = [devicemapper]; + buildInputs = [lvm2]; meta = with stdenv.lib; { homepage = https://github.com/rancher/convoy; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 24eec2f0dc4..b0c33212edb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt , enablePython ? true, python ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper libgcrypt libuuid popt ] + buildInputs = [ lvm2 libgcrypt libuuid popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 5ae32093e7f..217056117ea 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -18,13 +18,11 @@ let cryptsetup = import ./cryptsetup.nix { inherit stdenv fetchurl python; - inherit (pkgs) pkgconfig libgcrypt libuuid popt; - devicemapper = lvm2; + inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { - inherit stdenv fetchurl; - devicemapper = lvm2; + inherit stdenv fetchurl lvm2; }; lvm2 = import ./lvm2.nix { @@ -39,8 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) utillinux readline libuuid gettext check; - devicemapper = lvm2; + inherit (pkgs) utillinux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index defdf6702ea..a4dcb408e05 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper }: +{ stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc15"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "cd */"; - buildInputs = [ devicemapper ]; + buildInputs = [ lvm2 ]; meta = { description = "Old-style RAID configuration utility"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 04859020e36..3f43fdc0c39 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +{ stdenv, fetchurl, lvm2, libuuid, gettext, readline , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optional doCheck check; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index d563f438020..b22f7e07a46 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }: +, asciidoc, docbook_xsl, fuse, libuuid, libxslt }: stdenv.mkDerivation rec { name = "vmfs-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 43da52634e6..14972fc5e56 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, libudev, mesa_noglu }: + python27, wayland, udev, mesa_noglu }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu + libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu ]; buildPhase = '' diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index dc703cf02f7..48d40ac4965 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib +, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core - dbus libdbusmenu-glib + dbus libdbusmenu ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 0492164dfa3..85713a300ec 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -3,7 +3,7 @@ , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre , bison, flex, libpthreadstubs, libX11 -, embree2, makeWrapper, gsettings_desktop_schemas, glib +, embree2, makeWrapper, gsettings-desktop-schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gnome3.gtk + gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS gnome3.defaultIconTheme makeWrapper diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 217a85f266a..76829b6b727 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, boost -, zlib, libpng, libjpeg, libtiff, x11, SDL +, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ]; + buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ]; enableParallelBuilding = true; - + preInstall = '' mkdir "$TMP/bin" for i in chown chgrp; do diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 778a1234154..e44021bad5d 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, - glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-tools-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ]; + buildInputs = [ cmake python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index a0de144d907..7321128a6b5 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "yafaray-core-${version}"; - version = "v3.3.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; - rev = "${version}"; + rev = "v${version}"; sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6"; }; diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 33fea9705ac..33c66fb7ff2 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp, - libevdev, libudev }: + libevdev, udev }: let version = "0.1.1"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libevdev libudev libyamlcpp ]; + buildInputs = [ libevdev udev libyamlcpp ]; prePatch = '' substituteInPlace CMakeLists.txt --replace \ diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 0051be14ee7..7311b09008b 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , vala, gobjectIntrospection, intltool, python2Packages, glib , pkgconfig -, libgee, json_glib, marisa, libkkc-data +, libgee, json-glib, marisa, libkkc-data }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ marisa libkkc-data ]; enableParallelBuilding = true; - propagatedBuildInputs = [ libgee json_glib ]; + propagatedBuildInputs = [ libgee json-glib ]; postInstall = '' ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix index 0af90ae2bf2..57be1b89e46 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, substituteAll, libudev, pkgconfig, qtbase, qmake, zlib, kmod }: +{ stdenv, fetchFromGitHub, substituteAll, udev +, pkgconfig, qtbase, qmake, zlib, kmod }: stdenv.mkDerivation rec { version = "0.2.9"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libudev + udev qtbase zlib ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index f84b37d48cc..80e0cde7e54 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, fetchgit, python3Packages, docutils, help2man , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar -, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite +, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg1, gnutar +, gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , squashfsTools, tcpdump, unoconv, unzip, xxd, xz , enableBloat ? false }: +# Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "98"; + version = "99"; src = fetchgit { url = "https://anonscm.debian.org/git/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1xvalxz11jlyk9aczq5g367ldx0wfib4kpxs8f1rg7kh97r8z1rh"; + sha256 = "04a2sqv43g002b7s0crk9gnpdvf90j8j8p01b6shinxh6an8prs2"; }; patches = [ @@ -23,18 +24,24 @@ python3Packages.buildPythonApplication rec { postPatch = '' # Upstream doesn't provide a PKG-INFO file sed -i setup.py -e "/'rpm-python',/d" + + # When generating manpage, use the installed version + substituteInPlace doc/Makefile --replace "../bin" "$out/bin" ''; nativeBuildInputs = [ docutils help2man ]; + # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. + # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh + # # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip - libarchive libcaca pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz + libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ - apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick + apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv ]; diff --git a/pkgs/tools/misc/diffoscope/list-tools.sh b/pkgs/tools/misc/diffoscope/list-missing-tools.sh index 9af7f0e3889..5f4d118cfed 100755 --- a/pkgs/tools/misc/diffoscope/list-tools.sh +++ b/pkgs/tools/misc/diffoscope/list-missing-tools.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# This script lists all the optional command-line tools that diffoscope can use +# (i.e. `diffoscope --list-tools`) but are missing from the Nix expression. + diffoscope=$(nix-build --no-out-link -E 'with import ./. {}; diffoscope.override { enableBloat = true; }')/bin/diffoscope required=$($diffoscope --list-tools | \ diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 260151f5bd2..f761c1ec4c5 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fam }: +{ stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { name = "fileschanged-0.6.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; }; - buildInputs = [ fam ]; + buildInputs = [ gamin ]; patches = [./unused-variables.debian.patch]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 84c06a49f84..58c9f18ec5a 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig +, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ] + buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 2bf7e3dcf43..63a73658e0a 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper +, gettext, ncurses, libusb, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext devicemapper ] + buildInputs = [ ncurses libusb freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index decc4afde0b..141fc968a2d 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "ical2org-${version}"; - version="v.1.1.5"; + version="1.1.5"; goPackagePath = "github.com/rjhorniii/ical2org"; src = fetchFromGitHub { owner = "rjhorniii"; repo = "ical2org"; - rev = "${version}"; + rev = "v.${version}"; sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm"; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 033e93609ab..6ec9729438c 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "6"; + version = "7"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1wgmmz1gvphkz0rnjyvgn3860yzvxwackb1dwqbgjrqsqy8ba01z"; + sha256 = "11n5svxhc2781ss7v15w40ac81mchhcvkszhb2r70zry7sa15li1"; }; goPackagePath = "github.com/gokcehan/lf"; @@ -28,6 +28,10 @@ buildGoPackage rec { runHook postBuild ''; + postInstall = '' + install -D --mode=444 lf.1 $out/share/man/man1/lf.1 + ''; + meta = with stdenv.lib; { description = "A terminal file manager written in Go and heavily inspired by ranger"; longDescription = '' diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index c4a304e0d28..6211c863bd4 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -4,7 +4,7 @@ coreutils, # mktemp grub2, # grub-mount and grub-probe cryptsetup, # cryptsetup libuuid, # blkid and blockdev -libudev, # udevadm udevinfo +udev, # udevadm udevinfo ntfs3g # ntfs3g }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \ + --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 3395e028634..6649db4c48d 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2 +{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2 , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; }) - ++ stdenv.lib.optional (devicemapper == null) + ++ stdenv.lib.optional (lvm2 == null) (fetchpatch { url = https://git.savannah.gnu.org/cgit/parted.git/patch/?id=7e87ca3c531228d35e13e802d2622006138b104c; sha256 = "0i29lfg8cwj342q5s7qwqhncz2bkifj5rjc7cx6jd4zqb6ykkndj"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optionals doCheck [ check perl python2 ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; # Tests were previously failing due to Hydra running builds as uid 0. diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 52a57629cd1..563232dbe53 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 -, acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 +, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, utillinux }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt docbook_xml_dtd_45 ]; buildInputs = [ - acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2 + acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 lvm2 pam python utillinux ]; diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index 91232b4ffa7..af4b03ab700 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump; + homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index ebbe5a11b52..be14db79880 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack, fetchpatch }: +{ stdenv, fetchurl, pkgconfig, dbus, nettle +, libidn, libnetfilter_conntrack, fetchpatch }: with stdenv.lib; let @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettle libidn ] - ++ optionals stdenv.isLinux [ dbus_libs libnetfilter_conntrack ]; + ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ]; meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c7d15318698..647b7ed26da 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, - asciidoc, libxml2, libxslt, docbook_xml_xslt }: + asciidoc, libxml2, libxslt, docbook_xsl }: pythonPackages.buildPythonApplication rec { version = "7.2.1"; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ]; + nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ]; postInstall = '' diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index df5a39d6a03..b5d66bec5cc 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "nix-index-${version}"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; rev = "v${version}"; - sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5"; + sha256 = "17pms3cq3i3jan1irxgqfr3nrjy6zb21y07pwqp9v08hyrjpfqin"; }; - cargoSha256 = "0cxdrzjmqq3ywdh0f5mzkcf50hbbgd3bak4398v2ls5gy5s9fcz2"; + cargoSha256 = "0b7xwcgjds80g08sx91lqip8syb52n458si4q4xycvvsand5fa10"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl curl]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c3f1e4d8d45..07c130f1cb3 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost -, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl +, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell , hostPlatform, buildPlatform , storeDir ? "/nix/store" @@ -26,7 +26,7 @@ let nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index f392e0f50ed..da62eba63fd 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,4 +1,4 @@ -{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh +{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh # version args , src, version }: @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication { doCheck = false; postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ + make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ docdir=$out/share/doc/nixops mandir=$out/share/man mkdir -p $out/share/nix/nixops diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 3a9c81df234..9398b38cb34 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs -, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg +, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE - wrapGAppsHook ]; + wrapGAppsHook gobjectIntrospection ]; patches = [ ./makefile-mkdir.patch ]; @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.spacefrogg ]; - broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index f46e3f22ecd..84072fd2840 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 +{ stdenv, fetchurl, pkgconfig, udev, dbus, perl, python2 , IOKit ? null }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig perl python2 ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ] + buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 585e089b8af..d9e68c77d25 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite +{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus, pcsclite , wget, coreutils , perl, pcscperl, Glib, Gtk2, Pango, Cairo }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9"; }; - buildInputs = [ udev dbus_libs perl pcsclite ]; + buildInputs = [ udev dbus perl pcsclite ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 70640563aa3..6e099e5d786 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -2,16 +2,21 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.6.3"; + version = "1.7"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi"; + sha256 = "16228w0vakb515cnrk4akadh0m21abiv8rv574jarcsf7359xslj"; }; buildInputs = [ ronn ]; - checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ]; + checkInputs = with pythonPackages; [ + freezegun + pytest + pytestcov + pytest-flake8 + ]; propagatedBuildInputs = [ nix @@ -27,9 +32,7 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" ]; - postBuild = '' - make -C doc - ''; + postBuild = "make -C doc"; checkPhase = "py.test src/vulnix"; @@ -45,7 +48,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; homepage = https://github.com/flyingcircusio/vulnix; - license = licenses.bsd2; + license = licenses.bsd3; maintainers = with maintainers; [ ckauhaus plumps ]; }; } diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 27458174dc2..a8670203775 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool +, pkgconfig, dbus, dbus-glib, libxml2 }: stdenv.mkDerivation rec { name = "thermald-${version}"; @@ -12,12 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ]; + buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; preConfigure = '' - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ./autogen.sh ''; diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 5a5757bf2f2..085331ce0d5 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -8,7 +8,7 @@ , file , icu -, libgumbo +, gumbo , lzma , xapian , zimlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; + buildInputs = [ file icu gumbo lzma zimlib zlib xapian ]; setSourceRoot = '' sourceRoot=$(echo */zimwriterfs) ''; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index d5da10b5cd4..efa1471f068 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -14,7 +14,7 @@ , lilypond ? null , libxml2 ? null , docbook_xml_dtd_45 ? null -, docbook5_xsl ? null +, docbook_xsl_ns ? null , docbook_xsl ? null , fop ? null # TODO: Package this: @@ -56,7 +56,7 @@ assert enableStandardFeatures -> lilypond != null && libxml2 != null && docbook_xml_dtd_45 != null && - docbook5_xsl != null && + docbook_xsl_ns != null && docbook_xsl != null && (fop != null || !enableJava) && # TODO: Package this: @@ -238,7 +238,7 @@ stdenv.mkDerivation rec { # use it to work around an impurity in the tetex package; tetex tools # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # We can remove PATH= when those impurities are fixed. - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b653dfc7db6..b6476ca7ece 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,7 +85,6 @@ mapAliases ({ evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 - fam = gamin; # added 2018-04-25 ffadoFull = ffado; # added 2018-05-01 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 @@ -98,10 +97,8 @@ mapAliases ({ gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gettextWithExpat = gettext; # 2016-02-19 - gflags = google-gflags; # added 2018-04-25 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 - gmock = gtest; # added 2018-04-25 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 @@ -132,7 +129,6 @@ mapAliases ({ iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 inotifyTools = inotify-tools; - jack2Full = jack2; # added 2018-04-25 joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdiff3-qt5 = kdiff3; # added 2017-02-18 @@ -140,7 +136,6 @@ mapAliases ({ keepassx-community = keepassxc; # added 2017-11 keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 - kerberos = libkrb5; # added 2018-04-25 keybase-go = keybase; # added 2016-08-24 krename-qt5 = krename; # added 2017-02-18 kvm = qemu_kvm; # added 2018-04-25 @@ -158,7 +153,6 @@ mapAliases ({ libgumbo = gumbo; # added 2018-01-21 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - liblrdf = librdf; # added 2018-04-25 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 @@ -170,7 +164,6 @@ mapAliases ({ lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02 - lzma = xz; # added 2018-04-25 m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 @@ -182,7 +175,6 @@ mapAliases ({ mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 - mysql = mariadb; # added 2018-04-25 mysqlWorkbench = mysql-workbench; # added 2017-01-19 nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 @@ -198,7 +190,6 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 - openal = openalSoft; # added 2018-04-25 opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 @@ -217,9 +208,7 @@ mapAliases ({ pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 piwik = matomo; # added 2018-01-16 pltScheme = racket; # just to be sure - polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 @@ -229,7 +218,6 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 - redland = librdf_redland; # added 2018-04-25 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -261,7 +249,6 @@ mapAliases ({ spice_protocol = spice-protocol; # added 2018-02-25 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 - sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 @@ -289,7 +276,6 @@ mapAliases ({ transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 tshark = wireshark-cli; # added 2018-04-25 ucsFonts = ucs-fonts; # added 2016-07-15 - udev = systemd; # added 2018-04-25 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 vimbWrapper = vimb; # added 2015-01 @@ -306,7 +292,6 @@ mapAliases ({ xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 - yacc = bison; # added 2018-04-25 youtubeDL = youtube-dl; # added 2014-10-26 # added 2017-05-27 @@ -319,6 +304,11 @@ mapAliases ({ libva-full = libva; libva1-full = libva1; + # forceSystem should not be used directly in Nixpkgs. + # added 2018-07-16 + forceSystem = system: _: + (import self.path { localSystem = { inherit system; }; }); + inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 @@ -347,5 +337,4 @@ mapAliases ({ ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; - ocaml = ocamlPackages.ocaml; })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 013573a1a61..91d2d5aaa56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2863,6 +2863,8 @@ with pkgs; gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; + gmock = gtest; # TODO: move to aliases.nix + gbenchmark = callPackage ../development/libraries/gbenchmark {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; @@ -3393,7 +3395,7 @@ with pkgs; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg_2; - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -3728,6 +3730,7 @@ with pkgs; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; + lzma = xz; # TODO: move to aliases.nix lz4 = callPackage ../tools/compression/lz4 { }; @@ -4034,7 +4037,7 @@ with pkgs; netboot = callPackage ../tools/networking/netboot {}; - netcat = netcat-openbsd; + netcat = libressl.nc; netcat-gnu = callPackage ../tools/networking/netcat { }; @@ -4717,7 +4720,7 @@ with pkgs; qshowdiff = callPackage ../tools/text/qshowdiff { }; - qtikz = callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; quicktun = callPackage ../tools/networking/quicktun { }; @@ -5069,7 +5072,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; + sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; }; skydns = callPackage ../servers/skydns { }; @@ -5173,6 +5176,7 @@ with pkgs; srcml = callPackage ../applications/version-management/srcml { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshfs = sshfs-fuse; # added 2017-08-14 sshlatex = callPackage ../tools/typesetting/sshlatex { }; @@ -5343,7 +5347,7 @@ with pkgs; texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; - texstudio = callPackage ../applications/editors/texstudio { }; + texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; textadept = callPackage ../applications/editors/textadept { }; @@ -6977,6 +6981,7 @@ with pkgs; obliv-c = callPackage ../development/compilers/obliv-c {}; ocaml-ng = callPackage ./ocaml-packages.nix { }; + ocaml = ocamlPackages.ocaml; ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; @@ -6993,7 +6998,7 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; opaline = callPackage ../development/tools/ocaml/opaline { }; @@ -7117,7 +7122,7 @@ with pkgs; }; teyjus = callPackage ../development/compilers/teyjus { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; omake = omake_rc1; }; @@ -7839,6 +7844,7 @@ with pkgs; bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + yacc = bison; # TODO: move to aliases.nix blackmagic = callPackage ../development/tools/misc/blackmagic { stdenv = overrideCC stdenv gcc6; @@ -9223,6 +9229,7 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; gamin = callPackage ../development/libraries/gamin { }; + fam = gamin; # added 2018-04-25 ganv = callPackage ../development/libraries/ganv { }; @@ -9418,6 +9425,7 @@ with pkgs; goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; google-gflags = callPackage ../development/libraries/google-gflags { }; + gflags = google-gflags; # TODO: move to aliases.nix gperftools = callPackage ../development/libraries/gperftools { }; @@ -9833,6 +9841,7 @@ with pkgs; fetchurl = fetchurlBoot; type = "lib"; }; + kerberos = libkrb5; # TODO: move to aliases.nix languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -10902,6 +10911,7 @@ with pkgs; mbedtls = callPackage ../development/libraries/mbedtls { }; mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { }; + polarssl = mbedtls; # TODO: add to aliases.nix mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds_0_12_1 = callPackage ../development/libraries/mdds/0.12.1.nix { }; @@ -11132,6 +11142,7 @@ with pkgs; openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; + openal = openalSoft; openbabel = callPackage ../development/libraries/openbabel { }; @@ -11654,8 +11665,10 @@ with pkgs; librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { }; librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; + redland = librdf_redland; # added 2018-04-25 librdf = callPackage ../development/libraries/librdf { }; + liblrdf = librdf; # added 2018-04-25 libsmf = callPackage ../development/libraries/audio/libsmf { }; @@ -12968,6 +12981,7 @@ with pkgs; inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; + mysql = mariadb; # TODO: move to aliases.nix mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl; @@ -13471,7 +13485,7 @@ with pkgs; directvnc = callPackage ../os-specific/linux/directvnc { }; dmraid = callPackage ../os-specific/linux/dmraid { - devicemapper = devicemapper.override {enable_dmeventd = true;}; + lvm2 = lvm2.override {enable_dmeventd = true;}; }; drbd = callPackage ../os-specific/linux/drbd { }; @@ -14284,8 +14298,9 @@ with pkgs; prayer = callPackage ../servers/prayer { }; - procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } - else unixtools.procps; + procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } + else unixtools.procps; + procps-ng = procps; # TODO: move to aliases.nix watch = callPackage ../os-specific/linux/procps/watch.nix { }; @@ -14383,6 +14398,7 @@ with pkgs; systemd = callPackage ../os-specific/linux/systemd { utillinux = utillinuxMinimal; # break the cyclic dependency }; + udev = systemd; # TODO: move to aliases.nix # standalone cryptsetup generator for systemd systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; @@ -15625,13 +15641,11 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - # go 1.9 pin until https://github.com/moby/moby/pull/35739 - inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) - docker_18_03 - docker_18_05; + inherit (callPackage ../applications/virtualization/docker {}) + docker_18_06; - docker = docker_18_03; - docker-edge = docker_18_05; + docker = docker_18_06; + docker-edge = docker_18_06; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -16426,7 +16440,7 @@ with pkgs; praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { - lua5_sockets = lua5_1_sockets; + lua5_sockets = lua51Packages.luasocket; lua5 = lua5_1; }; @@ -16766,8 +16780,6 @@ with pkgs; inferno = pkgsi686Linux.callPackage ../applications/inferno { }; - inginious = callPackage ../servers/inginious {}; - inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; poppler = poppler_0_61; @@ -16935,6 +16947,7 @@ with pkgs; krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; + poppler_qt5 = libsForQt5.poppler; }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -17355,8 +17368,11 @@ with pkgs; xvSupport = !stdenv.isDarwin; }; + mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; + mpvScripts = { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; + mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -17488,6 +17504,7 @@ with pkgs; synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; + mlt-qt5 = libsForQt5.mlt; }; typora = callPackage ../applications/editors/typora { }; @@ -17657,7 +17674,10 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; ocamlPackages = ocamlPackages_4_02; }; + orpie = callPackage ../applications/misc/orpie { + gsl = gsl_1; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; + }; osmo = callPackage ../applications/office/osmo { }; @@ -17684,7 +17704,7 @@ with pkgs; pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + paraview = libsForQt59.callPackage ../applications/graphics/paraview { }; packet = callPackage ../development/tools/packet { }; @@ -19695,6 +19715,8 @@ with pkgs; nethack = callPackage ../games/nethack { }; + nethack-qt = callPackage ../games/nethack { qtMode = true; }; + nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; neverball = callPackage ../games/neverball { }; @@ -20567,8 +20589,10 @@ with pkgs; boogie = dotnetPackages.Boogie; - inherit (callPackage ./coq-packages.nix {}) - mkCoqPackages + inherit (callPackage ./coq-packages.nix { + inherit (ocaml-ng) ocamlPackages_3_12_1 + ocamlPackages_4_02; + }) mkCoqPackages coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq @@ -20592,7 +20616,7 @@ with pkgs; drat-trim = callPackage ../applications/science/logic/drat-trim {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; }; eprover = callPackage ../applications/science/logic/eprover { }; @@ -20625,7 +20649,7 @@ with pkgs; }; iprover = callPackage ../applications/science/logic/iprover { - inherit (ocamlPackages_4_02) ocaml; + inherit (ocaml-ng.ocamlPackages_4_02) ocaml; }; jonprl = callPackage ../applications/science/logic/jonprl { @@ -20640,7 +20664,7 @@ with pkgs; elan = callPackage ../applications/science/logic/elan {}; leo2 = callPackage ../applications/science/logic/leo2 { - ocaml = ocamlPackages_4_01_0.ocaml;}; + ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; logisim = callPackage ../applications/science/logic/logisim {}; @@ -20669,7 +20693,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocamlPackages_4_01_0; + prooftree = (with ocaml-ng.ocamlPackages_4_01_0; callPackage ../applications/science/logic/prooftree { camlp5 = camlp5_transitional; }); @@ -20681,7 +20705,7 @@ with pkgs; sapic = callPackage ../applications/science/logic/sapic { }; satallax = callPackage ../applications/science/logic/satallax { - ocaml = ocamlPackages_4_01_0.ocaml; + ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; saw-tools = callPackage ../applications/science/logic/saw-tools {}; @@ -21210,6 +21234,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; }; libjack2 = jack2.override { prefix = "lib"; }; + jack2Full = jack2; # TODO: move to aliases.nix keynav = callPackage ../tools/X11/keynav { }; @@ -21225,7 +21250,7 @@ with pkgs; lilypond = lilypond-unstable; }; - lollypop-portal = callPackages ../misc/lollypop-portal { }; + lollypop-portal = callPackage ../misc/lollypop-portal { }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; @@ -21757,6 +21782,8 @@ with pkgs; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; + xlog = callPackage ../applications/misc/xlog { }; + xmagnify = callPackage ../tools/X11/xmagnify { }; xosd = callPackage ../misc/xosd { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b98b5b508cf..b5df07148d9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5083,7 +5083,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; meta = with stdenv.lib; { - homepage = http://www.matijs.net/software/msgconv/; + homepage = https://www.matijs.net/software/msgconv/; description = "A .MSG to mbox converter"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; @@ -12428,7 +12428,7 @@ let self = _self // overrides; _self = with self; { url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz"; sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507"; }; - nativeBuildInputs = [ pkgs.docbook_xml_xslt pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; + nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ]; buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ]; LC_ALL="en_US.UTF-8"; @@ -16108,7 +16108,7 @@ let self = _self // overrides; _self = with self; { install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" - install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.3/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" + install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.4/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 450a21f3463..81d38de4f38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3131,6 +3131,8 @@ in { }; + image-match = callPackage ../development/python-modules/image-match { }; + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; immutables = callPackage ../development/python-modules/immutables {}; @@ -4568,6 +4570,8 @@ in { }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; + zope_deprecation = buildPythonPackage rec { name = "zope.deprecation-4.1.2"; @@ -5499,23 +5503,6 @@ in { flask-babel = callPackage ../development/python-modules/flask-babel { }; - flask_cache = buildPythonPackage rec { - name = "Flask-Cache-0.13.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Cache/${name}.tar.gz"; - sha256 = "90126ca9bc063854ef8ee276e95d38b2b4ec8e45fd77d5751d37971ee27c7ef4"; - }; - - propagatedBuildInputs = with self; [ werkzeug flask ]; - - meta = { - homepage = https://github.com/thadeusb/flask-cache; - description = "Adds cache support to your Flask application"; - license = "BSD"; - }; - }; - flask-caching = callPackage ../development/python-modules/flask-caching { }; flask-common = callPackage ../development/python-modules/flask-common { }; @@ -12454,28 +12441,7 @@ in { scipy = callPackage ../development/python-modules/scipy { }; - scikitimage = buildPythonPackage rec { - name = "scikit-image-${version}"; - version = "0.12.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scikit-image/${name}.tar.gz"; - sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2"; - }; - - buildInputs = with self; [ cython dask nose numpy scipy six ]; - - propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ]; - - # the test fails because the loader cannot create test objects! - doCheck = false; - - meta = { - description = "Image processing routines for SciPy"; - homepage = http://scikit-image.org; - license = licenses.bsd3; - }; - }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = callPackage ../development/python-modules/scikitlearn { inherit (pkgs) gfortran glibcLocales; @@ -12638,30 +12604,6 @@ in { simplejson = callPackage ../development/python-modules/simplejson { }; - simpleldap = buildPythonPackage rec { - version = "0.8"; - name = "simpleldap-${version}"; - - propagatedBuildInputs = with self; [ ldap ]; - buildInputs = with self; [ pep8 pytest tox ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/simpleldap/simpleldap-${version}.tar.gz"; - sha256 = "a5916680a7fe1b2c5d74dc76351be2941d03b7b94a50d8520280e3f588a84e61"; - }; - - meta = { - description = "A module that makes simple LDAP usage simple"; - longDescription = '' - A small wrapper around the python-ldap library that provides a more - Pythonic interface for LDAP server connections, LDAP objects, and the - common get and search operations. - ''; - license = licenses.mit; - maintainers = with maintainers; [ layus ]; - }; - }; - simpleparse = buildPythonPackage rec { version = "2.1.1"; name = "simpleparse-${version}"; @@ -15838,44 +15780,7 @@ EOF }; }; - graphite_api = buildPythonPackage rec { - name = "graphite-api-1.0.1"; - disabled = isPyPy; - - src = pkgs.fetchgit { - url = "https://github.com/brutasse/graphite-api.git"; - rev = "b6f75e8a08fae695c094fece6de611b893fc65fb"; - sha256 = "1n8h5krhv7hzmn336y9vjrmv6b6009lz5hj0d9wz7v1k2500ws5k"; - }; - - checkPhase = "nosetests"; - - propagatedBuildInputs = with self; [ - flask - flask_cache - cairocffi - pyparsing - pytz - pyyaml - raven - six - structlog - tzlocal - ]; - - buildInputs = with self; [ - nose - mock - ]; - - LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; - - meta = { - description = "Graphite-web, without the interface. Just the rendering HTTP API"; - homepage = https://github.com/brutasse/graphite-api; - license = licenses.asl20; - }; - }; + graphite_api = callPackage ../development/python-modules/graphite-api { }; graphite_beacon = buildPythonPackage rec { name = "graphite_beacon-0.27.0"; |