diff options
106 files changed, 2172 insertions, 904 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1027ccc9cba..51cca15632d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -107,8 +107,8 @@ # Eclipse /pkgs/applications/editors/eclipse @rycee -# https://github.com/NixOS/nixpkgs/issues/31401 -/lib/licenses.nix @ghost +# Licenses +/lib/licenses.nix @alyssais # Qt / KDE /pkgs/applications/kde @ttuegel diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 287f63e685c..68a1a097984 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "..."; src = fetchurl { ... }; - buildInputs = [ jdk ant ]; + nativeBuildInputs = [ jdk ant ]; buildPhase = "ant"; } @@ -30,7 +30,8 @@ stdenv.mkDerivation { <filename>foo.jar</filename> in its <filename>share/java</filename> directory, and another package declares the attribute <programlisting> -buildInputs = [ jdk libfoo ]; +buildInputs = [ libfoo ]; +nativeBuildInputs = [ jdk ]; </programlisting> then <envar>CLASSPATH</envar> will be set to <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>. @@ -46,7 +47,7 @@ buildInputs = [ jdk libfoo ]; script to run it using the OpenJRE. You can use <literal>makeWrapper</literal> for this: <programlisting> -buildInputs = [ makeWrapper ]; +nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -76,7 +77,7 @@ installPhase = It is possible to use a different Java compiler than <command>javac</command> from the OpenJDK. For instance, to use the GNU Java Compiler: <programlisting> -buildInputs = [ gcj ant ]; +nativeBuildInputs = [ gcj ant ]; </programlisting> Here, Ant will automatically use <command>gij</command> (the GNU Java Runtime) instead of the OpenJRE. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 426113b7918..45a6c3908a8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -542,6 +542,15 @@ github = "averelld"; name = "averelld"; }; + avitex = { + email = "theavitex@gmail.com"; + github = "avitex"; + name = "avitex"; + keys = [{ + longkeyid = "rsa4096/0x8B366C443CABE942"; + fingerprint = "271E 136C 178E 06FA EA4E B854 8B36 6C44 3CAB E942"; + }]; + }; avnik = { email = "avn@avnik.info"; github = "avnik"; @@ -3272,6 +3281,11 @@ email = "softs@metabarcoding.org"; name = "Celine Mercier"; }; + metadark = { + email = "kira.bruneau@gmail.com"; + name = "Kira Bruneau"; + github = "metadark"; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; @@ -4142,6 +4156,11 @@ github = "proglodyte"; name = "Proglodyte"; }; + protoben = { + email = "protob3n@gmail.com"; + github = "protoben"; + name = "Ben Hamlin"; + }; prusnak = { email = "stick@gk2.sk"; github = "prusnak"; @@ -4640,6 +4659,11 @@ github = "scriptkiddi"; name = "Fritz Otlinghaus"; }; + scubed2 = { + email = "scubed2@gmail.com"; + github = "scubed2"; + name = "Sterling Stein"; + }; sdll = { email = "sasha.delly@gmail.com"; github = "sdll"; diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 30570a279ec..c8739d04638 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -342,6 +342,11 @@ from nixpkgs due to lack of maintainer. </para> </listitem> + <listitem> + <para> + The <literal>tomcat-connector</literal> <literal>httpd.extraSubservice</literal> has been removed from nixpkgs. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 76ca435d434..4e85bf794da 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -4,7 +4,7 @@ with lib; options.xdg.portal = { enable = mkEnableOption "<link xlink:href='https://github.com/flatpak/xdg-desktop-portal'>xdg desktop integration</link>"//{ - default = true; + default = config.services.xserver.enable; }; extraPortals = mkOption { diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 97279a78a57..29c3f2f8bbf 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -26,7 +26,7 @@ with lib; security.allowSimultaneousMultithreading = mkDefault false; - security.virtualization.flushL1DataCache = mkDefault "always"; + security.virtualisation.flushL1DataCache = mkDefault "always"; security.apparmor.enable = mkDefault true; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index f611a3992ed..4ae64222274 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -63,6 +63,8 @@ with lib; (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ]) + # PAM (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ]) diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix index bf474ac0a54..2a7f07ef6db 100644 --- a/nixos/modules/security/misc.nix +++ b/nixos/modules/security/misc.nix @@ -48,13 +48,13 @@ with lib; e.g., shared caches). This attack vector is unproven. Disabling SMT is a supplement to the L1 data cache flushing mitigation - (see <xref linkend="opt-security.virtualization.flushL1DataCache"/>) + (see <xref linkend="opt-security.virtualisation.flushL1DataCache"/>) versus malicious VM guests (SMT could "bring back" previously flushed data). ''; }; - security.virtualization.flushL1DataCache = mkOption { + security.virtualisation.flushL1DataCache = mkOption { type = types.nullOr (types.enum [ "never" "cond" "always" ]); default = null; description = '' @@ -114,8 +114,8 @@ with lib; boot.kernelParams = [ "nosmt" ]; }) - (mkIf (config.security.virtualization.flushL1DataCache != null) { - boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualization.flushL1DataCache}" ]; + (mkIf (config.security.virtualisation.flushL1DataCache != null) { + boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualisation.flushL1DataCache}" ]; }) ]; } diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 5a964e672ed..59c1c104b9b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -55,6 +55,11 @@ let [service] DISABLE_REGISTRATION = ${boolToString cfg.disableRegistration} + ${optionalString (cfg.mailerPasswordFile != null) '' + [mailer] + PASSWD = #mailerpass# + ''} + ${cfg.extraConfig} ''; in @@ -255,6 +260,13 @@ in description = "Upper level of template and static files path."; }; + mailerPasswordFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/secrets/gitea/mailpw"; + description = "Path to a file containing the SMTP password."; + }; + disableRegistration = mkEnableOption "the registration lock" // { description = '' By default any user can create an account on this <literal>gitea</literal> instance. @@ -344,9 +356,15 @@ in KEY="$(head -n1 ${secretKey})" DBPASS="$(head -n1 ${cfg.database.passwordFile})" JWTSECRET="$(head -n1 ${jwtSecret})" + ${if (cfg.mailerPasswordFile == null) then '' + MAILERPASSWORD="#mailerpass#" + '' else '' + MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)" + ''} sed -e "s,#secretkey#,$KEY,g" \ -e "s,#dbpass#,$DBPASS,g" \ -e "s,#jwtsecet#,$JWTSECET,g" \ + -e "s,#mailerpass#,$MAILERPASSWORD,g" \ -i ${runConfig} chmod 640 ${runConfig} ${secretKey} ${jwtSecret} ''} diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b882f6c2ae7..1bd9de93735 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -16,6 +16,9 @@ let poolName = "tt-rss"; + mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql"; + pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql"; + tt-rss-config = pkgs.writeText "config.php" '' <?php @@ -200,6 +203,12 @@ let and 3306 for pgsql and mysql respectively). ''; }; + + createLocally = mkOption { + type = types.bool; + default = true; + description = "Create the database and database user locally."; + }; }; auth = { @@ -551,9 +560,13 @@ let }; }; - systemd.services.tt-rss = let - dbService = if cfg.database.type == "pgsql" then "postgresql.service" else "mysql.service"; - in { + systemd.tmpfiles.rules = [ + "d '${cfg.root}' 0755 ${cfg.user} tt_rss - -" + "Z '${cfg.root}' 0755 ${cfg.user} tt_rss - -" + ]; + + systemd.services.tt-rss = + { description = "Tiny Tiny RSS feeds update daemon"; @@ -562,14 +575,14 @@ let if cfg.database.type == "pgsql" then '' ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ ${optionalString (cfg.database.passwordFile != null) "PGPASSWORD=$(cat ${cfg.database.passwordFile})"} \ - ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \ + ${config.services.postgresql.package}/bin/psql \ -U ${cfg.database.user} \ ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ -c '${e}' \ ${cfg.database.name}'' else if cfg.database.type == "mysql" then '' - echo '${e}' | ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.mysql.package}/bin/mysql \ + echo '${e}' | ${config.services.mysql.package}/bin/mysql \ -u ${cfg.database.user} \ ${optionalString (cfg.database.password != null) "-p${cfg.database.password}"} \ ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} -P ${toString dbPort}"} \ @@ -579,7 +592,6 @@ let in '' rm -rf "${cfg.root}/*" - mkdir -m 755 -p "${cfg.root}" cp -r "${pkgs.tt-rss}/"* "${cfg.root}" ${optionalString (cfg.pluginPackages != []) '' for plugin in ${concatStringsSep " " cfg.pluginPackages}; do @@ -592,19 +604,10 @@ let done ''} ln -sf "${tt-rss-config}" "${cfg.root}/config.php" - chown -R "${cfg.user}" "${cfg.root}" chmod -R 755 "${cfg.root}" '' + (optionalString (cfg.database.type == "pgsql") '' - ${optionalString (cfg.database.host == null && cfg.database.password == null) '' - if ! [ -e ${cfg.root}/.db-created ]; then - ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser ${cfg.database.user} - ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O ${cfg.database.user} ${cfg.database.name} - touch ${cfg.root}/.db-created - fi - ''} - exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -628,18 +631,18 @@ let serviceConfig = { User = "${cfg.user}"; + Group = "tt_rss"; ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon"; StandardOutput = "syslog"; StandardError = "syslog"; - PermissionsStartOnly = true; }; wantedBy = [ "multi-user.target" ]; - requires = ["${dbService}"]; - after = ["network.target" "${dbService}"]; + requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; + after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; }; - services.mysql = optionalAttrs (cfg.database.type == "mysql") { + services.mysql = mkIf mysqlLocal { enable = true; package = mkDefault pkgs.mysql; ensureDatabases = [ cfg.database.name ]; @@ -653,17 +656,22 @@ let ]; }; - services.postgresql = optionalAttrs (cfg.database.type == "pgsql") { + services.postgresql = mkIf pgsqlLocal { enable = mkDefault true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; }; - users = optionalAttrs (cfg.user == "tt_rss") { - users.tt_rss = { - description = "tt-rss service user"; - isSystemUser = true; - group = "tt_rss"; - }; - groups.tt_rss = {}; + users.users.tt_rss = optionalAttrs (cfg.user == "tt_rss") { + description = "tt-rss service user"; + isSystemUser = true; + group = "tt_rss"; }; + + users.groups.tt_rss = {}; }; } diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix deleted file mode 100644 index a883bb2b343..00000000000 --- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ config, pkgs, serverInfo, lib, ... }: - -let - extraWorkersProperties = lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties; - - workersProperties = pkgs.writeText "workers.properties" '' -# Define list of workers that will be used -# for mapping requests -# The configuration directives are valid -# for the mod_jk version 1.2.18 and later -# -worker.list=loadbalancer,status - -# Define Node1 -# modify the host as your host IP or DNS name. -worker.node1.port=8009 -worker.node1.host=localhost -worker.node1.type=ajp13 -worker.node1.lbfactor=1 - -# Load-balancing behaviour -worker.loadbalancer.type=lb -worker.loadbalancer.balance_workers=node1 - -# Status worker for managing load balancer -worker.status.type=status - -${extraWorkersProperties} - ''; -in -{ - - options = { - extraWorkersProperties = lib.mkOption { - default = ""; - description = "Additional configuration for the workers.properties file."; - }; - }; - - extraModules = [ - { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; } - ]; - - extraConfig = '' -# Where to find workers.properties -JkWorkersFile ${workersProperties} - -# Where to put jk logs -JkLogFile ${serverInfo.serverConfig.logDir}/mod_jk.log - -# Set the jk log level [debug/error/info] -JkLogLevel info - -# Select the log format -JkLogStampFormat "[%a %b %d %H:%M:%S %Y]" - -# JkOptions indicates to send SSK KEY SIZE -# Note: Changed from +ForwardURICompat. -# See http://tomcat.apache.org/security-jk.html -JkOptions +ForwardKeySize +ForwardURICompatUnparsed -ForwardDirectories - -# JkRequestLogFormat -JkRequestLogFormat "%w %V %T" - -# Mount your applications -JkMount /__application__/* loadbalancer - -# You can use external file for mount points. -# It will be checked for updates each 60 seconds. -# The format of the file is: /url=worker -# /examples/*=loadbalancer -#JkMountFile uriworkermap.properties - -# Add shared memory. -# This directive is present with 1.2.10 and -# later versions of mod_jk, and is needed for -# for load balancing to work properly -# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452 -JkShmFile ${serverInfo.serverConfig.stateDir}/jk.shm - -# Static files in all Tomcat webapp context directories are served by apache -JkAutoAlias /var/tomcat/webapps - -# All requests go to worker by default -JkMount /* loadbalancer -# Serve some static files using httpd -#JkUnMount /*.html loadbalancer -#JkUnMount /*.jpg loadbalancer -#JkUnMount /*.gif loadbalancer -#JkUnMount /*.css loadbalancer -#JkUnMount /*.png loadbalancer -#JkUnMount /*.js loadbalancer - -# Add jkstatus for managing runtime data -<Location /jkstatus/> -JkMount status -Order deny,allow -Deny from all -Allow from 127.0.0.1 -</Location> - ''; -} diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 14304e00dae..98c9ae86cee 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -21,6 +21,13 @@ in description = "Enable the Plasma 5 (KDE 5) desktop environment."; }; + phononBackend = mkOption { + type = types.enum [ "gstreamer" "vlc" ]; + default = "gstreamer"; + example = "vlc"; + description = "Phonon audio backend to install."; + }; + enableQt4Support = mkOption { type = types.bool; default = true; @@ -161,12 +168,14 @@ in qtvirtualkeyboard - libsForQt5.phonon-backend-gstreamer - xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ] - - ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ] + + # Phonon audio backend + ++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer + ++ lib.optional (cfg.phononBackend == "gstreamer" && cfg.enableQt4Support) pkgs.phonon-backend-gstreamer + ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc + ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable bluedevil diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 665a75e47da..e84635a3d2e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -248,7 +248,6 @@ in taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; tinydns = handleTest ./tinydns.nix {}; - tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; udisks2 = handleTest ./udisks2.nix {}; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix deleted file mode 100644 index 8e7b886dd30..00000000000 --- a/nixos/tests/tomcat.nix +++ /dev/null @@ -1,30 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "tomcat"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco ]; - }; - - nodes = { - server = - { ... }: - - { services.tomcat.enable = true; - services.httpd.enable = true; - services.httpd.adminAddr = "foo@bar.com"; - services.httpd.extraSubservices = - [ { serviceType = "tomcat-connector"; } ]; - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - - client = { }; - }; - - testScript = '' - startAll; - - $server->waitForUnit("tomcat"); - $client->waitForUnit("network.target"); - $client->waitUntilSucceeds("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); - $client->waitUntilSucceeds("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); - ''; -}) diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix index 75b6d8e2758..c49470b76e2 100644 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ b/pkgs/applications/audio/avldrums-lv2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "avldrums.lv2"; - version = "0.3.1"; + version = "0.3.5"; src = fetchFromGitHub { owner = "x42"; repo = pname; rev = "v${version}"; - sha256 = "0yhq3n5bahhqpj40mvlkxcjsdsw63jsbz20pl77bx2qj30w25i2j"; + sha256 = "00n2varc7iwp0xbfi45hpq4vlpxxb2kbrdzvrc20qp2265994bqf"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index d4e2fba0cf4..7d7d25ea88a 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "calf-${version}"; - version = "0.90.2"; + version = "0.90.3"; src = fetchurl { url = "https://calf-studio-gear.org/files/${name}.tar.gz"; - sha256 = "0bn4j1klw2yfxz8clbmasaydifq25rdfsv0n6iisxrzcj1lx7sgh"; + sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index b11f525e9d2..cb968ee9e00 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.12.2"; + version = "6.13.0"; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2"; + sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 494f512752b..da915f3fc3e 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "1.1.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "060g4ddh1z222n39wqj8jxj0zgmpjrgraw76qgyg6xkn15cn9q9y"; + sha256 = "1qrbv4kk5v6ynx424h1i54qj0w8v6vpw81b759jawxvzzprpgq72"; fetchSubmodules = true; }; @@ -26,9 +26,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/lv2/ mkdir -p $out/lib/vst/ cd bin - cp -a DragonflyReverb $out/bin/ - cp -a DragonflyReverb-vst.so $out/lib/vst/ - cp -a DragonflyReverb.lv2/ $out/lib/lv2/ + for bin in DragonflyHallReverb DragonflyRoomReverb; do + cp -a $bin $out/bin/ + cp -a $bin-vst.so $out/lib/vst/ + cp -a $bin.lv2/ $out/lib/lv2/ ; + done ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index d798a2bed53..c80485734ca 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.5"; + version = "1.1.9"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "sadko4u"; repo = "${pname}"; rev = "${name}"; - sha256 = "0xcxm47j7mz5vprjqqhi95gz62syp4y737h7cssxd3flqkgar7xr"; + sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2"; }; nativeBuildInputs = [ pkgconfig php expat ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 93aacae47ae..e503793ab39 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "1jd4bf6a1ipvg4yhb3xf3maqg68bx97ic9l57djmkirlrkh2a3wp"; + sha256 = "1k4p2ir12qjcs62knvw2s6qyvb46203yx22fnwp341cjk171cxji"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 63bb966e388..00a22ac711e 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.10.2"; + version = "1.5.11.3"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1rr99qkq80s8l2iv3x4ccxan07m15dvmd5s9b10386bfjbwbya01"; + sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154"; }; buildInputs = [ diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 210d0f7e989..69906b81438 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zam-plugins-${version}"; - version = "3.10"; + version = "3.11"; src = fetchgit { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; - rev = "a3321af1892a6994d64fb705e48ae8adf8d7df20"; - sha256 = "0yqrs21ph2lx00p0jlc70qkmzfrnf9ihg1r3i9j5n2r903ljdg5p"; + rev = "af338057e42dd5d07cba1889bfc74eda517c6147"; + sha256 = "1qbskhcvy2k2xv0f32lw13smz5g72v0yy47zv6vnhnaiaqf3f2d5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 52888c5f85d..efece505ab9 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.1.7"; + version = "2.1.9"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "014c8xvb7shy00vjx0b1k8zr7iknxskqab1aqvz9md3bn5rwkxm5"; + sha256 = "1im7jq7vi2sbdrh95kbydbbfwdll6z9zh1w1vzh7ny1sigfphkpm"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index ada55f0351e..4f86e573689 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -7,13 +7,13 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "18.02"; + version = "19.07.1"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "0rb4kjyrr9ry85cfpbk52l19vvwn7lrh2kmj2lwq531smnygn5m3"; + sha256 = "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 3a734253848..85dfda405b0 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { checkPhase = '' export LC_ALL="en_US.UTF-8" export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" make test ARGS+="-E testgui --output-on-failure" ''; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix new file mode 100644 index 00000000000..0f4e743aba4 --- /dev/null +++ b/pkgs/applications/misc/pyditz/default.nix @@ -0,0 +1,25 @@ +{ stdenv, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + pname = "pyditz"; + version = "0.10.3"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf"; + }; + nativeBuildInputs = [ pythonPackages.setuptools_scm ]; + propagatedBuildInputs = with pythonPackages; [ pyyaml six jinja2 cerberus11 ]; + + checkPhase = '' + ${pythonPackages.python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + homepage = https://pythonhosted.org/pyditz/; + description = "Drop-in replacement for the Ditz distributed issue tracker"; + maintainers = [ maintainers.ilikeavocadoes ]; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 0d863ae9131..c4182785e82 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, file, fontconfig, freetype -, gstreamer, gst-plugins-base, gst_all_1 -, gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, libGLU_combined -, nspr, nss, pango, perl, python, libpulseaudio, sqlite -, unzip, xorg, which, yasm, zip, zlib +, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype +, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg +, libnotify, libstartup_notification, makeWrapper +, libGLU_combined, perl, python, libpulseaudio +, unzip, xorg, wget, which, yasm, zip, zlib }: -stdenv.mkDerivation rec { - name = "palemoon-${version}"; - version = "27.9.4"; +let + + libPath = stdenv.lib.makeLibraryPath [ ffmpeg ]; + +in stdenv.mkDerivation rec { + pname = "palemoon"; + version = "28.6.0.1"; src = fetchFromGitHub { - name = "palemoon-src"; + name = "${pname}-${version}"; owner = "MoonchildProductions"; - repo = "Pale-Moon"; - rev = version + "_Release"; - sha256 = "0ir5gzhw98gfn15x58g1fwi11jd7gysvacqxg1v0jdjhgdl4m5sx"; + repo = "UXP"; + rev = "PM${version}_Release"; + sha256 = "1adgajy5vsghvjlv2nqyrbp6mnv3k6slqxxi8r949xlb5h6d210b"; }; desktopItem = makeDesktopItem { @@ -39,11 +42,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype - gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 - hunspell icu libevent libjpeg libnotify libstartup_notification - libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python - libpulseaudio sqlite unzip which yasm zip zlib + alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype + gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify + libstartup_notification makeWrapper libGLU_combined perl + pkgconfig python libpulseaudio unzip wget which yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman xorgproto @@ -52,57 +54,68 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - export AUTOCONF=${autoconf213}/bin/autoconf - export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild - export MOZ_CONFIG=$(pwd)/.mozconfig - export builddir=$(pwd)/build - mkdir -p $MOZBUILD_STATE_PATH $builddir - echo > $MOZ_CONFIG " - . $src/build/mozconfig.common - ac_add_options --prefix=$out - ac_add_options --with-pthreads - ac_add_options --enable-application=browser + export MOZBUILD_STATE_PATH=$(pwd)/mozbuild + export MOZCONFIG=$(pwd)/mozconfig + export builddir=$(pwd)/pmbuild + + echo > $MOZCONFIG " + mk_add_options AUTOCLOBBER=1 + mk_add_options MOZ_OBJDIR=$builddir + ac_add_options --enable-application=palemoon + + ac_add_options --enable-optimize='-O2' + + # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. ac_add_options --enable-official-branding - ac_add_options --enable-optimize="-O2" - ac_add_options --enable-release - ac_add_options --enable-devtools + export MOZILLA_OFFICIAL=1 + + ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-jemalloc - ac_add_options --enable-shared-js ac_add_options --enable-strip + ac_add_options --with-pthreads + ac_add_options --disable-tests - ac_add_options --disable-installer - ac_add_options --disable-updaters - " - ''; + ac_add_options --disable-eme + ac_add_options --disable-parental-controls + ac_add_options --disable-accessibility + ac_add_options --disable-webrtc + ac_add_options --disable-gamepad + ac_add_options --disable-necko-wifi + ac_add_options --disable-updater + + ac_add_options --x-libraries=${xorg.libX11.out}/lib - patchPhase = '' - chmod u+w . + ac_add_options --prefix=$out + mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES' + mk_add_options AUTOCONF=${autoconf213}/bin/autoconf + " ''; hardeningDisable = [ "format" ]; - + buildPhase = '' - cd $builddir $src/mach build ''; installPhase = '' + $src/mach install + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications for n in 16 22 24 32 48 256; do size=$n"x"$n mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/browser/branding/official/default$n.png \ + cp $src/application/palemoon/branding/official/default$n.png \ $out/share/icons/hicolor/$size/apps/palemoon.png done - cd $builddir - $src/mach install + wrapProgram $out/lib/palemoon-${version}/palemoon \ + --prefix LD_LIBRARY_PATH : "${libPath}" ''; meta = with stdenv.lib; { - description = "A web browser"; + description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on efficiency and customization. @@ -114,9 +127,9 @@ stdenv.mkDerivation rec { experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own. ''; - homepage = https://www.palemoon.org/; + homepage = "https://www.palemoon.org/"; license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj AndersonTorres ]; - platforms = platforms.linux; + maintainers = with maintainers; [ rnhmjoj AndersonTorres OPNA2608 ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ee477af8d49..ff83452d45f 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -69,6 +69,8 @@ in stdenv.mkDerivation rec { cp -r usr/share/{applications,xfce4} "$out"/share substituteInPlace "$out"/share/applications/*.desktop \ --replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi + substituteInPlace "$out"/share/applications/*.desktop \ + --replace vivaldi-stable vivaldi local d for d in 16 22 24 32 48 64 128 256; do mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index e5f437a89ad..424b2ddca91 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -8,8 +8,8 @@ let sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; }; "1.6" = { - flinkVersion = "1.6.2"; - sha256 = "17fsr6yv1ayr7fw0r4pjlbpkn9ypzjs4brqndzr3gbzwrdc44arw"; + flinkVersion = "1.8.1"; + sha256 = "1ynxlkdxvrgww9hh7rlkhybrp5vl2slj3pqg2qzc8khpcgqx1h2g"; }; }; in diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index c03af2e9683..c116e46684c 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - version = "2.11.0"; + version = "2.14.2"; name = "helm-${version}"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1z810a6mxyrrw4i908dip8aqsj95c0kmv6xpb1wwhskg1zmf85wk"; + sha256 = "0hxfyfpmhgr5jilp2xm9d5vxiq5fcgqm2hh4g4izcgiz9bz7b6k0"; }; goPackagePath = "k8s.io/helm"; @@ -18,7 +18,7 @@ buildGoPackage rec { # Thsese are the original flags from the helm makefile buildFlagsArray = '' - -ldflags=-X k8s.io/helm/pkg/version.Version=v${version} + -ldflags=-X k8s.io/helm/pkg/version.Version=v${version} -X k8s.io/helm/pkg/version.GitTreeState=clean -X k8s.io/helm/pkg/version.BuildMetadata= -w -s ''; diff --git a/pkgs/applications/networking/cluster/helm/deps.nix b/pkgs/applications/networking/cluster/helm/deps.nix index 36bd3406f5b..2fdda0ca280 100644 --- a/pkgs/applications/networking/cluster/helm/deps.nix +++ b/pkgs/applications/networking/cluster/helm/deps.nix @@ -1,839 +1,1181 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "cloud.google.com/go"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "3b1ae45394a234c385be014e9a488f2bb6eef821"; - sha256 = "0alb495ql6s02kb6lxcbnlkdcmhixyl8zv11sgrkhsk1bckzh119"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; }; } { - goPackagePath = "github.com/Azure/go-ansiterm"; + goPackagePath = "github.com/Azure/go-ansiterm"; fetch = { type = "git"; url = "https://github.com/Azure/go-ansiterm"; - rev = "19f72df4d05d31cbe1c56bfc8045c96babff6c7e"; - sha256 = "0663w5m5qlidpj17s5pqp6rhl0phw7vypf104n04dvdy5nd418ix"; + rev = "d6e3b3328b78"; + sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; }; } { - goPackagePath = "github.com/Azure/go-autorest"; + goPackagePath = "github.com/Azure/go-autorest"; fetch = { type = "git"; url = "https://github.com/Azure/go-autorest"; - rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; - sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; + rev = "v11.1.0"; + sha256 = "1jmr04qkl9fgmj56czn2979ng0f6ygfbk2khv2xyx368686xc1d6"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "b26d9c308763d68093482582cea63d69be07a0f0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { - goPackagePath = "github.com/MakeNowJust/heredoc"; + goPackagePath = "github.com/MakeNowJust/heredoc"; fetch = { type = "git"; url = "https://github.com/MakeNowJust/heredoc"; - rev = "bb23615498cded5e105af4ce27de75b089cbe851"; + rev = "bb23615498cd"; sha256 = "17m780i9afj3sbmcrgwgzarfly4x9376w56qblkqnzdkv6vps22i"; }; } { - goPackagePath = "github.com/Masterminds/semver"; + goPackagePath = "github.com/Masterminds/goutils"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "v1.1.0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; fetch = { type = "git"; url = "https://github.com/Masterminds/semver"; - rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"; - sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6"; + rev = "v1.4.2"; + sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; }; } { - goPackagePath = "github.com/Masterminds/sprig"; + goPackagePath = "github.com/Masterminds/sprig"; fetch = { type = "git"; url = "https://github.com/Masterminds/sprig"; - rev = "15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"; - sha256 = "1k5pfx9hxzb70kh73a009ikr3vqlq0jvzvbyvxz9x7a7yc4r5b14"; + rev = "9f8fceff796f"; + sha256 = "0m6h88xcs8zc2b1g6zaksfn9kyqhr8q9508h57jb6papx7w54yl2"; }; } { - goPackagePath = "github.com/Masterminds/vcs"; + goPackagePath = "github.com/Masterminds/vcs"; fetch = { type = "git"; url = "https://github.com/Masterminds/vcs"; - rev = "3084677c2c188840777bff30054f2b553729d329"; + rev = "v1.11.1"; sha256 = "1062m73h0pp5d0574lf6px4jsjgywnsbkw50inxx3zal5r185ydm"; }; } { - goPackagePath = "github.com/PuerkitoBio/purell"; + goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "8a290539e2e8629dbc4e6bad948158f790ec31f4"; - sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + rev = "v1.1.0"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } { - goPackagePath = "github.com/PuerkitoBio/urlesc"; + goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; - sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + rev = "de5bf2ad4578"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/adisbladis/vgo2nix"; + fetch = { + type = "git"; + url = "https://github.com/adisbladis/vgo2nix"; + rev = "56ac56bb0d96"; + sha256 = "1jbxbgcqkal8cdhj2nfbw92fn1fs9ng1df9sf92vgf0m1xzq2mc3"; + }; + } + { + goPackagePath = "github.com/alecthomas/assert"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/assert"; + rev = "405dbfeb8e38"; + sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; + }; + } + { + goPackagePath = "github.com/alecthomas/colour"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/colour"; + rev = "60882d9e2721"; + sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; }; } { - goPackagePath = "github.com/aokoli/goutils"; + goPackagePath = "github.com/alecthomas/kingpin"; fetch = { type = "git"; - url = "https://github.com/aokoli/goutils"; - rev = "9c37978a95bd5c709a15883b6242714ea6709e64"; - sha256 = "1c51qgk4pjc8c776h7589c3d14791h86f1yj3ykg4q7vlcf9xrnr"; + url = "https://github.com/alecthomas/kingpin"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { - goPackagePath = "github.com/asaskevich/govalidator"; + goPackagePath = "github.com/alecthomas/repr"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/repr"; + rev = "117648cd9897"; + sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/asaskevich/govalidator"; fetch = { type = "git"; url = "https://github.com/asaskevich/govalidator"; - rev = "7664702784775e51966f0885f5cd27435916517b"; + rev = "766470278477"; sha256 = "1lmynw9vkgrxv7nh60wdywv0nx4gjlkiar433wydhpc2h3m5q968"; }; } { - goPackagePath = "github.com/beorn7/perks"; + goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; - sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; }; } { - goPackagePath = "github.com/chai2010/gettext-go"; + goPackagePath = "github.com/chai2010/gettext-go"; fetch = { type = "git"; url = "https://github.com/chai2010/gettext-go"; - rev = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb"; - sha256 = "0bwjwvjl7zqm7kxram1rzz0ri3h897kiin13ljy9hx3fzz1i9lml"; + rev = "c6fed771bfd5"; + sha256 = "1p9gzj39x4gyhc552n3dmi3kc224gwilawa5kcg8rla31qkwlsky"; }; } { - goPackagePath = "github.com/cpuguy83/go-md2man"; + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "71acacd42f85e5e82f70a55327789582a5200a90"; + rev = "v1.0.4"; sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v"; }; } { - goPackagePath = "github.com/cyphar/filepath-securejoin"; + goPackagePath = "github.com/cyphar/filepath-securejoin"; fetch = { type = "git"; url = "https://github.com/cyphar/filepath-securejoin"; - rev = "a261ee33d7a517f054effbf451841abaafe3e0fd"; + rev = "v0.2.2"; sha256 = "0id32zjb92wm569m29nfrzz5mw9z1glr3klayr6j134pp4h1sgq4"; }; } { - goPackagePath = "github.com/davecgh/go-spew"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "782f4967f2dc4564575ca782fe2d04090b5faca8"; - sha256 = "1ypijjawqc0xgmgim42260ibcyclfgfizicz5cbvndw4plqfsswk"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } { - goPackagePath = "github.com/dgrijalva/jwt-go"; + goPackagePath = "github.com/dgrijalva/jwt-go"; fetch = { type = "git"; url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + rev = "01aeca54ebda"; + sha256 = "10dmb5xxn5wijn299h483z0klprprkq7n1azakm3ysp50sr11ywg"; }; } { - goPackagePath = "github.com/docker/distribution"; + goPackagePath = "github.com/docker/distribution"; fetch = { type = "git"; url = "https://github.com/docker/distribution"; - rev = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"; + rev = "edc3ab29cdff"; sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; }; } { - goPackagePath = "github.com/docker/docker"; + goPackagePath = "github.com/docker/docker"; fetch = { type = "git"; url = "https://github.com/docker/docker"; - rev = "4f3616fb1c112e206b88cb7a9922bf49067a7756"; - sha256 = "0zmsqm1lkwggfqgy2rw34g4g2jlvr6mvcsh65fmpdb30l65iaqzf"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; - sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; + rev = "a9fbbdc8dd87"; + sha256 = "0vkr9fs8qv3ydpm4f4b3jsx1f3cxpws78f2kwpyn00y1gb3lpnpc"; }; } { - goPackagePath = "github.com/docker/go-units"; + goPackagePath = "github.com/docker/spdystream"; fetch = { type = "git"; - url = "https://github.com/docker/go-units"; - rev = "9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"; - sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; + url = "https://github.com/docker/spdystream"; + rev = "449fdfce4d96"; + sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; }; } { - goPackagePath = "github.com/docker/spdystream"; + goPackagePath = "github.com/emicklei/go-restful"; fetch = { type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "449fdfce4d962303d702fec724ef0ad181c92528"; - sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; }; } { - goPackagePath = "github.com/evanphx/json-patch"; + goPackagePath = "github.com/evanphx/json-patch"; fetch = { type = "git"; url = "https://github.com/evanphx/json-patch"; - rev = "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"; - sha256 = "1c9gzc3gb76lm5famc0345y90is1lyffn39bmdr0xk19462f8av5"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; }; } { - goPackagePath = "github.com/exponent-io/jsonpath"; + goPackagePath = "github.com/exponent-io/jsonpath"; fetch = { type = "git"; url = "https://github.com/exponent-io/jsonpath"; - rev = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5"; + rev = "d6023ce2651d"; sha256 = "1qkzaxsjs7yg1672sk67nr119j7jc4751yzgii0j3nbipjv321kc"; }; } { - goPackagePath = "github.com/fatih/camelcase"; + goPackagePath = "github.com/fatih/camelcase"; fetch = { type = "git"; url = "https://github.com/fatih/camelcase"; - rev = "f6a740d52f961c60348ebb109adde9f4635d7540"; + rev = "f6a740d52f96"; sha256 = "15vb86adns1izvbzjw0lmmzrwlarhbxw5qalhx10vzzdx73wh4ai"; }; } { - goPackagePath = "github.com/ghodss/yaml"; + goPackagePath = "github.com/ghodss/yaml"; fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; + rev = "c7ce16629ff4"; + sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; }; } { - goPackagePath = "github.com/go-openapi/jsonpointer"; + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; fetch = { type = "git"; url = "https://github.com/go-openapi/jsonpointer"; - rev = "46af16f9f7b149af66e5d1bd010e3574dc06de98"; - sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + rev = "v0.19.0"; + sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; }; } { - goPackagePath = "github.com/go-openapi/jsonreference"; + goPackagePath = "github.com/go-openapi/jsonreference"; fetch = { type = "git"; url = "https://github.com/go-openapi/jsonreference"; - rev = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"; - sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + rev = "v0.19.0"; + sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; }; } { - goPackagePath = "github.com/go-openapi/spec"; + goPackagePath = "github.com/go-openapi/spec"; fetch = { type = "git"; url = "https://github.com/go-openapi/spec"; - rev = "1de3e0542de65ad8d75452a595886fdd0befb363"; - sha256 = "13i9y71fk9vr2abvpsk04k55il32ly3fjinvl1zlamh9mi2mdzf4"; + rev = "v0.17.2"; + sha256 = "14n5x2nxlj2x62v3km96yw7rncxk2b9v94k3j0c22r43c60m38mx"; }; } { - goPackagePath = "github.com/go-openapi/swag"; + goPackagePath = "github.com/go-openapi/swag"; fetch = { type = "git"; url = "https://github.com/go-openapi/swag"; - rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; - sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + rev = "v0.17.2"; + sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.4.0"; + sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; }; } { - goPackagePath = "github.com/gobwas/glob"; + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; fetch = { type = "git"; url = "https://github.com/gobwas/glob"; - rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; + rev = "v0.2.3"; sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; }; } { - goPackagePath = "github.com/gogo/protobuf"; + goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "c0656edd0d9eab7c66d1eb0c568f9039345796f7"; - sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; }; } { - goPackagePath = "github.com/golang/glog"; + goPackagePath = "github.com/golang/glog"; fetch = { type = "git"; url = "https://github.com/golang/glog"; - rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; - sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; }; } { - goPackagePath = "github.com/golang/groupcache"; + goPackagePath = "github.com/golang/groupcache"; fetch = { type = "git"; url = "https://github.com/golang/groupcache"; - rev = "02826c3e79038b59d737d3b1c0a1d937f71a4433"; + rev = "02826c3e7903"; sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"; - sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; }; } { - goPackagePath = "github.com/google/btree"; + goPackagePath = "github.com/google/btree"; fetch = { type = "git"; url = "https://github.com/google/btree"; - rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + rev = "7d79101e329e"; sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; }; } { - goPackagePath = "github.com/google/gofuzz"; + goPackagePath = "github.com/google/gofuzz"; fetch = { type = "git"; url = "https://github.com/google/gofuzz"; - rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c"; - sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i"; + rev = "24818f796faf"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; }; } { - goPackagePath = "github.com/google/uuid"; + goPackagePath = "github.com/google/uuid"; fetch = { type = "git"; url = "https://github.com/google/uuid"; - rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + rev = "064e2069ce9c"; sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; }; } { - goPackagePath = "github.com/googleapis/gnostic"; + goPackagePath = "github.com/googleapis/gnostic"; fetch = { type = "git"; url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; + rev = "0c5108395e2d"; sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; }; } { - goPackagePath = "github.com/gophercloud/gophercloud"; + goPackagePath = "github.com/gophercloud/gophercloud"; fetch = { type = "git"; url = "https://github.com/gophercloud/gophercloud"; - rev = "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"; - sha256 = "0xvapk94p1259k8arvwyvhwvcnzma9vdg12g750cgz2ghkzvfhff"; + rev = "c818fa66e4c8"; + sha256 = "0igz47lpdxgpfb4ckrrs64vr4wkkiqaamk4wf5d3il4dc2g06azw"; }; } { - goPackagePath = "github.com/gosuri/uitable"; + goPackagePath = "github.com/gosuri/uitable"; fetch = { type = "git"; url = "https://github.com/gosuri/uitable"; - rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; + rev = "v0.0.1"; sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; }; } { - goPackagePath = "github.com/gregjones/httpcache"; + goPackagePath = "github.com/gregjones/httpcache"; fetch = { type = "git"; url = "https://github.com/gregjones/httpcache"; - rev = "787624de3eb7bd915c329cba748687a3b22666a6"; + rev = "787624de3eb7"; sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5"; }; } { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; fetch = { type = "git"; url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"; + rev = "0c1b191dbfe5"; sha256 = "0d7vybd4yy9a9clk03578xdpyhifxsy3qv6iiglrrnblbmpgksjc"; }; } { - goPackagePath = "github.com/hashicorp/golang-lru"; + goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; url = "https://github.com/hashicorp/golang-lru"; - rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"; - sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp"; + rev = "v0.5.0"; + sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; }; } { - goPackagePath = "github.com/huandu/xstrings"; + goPackagePath = "github.com/huandu/xstrings"; fetch = { type = "git"; url = "https://github.com/huandu/xstrings"; - rev = "3959339b333561bf62a38b424fd41517c2c90f40"; - sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1"; + rev = "v1.2.0"; + sha256 = "0bn1kac5vcspxdpx4bygr4gngdbk67pnbqc04b0f7a4ny25n10iq"; }; } { - goPackagePath = "github.com/imdario/mergo"; + goPackagePath = "github.com/imdario/mergo"; fetch = { type = "git"; url = "https://github.com/imdario/mergo"; - rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; - sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; + rev = "v0.3.5"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; }; } { - goPackagePath = "github.com/inconshreveable/mousetrap"; + goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { type = "git"; url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + rev = "v1.0.0"; sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } { - goPackagePath = "github.com/json-iterator/go"; + goPackagePath = "github.com/jmoiron/sqlx"; + fetch = { + type = "git"; + url = "https://github.com/jmoiron/sqlx"; + rev = "v1.2.0"; + sha256 = "0pmi2asx157f5738g19fzyxb9g8yyfbpjyh2a2ykr9mafvp60rfd"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; url = "https://github.com/json-iterator/go"; - rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; - sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; + rev = "ab8a2e0c74be"; + sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.0.0"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + }; + } + { + goPackagePath = "github.com/liggitt/tabwriter"; + fetch = { + type = "git"; + url = "https://github.com/liggitt/tabwriter"; + rev = "89fcab3d43de"; + sha256 = "04q8d0jk1ymvy7pv1dgfbqzk8gcjfa77psg1lk30ghlisf54pakg"; }; } { - goPackagePath = "github.com/mailru/easyjson"; + goPackagePath = "github.com/mailru/easyjson"; fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"; - sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p"; + rev = "60711f1a8329"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; }; } { - goPackagePath = "github.com/mattn/go-runewidth"; + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.3"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + rev = "v0.0.1"; sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; }; } { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.9.0"; + sha256 = "14vw8bwyaz9lrd1rqhfri5cwpimiimhp75pkbqxxsjsr5jz89s7m"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { type = "git"; url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } { - goPackagePath = "github.com/mitchellh/go-wordwrap"; + goPackagePath = "github.com/mitchellh/go-wordwrap"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-wordwrap"; - rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; + rev = "ad45545899c7"; sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; }; } { - goPackagePath = "github.com/modern-go/concurrent"; + goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + rev = "bacd9c7ef1dd"; sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; }; } { - goPackagePath = "github.com/modern-go/reflect2"; + goPackagePath = "github.com/modern-go/reflect2"; fetch = { type = "git"; url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; }; } { - goPackagePath = "github.com/opencontainers/go-digest"; + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; fetch = { type = "git"; url = "https://github.com/opencontainers/go-digest"; - rev = "a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"; + rev = "a6d0ee40d420"; sha256 = "1paz3na2xkhi10p5bk7f7gbh5yykfgr9f9i2gcc13rb461yq6fmg"; }; } { - goPackagePath = "github.com/opencontainers/image-spec"; + goPackagePath = "github.com/orivej/e"; fetch = { type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "372ad780f63454fbbbbcc7cf80e5b90245c13e13"; - sha256 = "0wajddbm49bfybkab9midilg18zvdvvsffwhkq7bpp7inj4jnsvs"; + url = "https://github.com/orivej/e"; + rev = "ac3492690fda"; + sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr"; }; } { - goPackagePath = "github.com/petar/GoLLRB"; + goPackagePath = "github.com/orivej/go-nix"; fetch = { type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + url = "https://github.com/orivej/go-nix"; + rev = "dae45d921a44"; + sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy"; }; } { - goPackagePath = "github.com/peterbourgon/diskv"; + goPackagePath = "github.com/peterbourgon/diskv"; fetch = { type = "git"; url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; + rev = "v2.0.1"; sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; }; } { - goPackagePath = "github.com/pkg/errors"; + goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + rev = "v0.8.0"; sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } { - goPackagePath = "github.com/pmezard/go-difflib"; + goPackagePath = "github.com/pkg/profile"; + fetch = { + type = "git"; + url = "https://github.com/pkg/profile"; + rev = "v1.2.1"; + sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; fetch = { type = "git"; url = "https://github.com/pmezard/go-difflib"; - rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; - sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } { - goPackagePath = "github.com/prometheus/client_golang"; + goPackagePath = "github.com/prometheus/client_golang"; fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + rev = "v0.9.2"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; }; } { - goPackagePath = "github.com/prometheus/client_model"; + goPackagePath = "github.com/prometheus/client_model"; fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; }; } { - goPackagePath = "github.com/prometheus/common"; + goPackagePath = "github.com/prometheus/common"; fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"; - sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8"; + rev = "v0.2.0"; + sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp"; }; } { - goPackagePath = "github.com/prometheus/procfs"; + goPackagePath = "github.com/prometheus/procfs"; fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259"; - sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq"; + rev = "1dc9a6cbc91a"; + sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/rubenv/sql-migrate"; + fetch = { + type = "git"; + url = "https://github.com/rubenv/sql-migrate"; + rev = "1007f53448d7"; + sha256 = "1cd7wpgym7yzzv4n7bsmg9gh1g7mqlljih3881arqlq11083d3mc"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "300106c228d52c8941d4b3de6054a6062a86dda3"; + rev = "300106c228d5"; sha256 = "1bcqwb9lk2sijn5q3kqp7sadhh0ysbxlj5bxjspk9yp5bp733cbh"; }; } { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + rev = "10ef21a441db"; sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; }; } { - goPackagePath = "github.com/sirupsen/logrus"; + goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "89742aefa4b206dcf400792f3bd35b542998eb3b"; - sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; }; } { - goPackagePath = "github.com/spf13/cobra"; + goPackagePath = "github.com/spf13/cobra"; fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "c439c4fa093711d42e1b01acb1235b52004753c1"; - sha256 = "14v5vhb180yzaknxnm8j4n9jai58b0y2nzrqzpdq7bj9slsga1vd"; + rev = "fe5e611709b0"; + sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; }; } { - goPackagePath = "github.com/spf13/pflag"; + goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "e3a8ff8ce36581f87a15341206f205b1da467059"; - sha256 = "179k26lcgafkbjylbhgj2f5pnh52bmv19rr1w95gca944blw8yga"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; }; } { - goPackagePath = "github.com/technosophos/moniker"; + goPackagePath = "github.com/technosophos/moniker"; fetch = { type = "git"; url = "https://github.com/technosophos/moniker"; - rev = "a5dbd03a2245d554160e3ae6bfdcf969fe58b431"; + rev = "a5dbd03a2245"; sha256 = "1z273gvbwr09lcxwd10wyvxmxjln93r952sr1w9hqxcgc1f8l3vl"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "49796115aa4b964c318aad4f3084fdb41e9aa067"; - sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59"; + rev = "0709b304e793"; + sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; + rev = "65e2d4e15006"; + sha256 = "0aqcmh0sp723d6hwgrv7pnrs4crns2ngr4x43jd4v985cbn455x7"; }; } { - goPackagePath = "golang.org/x/oauth2"; + goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4"; - sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "43eea11bc92608addb41b8a406b0407495c106f6"; - sha256 = "0k9wy278f5753d130p8asva2g573vi6wviwkxwwnpxni118knq1l"; + rev = "b90733256f2e"; + sha256 = "1dsqa48ai4rrqf0sxypnmjg5c6sbp63mj5ljr7qadam06r5m2q98"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "golang.org/x/text"; fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; - sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } { - goPackagePath = "golang.org/x/time"; + goPackagePath = "golang.org/x/time"; fetch = { type = "git"; url = "https://go.googlesource.com/time"; - rev = "f51c12702a4d776e4c1fa9b0fabab841babae631"; + rev = "f51c12702a4d"; sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy"; }; } { - goPackagePath = "google.golang.org/appengine"; + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6cd1fcedba52"; + sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "12d5545dc1cfa6047a286d5e853841b6471f4c19"; - sha256 = "1bv6cjakhi6j3s1bqb3n45qrmvf20qkhwxllvi94jag4i7hd91w8"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; }; } { - goPackagePath = "google.golang.org/genproto"; + goPackagePath = "google.golang.org/genproto"; fetch = { type = "git"; url = "https://github.com/google/go-genproto"; - rev = "09f6ed296fc66555a25fe4ce95173148778dfa85"; - sha256 = "06x5wr7vjsnvv35rpv7jaklilksqbzsbqk8bxababw8vr6avfwki"; + rev = "c66870c02cf8"; + sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; }; } { - goPackagePath = "google.golang.org/grpc"; + goPackagePath = "google.golang.org/grpc"; fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "5ffe3083946d5603a0578721101dc8165b1d5b5f"; - sha256 = "1ij3sy49xfihwpcpiwd68mlfkrk375kdh6r6jlqka18zalxgpaan"; + rev = "v1.18.0"; + sha256 = "17drwyj3fi5sdz5ndlj7888b3gin6brs3jnh7gh6i15k97l6gf4n"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } { - goPackagePath = "gopkg.in/inf.v0"; + goPackagePath = "gopkg.in/gorp.v1"; fetch = { type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + url = "https://gopkg.in/gorp.v1"; + rev = "v1.7.2"; + sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.0"; sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; }; } { - goPackagePath = "gopkg.in/square/go-jose.v2"; + goPackagePath = "gopkg.in/square/go-jose.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v2"; + rev = "89060dee6a84"; + sha256 = "04ak01zs9qibr6qvc6l0zdjj9pgccpbvxz6rdwrqv698i1q3qfpd"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; - url = "https://github.com/square/go-jose"; - rev = "f8f38de21b4dcd69d0413faf231983f5fd6634b1"; - sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "honnef.co/go/tools"; fetch = { type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "670d4cfef0544295bc27a114dbac37980d83185a"; - sha256 = "182x97q4826cpzybkrl8icyx1n6l1z0kspmbz33fh901v10b6322"; + url = "https://github.com/dominikh/go-tools"; + rev = "88497007e858"; + sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; }; } { - goPackagePath = "k8s.io/api"; + goPackagePath = "k8s.io/api"; fetch = { type = "git"; url = "https://github.com/kubernetes/api"; - rev = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"; - sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx"; + rev = "6e4e0e4f393b"; + sha256 = "0y7nxxywq2qx74a5vsg0h2jkfj879wbv6bjran12401fv0vsdlp1"; }; } { - goPackagePath = "k8s.io/apiextensions-apiserver"; + goPackagePath = "k8s.io/apiextensions-apiserver"; fetch = { type = "git"; url = "https://github.com/kubernetes/apiextensions-apiserver"; - rev = "898b0eda132e1aeac43a459785144ee4bf9b0a2e"; - sha256 = "1zn4i4wfmk3y36n6mqcidgsp4aqzwy5w9749zjl2bfbwzpk81bcp"; + rev = "727a075fdec8"; + sha256 = "1p8bdl299hrmkq2hfh7sqhsv7c3ig1i0jy8mcgq0hqjix94a87cj"; }; } { - goPackagePath = "k8s.io/apimachinery"; + goPackagePath = "k8s.io/apimachinery"; fetch = { type = "git"; url = "https://github.com/kubernetes/apimachinery"; - rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; - sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; + rev = "6a84e37a896d"; + sha256 = "1ys06ixidvpcj9sgk0c2i5vsz11gg3h8xcpc9kqxfsik36cw1akk"; }; } { - goPackagePath = "k8s.io/apiserver"; + goPackagePath = "k8s.io/apiserver"; fetch = { type = "git"; url = "https://github.com/kubernetes/apiserver"; - rev = "8b122ec9e3bbab91a262d17a39325e69349dc44d"; - sha256 = "0qfxjypa10s16sll2a75kn2ddjddr2xsa5rsiaxar3gs5pqvq1h5"; + rev = "1ec86e4da56c"; + sha256 = "0my2r4ynbxgpbbrjgcrdrqazhhn2jwk8jkk8ymjks28gzs2i510s"; }; } { - goPackagePath = "k8s.io/client-go"; + goPackagePath = "k8s.io/cli-runtime"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/cli-runtime"; + rev = "d644b00f3b79"; + sha256 = "1zcmfpyp6m9xl8dia56yb00ixra3ag5d43v2f5zlnrwphq967a8p"; + }; + } + { + goPackagePath = "k8s.io/client-go"; fetch = { type = "git"; url = "https://github.com/kubernetes/client-go"; - rev = "59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82"; - sha256 = "0f069d1msdb2x4yvwv0wa3hzanl97csg4hsp1pycxpnqck6qx6qh"; + rev = "1a26190bd76a"; + sha256 = "1b77zf0sip2cilkr40b2jm1kk71212s4clmbs2xl57b4n945yy1d"; }; } { - goPackagePath = "k8s.io/kube-openapi"; + goPackagePath = "k8s.io/cloud-provider"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/cloud-provider"; + rev = "9c9d72d1bf90"; + sha256 = "15iwal7nn1b7jwrvrhlzvdnf0381lccpw3jrlww8sfmxqsp860in"; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "8e90cee79f82"; + sha256 = "1hzy767dj0ya111al54k3g9xa40bsy7j81fi0sh7gyl1azw0h8dk"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; fetch = { type = "git"; url = "https://github.com/kubernetes/kube-openapi"; - rev = "91cfa479c814065e420cee7ed227db0f63a5854e"; - sha256 = "0l9yvc7gfa8i4snpv1d13vy03dplzp2jh47rqr3fhiihcz2wx4s7"; + rev = "b3a7cee44a30"; + sha256 = "1ald0jjliln5ipdniwfcrm4yal9aa4jr07d3ljrhhh2fj72c6dsp"; }; } { - goPackagePath = "k8s.io/kubernetes"; + goPackagePath = "k8s.io/kubernetes"; fetch = { type = "git"; url = "https://github.com/kubernetes/kubernetes"; - rev = "2e809eed16445fff9dcbfc56e9936cf76ccbdadc"; - sha256 = "13fzcbjfc5c35gy66nbn1ms63b8bj3g8z7wja0p8dd3yj9lcj68h"; + rev = "v1.14.1"; + sha256 = "0s06x9jk9b6r0i39nl0bmvwjgdp3qikgfbw5cnzi5mv03hc2li8s"; }; } { - goPackagePath = "k8s.io/utils"; + goPackagePath = "k8s.io/utils"; fetch = { type = "git"; url = "https://github.com/kubernetes/utils"; - rev = "258e2a2fa64568210fbd6267cf1d8fd87c3cb86e"; - sha256 = "1mbw3q03sflrdgj6l7q3frqzb5f78n0m0gzjm228sy1wnm4c3760"; + rev = "c2654d5206da"; + sha256 = "1849p8xhiyk53mpg3mwpsmsm5ps5sa2p54bv7b38m415qxsn2d1x"; + }; + } + { + goPackagePath = "sigs.k8s.io/kustomize"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/kustomize"; + rev = "v2.0.3"; + sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb"; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; }; } { - goPackagePath = "vbom.ml/util"; + goPackagePath = "vbom.ml/util"; fetch = { type = "git"; url = "https://github.com/fvbommel/util"; - rev = "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394"; + rev = "db5cfe13f5cc"; sha256 = "1k9c3ihhkrcmhd26pwd62mp2ll7icr2q65i5pkymnfnhhv40p682"; }; } diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index d1e24c56f8a..171ce3d3a54 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kubetail-${version}"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = "${version}"; - sha256 = "15f97bzw0vha4nrl9207l7w9mlnx58xlcnmpfjvbpm7x0ivb5l0q"; + sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr"; }; installPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f416daf4f88..cb192bddcaf 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.4"; - sha256 = "0hbrdnryfla6d3mjn2sf6qbi79slhd92s2xgcqk3bgvr1n6k0k7n"; + version = "0.12.5"; + sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 55932c5c198..fea062805d0 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "1468kl1gip7h2k5l9x3shp3vxdnx08mr1n4845zinaqz4dpa70jv"; + sha256 = "154lzvd8acs4dyc91nlabpr284yrij8jkhgm0h18hp3cy0a11rv8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 7c348b88c8a..edf10ed2cb4 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.2.2", + "version": "1.3.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index d6dcd0ee2ef..7400393d92b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.2.2"; + version = "1.3.0"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb"; + sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; }; in mkYarnPackage rec { @@ -81,7 +81,7 @@ in mkYarnPackage rec { description = "A feature-rich client for Matrix.org"; homepage = https://about.riot.im/; license = licenses.asl20; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ pacien worldofpeace ]; inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2d6c0df412a..9a2e2df80f2 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x"; + sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 76987d08ff4..4e602862197 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: let - rev = "56d2007b5ba9f1628a44af6edf5dbdf74cf92278"; - sha256 = "1v264mpf9ddiz8zb7fcyjwy1a2yr5f4xs520gf63kl9378v721da"; - version = "2019-03-15"; + rev = "5cdbb97898d727d2b35c25a3117e9a79e474d97b"; + sha256 = "14qikp91l2aj8j9i0nh0nf9ibz65b8bpd3lbyarqshhrpvb5jp79"; + version = "2019-06-04"; in stdenv.mkDerivation { inherit version; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 6ce33d4f047..309b09f10c4 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -94,16 +94,14 @@ in stdenv.mkDerivation { --replace /usr/share/ $out/share/ '' + stdenv.lib.optionalString (theme != null) '' cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js + var fs = require('fs'); document.addEventListener('DOMContentLoaded', function() { let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}" - $.ajax({ - url: '${theme}/theme.css', - success: function(css) { + fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { \$("<style></style>").appendTo('head').html(css + tt__customCss); \$("<style></style>").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); \$("<style></style>").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}'); \$("<style></style>").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}'); - } }); }); EOF diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index 87674e6084b..ae602b752e0 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.8.04"; + version = "4.0.10"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "09wazaa18zfsl4pscpzjqzj9wi4kdi6325rhaf5rl3668nlig4sm"; + sha256 = "1vprax1w5wm3v2i4d0mbakrxp7v53m2bm8icsvaji06ixskq7cxf"; }; buildInputs = [ diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 58a0b8048b5..48c20ecca47 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "14027dcq0ag2qjpxcmsb9n1c64ypmi4rycwxzm2hajj7hk2736hv"; + sha256 = "1jrrj9c4ddm37m8j0g693xjimpnlvx7lan5kxish5p14xpwdak35"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index 406f42e9ad7..2cdd7fda38e 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchFromGitHub, zlib, python}: +{stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}: stdenv.mkDerivation rec { name = "bedtools-${version}"; - version = "2.27.1"; + version = "2.28.0"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "1pk68y052rm2m24yfmy82ms8p6kd6xcqxxgi7n0a1sbh89wllm6s"; + sha256 = "1266bcn5hgbvysfi6nr4cqxlbxcx7vn7ng8kb0v3gz37qh2zxxw9"; }; - buildInputs = [ zlib python ]; + buildInputs = [ zlib python bzip2 lzma ]; cc = if stdenv.cc.isClang then "clang++" else "g++"; buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} -j $NIX_BUILD_CORES"; installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} install"; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 3367fa87422..153ebaa441f 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cmakeFlags = # It's important that caffe is passed the major and minor version only because that's what # boost_python expects - [ (if pythonSupport then "-Dpython_version=3${python.pythonVersion}" else "-DBUILD_python=OFF") + [ (if pythonSupport then "-Dpython_version=${python.pythonVersion}" else "-DBUILD_python=OFF") "-DBLAS=open" ] ++ (if cudaSupport then [ "-DCUDA_ARCH_NAME=All" @@ -73,9 +73,17 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ] ; - propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; - - outputs = [ "bin" "out"]; + propagatedBuildInputs = lib.optionals pythonSupport ( + # requirements.txt + let pp = python.pkgs; in ([ + pp.numpy pp.scipy pp.scikitimage pp.h5py + pp.matplotlib pp.ipython pp.networkx pp.nose + pp.pandas pp.dateutil pp.protobuf pp.gflags + pp.pyyaml pp.pillow pp.six + ] ++ lib.optional leveldbSupport pp.leveldb) + ); + + outputs = [ "bin" "out" ]; propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle patches = [ diff --git a/pkgs/applications/science/math/caffe/python.patch b/pkgs/applications/science/math/caffe/python.patch index b1bed6c174b..dac5071aa08 100644 --- a/pkgs/applications/science/math/caffe/python.patch +++ b/pkgs/applications/science/math/caffe/python.patch @@ -64,7 +64,7 @@ index 4a5bac47..be026d43 100644 - if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND) + find_package(NumPy 1.7.1) + find_package(Boost 1.46 REQUIRED COMPONENTS python@major@@minor@) -+ if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND BOOST_PYTHON@major@@minor@_FOUND) ++ if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON@major@@minor@_FOUND) set(HAVE_PYTHON TRUE) if(BUILD_python_layer) list(APPEND Caffe_DEFINITIONS PRIVATE -DWITH_PYTHON_LAYER) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 82d98b95966..8733863196d 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.12.2"; + version = "2.12.3"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0sxfmjg26s86m5xa9nbj8287kg12kygxw6gggahal6v7zjhwcvaz"; + sha256 = "13l4nc3k6vl9x1x0153mwi351j3z266wx0fp7xw2851avrgkk9zg"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index f69fdbefe18..c095aa49eaf 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -2,7 +2,7 @@ { fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" -, writeScript, common-updater-scripts, curl, gnugrep +, writeScript, common-updater-scripts, curl, gnugrep, coreutils }: let @@ -18,7 +18,7 @@ let arch = "x64"; libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation { pname = "${pname}-bin"; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index da973b0a7ee..2734028866e 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "1107"; - sha256 = "70edbb16529d638ea41a694dbc5b1408c76fcc3a7d663ef0e48b4e89e1f19c71"; + buildVersion = "1116"; + sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6"; } {}; sublime-merge-dev = common { - buildVersion = "1111"; - sha256 = "d287b77b36febe52623db4546bef978dceb0654257b9a70c798d9cd394305c0d"; + buildVersion = "1115"; + sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl"; dev = true; } {}; } diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index f73c5277d05..76db1cd9e64 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { name = "dvdstyler-${version}"; srcName = "DVDStyler-${version}"; - version = "3.0.4"; + version = "3.1"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2"; - sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"; + sha256 = "1rz69vrfqz9sma9cm1mnvkd11zq3is53lc3m3hcphr02vs69s53m"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 27a0fa3388e..a683e192f11 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "19.02.28"; + version = "19.07.15"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "14l0cm81jy7syi08d8dg4nzp7s9zji9cycnf2mvh7zc7x069d1jr"; + sha256 = "0drl0x8x45kysalzx1pbg0gkvlxaykg9zka1fdkrl4iqfs4s7vv2"; }; enableParallelBuilding = true; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index df0201af3b8..0d87cd848f8 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel -, sassc, inkscape, libxml2, gnome2, gdk_pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine , cinnamonSupport ? true , gnomeFlashbackSupport ? true , gnomeShellSupport ? true , openboxSupport ? true , xfceSupport ? true +, mateSupport ? true, gtk3, marco , gtkNextSupport ? false , plankSupport ? false , steamSupport ? false -, telegramSupport ? false, zip ? null +, telegramSupport ? false, zip , tweetdeckSupport ? false , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) @@ -16,17 +17,15 @@ , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) }: -assert telegramSupport -> zip != null; - stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.8.3"; + version = "0.8.7"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0ibgymdrw91lnng76lb0x55zg6nm9f2vap19wk7qsq3bcw6ny2zi"; + sha256 = "1rn51yj7f7bclvrwwqwid4z9cpap4yd0zw0xs08c36zcjmr28426"; }; preferLocalBuild = true; @@ -38,8 +37,9 @@ stdenv.mkDerivation rec { sassc inkscape libxml2 - gnome2.glib.dev + glib.dev ] + ++ stdenv.lib.optionals mateSupport [ gtk3 marco ] ++ stdenv.lib.optional telegramSupport zip; buildInputs = [ @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { (enableFeature gnomeShellSupport "gnome") (enableFeature openboxSupport "openbox") (enableFeature xfceSupport "xfce") + (enableFeature mateSupport "mate") (enableFeature gtkNextSupport "gtk_next") (enableFeature plankSupport "plank") (enableFeature steamSupport "airforsteam") diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 4a5366a72e7..e301305d405 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.3"; + version = "3.32.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9"; + sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4"; }; patches = [ diff --git a/pkgs/development/interpreters/evcxr/cargo-lock.patch b/pkgs/development/interpreters/evcxr/cargo-lock.patch new file mode 100644 index 00000000000..6feaf12844c --- /dev/null +++ b/pkgs/development/interpreters/evcxr/cargo-lock.patch @@ -0,0 +1,684 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..edf585d +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,661 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "approx" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "argon2rs" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2-rfc" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cgmath" ++version = "0.16.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "colored" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "evcxr" ++version = "0.3.3" ++dependencies = [ ++ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sig 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "evcxr_repl" ++version = "0.3.3" ++dependencies = [ ++ "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "evcxr 0.3.3", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "evcxr_runtime" ++version = "1.1.0" ++dependencies = [ ++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "json" ++version = "0.11.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libloading" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nix" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num-traits" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rgb" ++version = "0.8.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustyline" ++version = "3.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scoped_threadpool" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "sig" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8parse" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winconsole" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" ++"checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" ++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" ++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637" ++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" ++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bd1fa8ad26490b0a5cfec99089952250301b6716cdeaa7c9ab229598fb82ab66" ++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a0c56216487bb80eec9c4516337b2588a4f2a2290d72a1416d930e4dcdb0c90d" ++"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum cgmath 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "64a4b57c8f4e3a2e9ac07e0f6abc9c24b6fc9e1b54c3478cfb598f3d0023e51c" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cdb90b60f2927f8d76139c72dbde7e10c3a2bc47c8594c9c7a66529f2687c03" ++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" ++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" ++"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" ++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" ++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" ++"checksum regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53ee8cfdddb2e0291adfb9f13d31d3bbe0a03c9a402c01b1e24188d86c35b24f" ++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" ++"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum rgb 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4f089652ca87f5a82a62935ec6172a534066c7b97be003cc8f702ee9a7a59c92" ++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustyline 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb02ba7748691403057542ee60a1e7688fdfb46bd3bee752b8977537ee003ae2" ++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" ++"checksum sig 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6567e29578f9bfade6a5d94a32b9a4256348358d2a3f448cab0021f9a02614a2" ++"checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec" ++"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" ++"checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" ++"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum winconsole 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef84b96d10db72dd980056666d7f1e7663ce93d82fa33b63e71c966f4cf5032" +diff --git a/Cargo.toml b/Cargo.toml +index d09a342..5377ed0 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -2,10 +2,9 @@ + members = [ + "evcxr", + "evcxr_repl", +- "evcxr_jupyter", + "evcxr_runtime", + ] + + exclude = [ + "runtimes" +-] +\ No newline at end of file ++] diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix new file mode 100644 index 00000000000..2c30c0ca385 --- /dev/null +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -0,0 +1,31 @@ +{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security }: + +rustPlatform.buildRustPackage rec { + name = "evcxr-${version}"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = "evcxr"; + rev = "ae07ccf08723b7aec0de57d540822b89088ca036"; + sha256 = "1apc93z9vvf6qks5x2pad45rnrj9kjl812rj78w5zmmizccp2fhf"; + }; + + cargoSha256 = "153pxqj4jhlbacr7607q9yfw6h96ns5igbvssis8j3gn0xp6ssg6"; + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ cargo ] ++ stdenv.lib.optional stdenv.isDarwin Security; + postInstall = '' + wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} + rm $out/bin/testing_runtime + ''; + + meta = { + description = "An evaluation context for Rust"; + homepage = "https://github.com/google/evcxr"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.protoben ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index d9350d135eb..b6208eeeb51 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "1.0"; + version = "1.0.1"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "19qrdfi0vig3msqg76k1zf5j3vav0jz44cvj6i4dyfbscdwf2l9c"; + sha256 = "0ia7mgxs5g9849r26yrx07lrx65vhlrxqqh5b6d69gfi1pykb4j2"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 0e47398b346..124984f0d53 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1r21sfs1ik6cb8bz17w6gp6y2xa9rbjxjka0p6airb3qds094iv5"; + sha256 = "1s6zwf97rkkvnf3p7vlaykwa4pxpvj78pmxvvjf5jk29f93b49xp"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index a6281156afa..e476bc22eca 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: +{stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -7,6 +7,14 @@ stdenv.mkDerivation { sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; + patches = [ + (fetchpatch { + name = "CVE-2007-3568.patch"; + url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch; + sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; + }) + ]; + configureFlags = [ "--disable-shm" "--x-includes=${libX11.dev}/include" diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index 3943e5d6d49..e06d9547de0 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -11,10 +11,5 @@ mkDerivation { propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; outputs = [ "out" "dev" ]; - preConfigure = '' - outputBin=dev - ''; - postInstall = '' - moveToOutput share/man $dev - ''; + outputBin = "dev"; } diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 8896447590b..e10dffa96c1 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -2,11 +2,11 @@ , IOKit ? null }: stdenv.mkDerivation rec { - name = "libstatgrab-0.91"; + name = "libstatgrab-0.92"; src = fetchurl { url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; - sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; + sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; }; buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 83f62e4ec2b..e7d7d132617 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -64,10 +64,6 @@ qtOwnPathsHook() { preFixupPhases+=" qtOwnPathsHook" -isQtApp () { - readelf -d "$1" 2>/dev/null | grep -q -F 'libQt5Core' -} - # Note: $qtWrapperArgs still gets defined even if $dontWrapQtApps is set. wrapQtAppsHook() { # skip this hook when requested @@ -77,7 +73,7 @@ wrapQtAppsHook() { [ -z "$wrapQtAppsHookHasRun" ] || return 0 wrapQtAppsHookHasRun=1 - local targetDirs=( "$prefix/bin" ) + local targetDirs=( "$prefix/bin" "$prefix/libexec" ) echo "wrapping Qt applications in ${targetDirs[@]}" for targetDir in "${targetDirs[@]}" @@ -86,7 +82,7 @@ wrapQtAppsHook() { find "$targetDir" -executable -print0 | while IFS= read -r -d '' file do - isQtApp "$file" || continue + isELF "$file" || continue if [ -f "$file" ] then diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2c881a5c45a..2e42e8bd23c 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.4) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.4) + cocoapods-core (= 1.7.5) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.4) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 758383455e0..b8ce7131b9f 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.4) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.4) + cocoapods-core (= 1.7.5) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.4) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index bd89b448eac..7ae6e50de99 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; + sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; + sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-deintegrate = { groups = ["default"]; diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index bb4ea396c09..003c3a1bc13 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; + sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; + sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-deintegrate = { groups = ["default"]; diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index 25a83fa7912..36205c7c1ff 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, cppo, ppx_tools, ppx_deriving, result }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-visitors-20180513"; + name = "ocaml${ocaml.version}-visitors-20190711"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/visitors/visitors-20180513.tar.gz; - sha256 = "12j8n9fkl43sd0j78x2zqix8m1vinswl2jgwndd62vmx98f5rl1v"; + url = http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz; + sha256 = "1h794xczfczf573mpwzm4ah9ir1rbbrkqipbh3aflfpdq2mgsbvg"; }; buildInputs = [ ocaml findlib ocamlbuild cppo ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 37e0211d98d..d8e4c9f2943 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "54630f769b0a25e83744673068db89cdd099f830818cea7ea9c43eb23add7941"; + sha256 = "0g4pqdm2kp2abam0nx0pgs5lk19f8lsfpcgwxpigdwmy1lvblsa5"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/pkgs/development/python-modules/cerberus11/default.nix b/pkgs/development/python-modules/cerberus11/default.nix new file mode 100644 index 00000000000..614e3ca8135 --- /dev/null +++ b/pkgs/development/python-modules/cerberus11/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: + +buildPythonPackage rec { + pname = "Cerberus"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; + }; + + checkInputs = [ pytestrunner pytest ]; + + meta = with stdenv.lib; { + homepage = http://python-cerberus.org/; + description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 2b38f4a9e36..aaaad292df0 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "5.4.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1qms1kmzr543hz30jmcmx20cf9xbgzl97a9k44xizsk785dwakbn"; + sha256 = "168xi92pfk80n2k47qc5zim7jai3kcmj3j157fynz9c8dfw4sbn4"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix new file mode 100644 index 00000000000..71ec20faed8 --- /dev/null +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "django-webpack-loader"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bwpgmkh32d7a5dgppin9m0mnh8a33ccl5ksnpw5vjp4lal3xq73"; + }; + + # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) + doCheck = false; + + meta = with lib; { + description = "Use webpack to generate your static bundles"; + homepage = https://github.com/owais/django-webpack-loader; + maintainers = with maintainers; [ peterromfeldhk ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 1ce86daf992..67345cd8d6a 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -1,17 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchFromGitHub, six, django }: buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; - src = fetchPypi { - inherit pname version; - sha256 = "35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3"; + src = fetchFromGitHub { + owner = "django-compressor"; + repo = "django-appconf"; + rev = version; + sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; }; - # No tests in archive - doCheck = false; + propagatedBuildInputs = [ six django ]; - propagatedBuildInputs = [ six ]; + checkPhase = '' + # prove we're running tests against installed package, not build dir + rm -r appconf + python -m django test --settings="tests.test_settings" + ''; meta = with stdenv.lib; { description = "A helper class for handling configuration defaults of packaged apps gracefully"; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 845d4928805..30343f76570 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -8,8 +8,12 @@ buildPythonPackage rec { inherit pname version; sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f"; }; + postPatch = '' + substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \ + --replace 'rjsmin == 1.0.12' 'rjsmin' + ''; - # Need to setup django testing + # requires django-sekizai, which we don't have packaged yet doCheck = false; propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 93e52c51dda..a717a0ef6e8 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.7.3"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0mp1hbj7ciwpair7z445zj1grfv8c75gby9lih01c3mvw4pff7v2"; + sha256 = "0rjpmxcd4hphq41y7frg6by6gwjjmrdbnim8jvx951ps5gzyfpgc"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 967fc1c5745..2e802e05c07 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "6.3.8"; + version = "8.0.0"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq"; + sha256 = "0xllr43dizvybmb68i0ybk1xhaqx5abjwxa9vrg43b9ds0pggvk1"; }; buildInputs = [ pkgs.ncurses ]; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 149b07d63e3..eb10edeaca9 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "2.3"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "0x7l9k2dvxzd5mjgiq15nl9b0sxcqy1cqaz744bjwkz4z5mrypzg"; + sha256 = "135rwh7izzmj4lwkrfb9xw4ik0gcwjz34ygnmx3vyvki2xbbp2xp"; }; doCheck = false; # something about yajl diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index a0bc3a88745..c06f5d6cd08 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.3.0"; + version = "0.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1b2phizcx2wbdm5np0s16yd68fc0isqnm8qs6l9pmlrlyf9gm87j"; + sha256 = "14pmxyx4kwyafdifqzal121mpdd89lxbjgn0zzi9z6fmzk6pr5h2"; }; checkInputs = [ pytest colorama ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index f593c5dbeea..2dcc3e5b873 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -6,30 +6,35 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl"; + sha256 = "1ww3kc5bzp5q7b23n2vmzqch1z06l7vrscn0h96cscvk45sxc7yz"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/pelican/tests/output/custom_locale/posts + ''; }; doCheck = true; + # Exclude custom locale test, which files were removed above to fix the source checksum checkPhase = '' - python -Wd -m unittest discover + nosetests -sv --exclude=test_custom_locale_generation_works pelican ''; buildInputs = [ glibcLocales # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this # again. Compare https://github.com/getpelican/pelican/pull/2252. - # Version 4.0.1 is incompatible with our current pandoc version. + # Version 4.1.0 is incompatible with our current pandoc version. # pandoc git mock - nose markdown typogrify ]; @@ -39,6 +44,10 @@ buildPythonPackage rec { blinker pillow beautifulsoup4 markupsafe lxml ]; + checkInputs = [ + nose + ]; + postPatch= '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index b2b103858cc..38642f066d7 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f"; + sha256 = "1bhzkzjvz6zb6rc5zmvgqfszrcyh64v1hay7m1m5dn083gaznyk9"; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 1c87a3f1837..d75458acf7c 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "1pby2lbzwy2pwdbq8xaqi4560b1ih5m0y141mmbc446j3w168fvv"; + sha256 = "0xlmx280mzd3f63ydqhr76whbr2lhcwihyg9my9d5hjklkrhdn58"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index ed50c28f4c3..88174a94ef4 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "fe85a79f58a01dd335968523b91c5fce760e7fe78bf25a6e71c72204fe499d0b"; + sha256 = "0sri92mzhkifn16klkk2mhc2vcrvdmfp2wvkpfss518sln5q5gca"; }; doCheck = false; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index f7772492dfd..b2bb8a740a8 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.29.0"; + version = "6.29.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1xsg862d68rdrl6m3v9zcq20h42jn6x9cv1bk2ydiizyn6ngqz8w"; + sha256 = "1g2wdy62w25sjibggr25b3833x0fhc7w6ypy8g1fgix217rja7pz"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix new file mode 100644 index 00000000000..1c924d8973d --- /dev/null +++ b/pkgs/development/python-modules/vdf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, pytest, pytestcov, mock }: + +buildPythonPackage rec { + pname = "vdf"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "ValvePython"; + repo = pname; + rev = "v${version}"; + sha256 = "19xqjq2159w2l9vaxlkickvy3zksp9ssdkvbfcfggxz31miwp1zr"; + }; + + checkInputs = [ pytest pytestcov mock ]; + checkPhase = "make test"; + + meta = with stdenv.lib; { + description = "Library for working with Valve's VDF text format"; + homepage = https://github.com/ValvePython/vdf; + license = licenses.mit; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index db04c2026d8..51aeebb82e5 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -62,7 +62,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "01d4m4kb2mhz8fxl9apzsdq0pd7i79w3q49x51rwa524caml9zfv"; + sha256 = "1i3b6kn9kq70a34wkpm8zjqj1skawdxs3r01b7r6ws1rbdnfj6mp"; }; buildAttrs = { diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 0bfe54508b8..1bc9aa14e44 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.33.0"; + version = "0.34.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "11yh4d7ybmddw86n8ms259rwd3q0gx2qqir2x92dhywp6pb8g11b"; + sha256 = "1mry999aqmbljp2ybkgf9hps8z4aa254b1bsivi559gzsvdkmqh7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 460fb46671f..eb70a7b326d 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "remarshal"; - version = "0.9.1"; + version = "0.10.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "564ffe9cbde85bd28a9c184b90c764abd2003abd6101a30802262198b5c7fc40"; + sha256 = "1prpczb8q996i5sf27vfmp0nv85zwsiajnf9jbjkhm0k21wfvmdd"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix new file mode 100644 index 00000000000..1c4e176966d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, pkgconfig, curl, libgit2, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-raze"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "0d87azip59bmkk38par23f5yvb9w8ikvdg6grn689zpgc3di2phx"; + }; + sourceRoot = "source/impl"; + + cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ curl libgit2 openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Generate Bazel BUILD files from Cargo dependencies"; + homepage = https://github.com/google/cargo-raze; + license = licenses.asl20; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 4c5b1843229..f2f50c18e0b 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, autoPatchelfHook -, zlib, expat, dbus, openssl}: +, zlib, expat, dbus, openssl, python3 }: stdenv.mkDerivation rec { name = "sourcetrail-${version}"; - version = "2019.1.11"; + version = "2019.2.39"; src = fetchurl { name = "sourtrail.tar.gz"; url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit"; - sha256 = "09f3qdgdqg6dlai43050qh4iv1d4j43isk81q68swalpnvjn72w0"; + sha256 = "13kzfnsb5lf9v6bqw41qljp5bgz2rd3w163r6xg59hzd3dv8f90q"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ zlib expat dbus stdenv.cc.cc openssl ]; + buildInputs = [ zlib expat dbus stdenv.cc.cc openssl python3 ]; installPhase = '' runHook preInstall @@ -38,28 +38,30 @@ stdenv.mkDerivation rec { --replace /usr/bin/ $out/bin/ cat <<EOF > $out/bin/sourcetrail - #! ${stdenv.shell} -e - - # XXX: Sourcetrail somehow copies the initial config files into the home - # directory without write permissions. We currently just copy them - # ourselves to work around this problem. - setup_config() { - local src dst - - [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail - for src in $out/opt/data/fallback/*; do - dst=~/.config/sourcetrail/"\$(basename "\$src")" - if [ ! -e "\$dst" ]; then - cp -r "\$src" "\$dst" - fi - done - - chmod -R u+w ~/.config/sourcetrail - } - - [ -d "\$HOME" ] && setup_config - exec "$out/opt/Sourcetrail.sh" "\$@" + #! ${stdenv.shell} -e + + # XXX: Sourcetrail somehow copies the initial config files into the home + # directory without write permissions. We currently just copy them + # ourselves to work around this problem. + setup_config() { + local src dst + + [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail + for src in $out/opt/data/fallback/*; do + dst=~/.config/sourcetrail/"\$(basename "\$src")" + if [ ! -e "\$dst" ]; then + cp -r "\$src" "\$dst" + fi + done + + chmod -R u+w ~/.config/sourcetrail + } + + [ -d "\$HOME" ] && setup_config + export PATH="\$PATH:${python3}/bin" + exec "$out/opt/Sourcetrail.sh" "\$@" EOF + chmod +x $out/bin/sourcetrail runHook postInstall diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index c6c001143a9..14e55f99e0b 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,53 +1,49 @@ -{ stdenv, lib, fetchurl, php, runtimeShell }: +{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: let - version = "2.0.1"; + version = "2.2.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; + ini = writeText "php.ini" '' + [PHP] + memory_limit = -1 ; no limit as composer uses a lot of memory + + [Phar] + phar.readonly = Off + ''; + in stdenv.mkDerivation rec { - name = "wp-cli-${version}"; + pname = "wp-cli"; inherit version; src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "05lbay4c0477465vv4h8d2j94pk3haz1a7f0ncb127fvxz3a2pcg"; + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; + sha256 = "0s03jbsjwvkcbyss6rvpgw867hiwvk5p4n1qznkghyzi94j8mvki"; }; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' dir=$out/share/wp-cli mkdir -p $out/bin $dir - cat <<_EOF > $out/bin/wp -#!${runtimeShell} - -set -euo pipefail - -exec ${lib.getBin php}/bin/php \\ - -c $dir/php.ini \\ - -f $dir/wp-cli -- "\$@" -_EOF - chmod 0755 $out/bin/wp - - cat <<_EOF > $dir/php.ini -[PHP] -memory_limit = -1 ; no limit as composer uses a lot of memory - -[Phar] -phar.readonly = Off -_EOF + install -Dm444 ${src} $dir/wp-cli + install -Dm444 ${ini} $dir/php.ini + install -Dm444 ${completion} $out/share/bash-completion/completions/wp - install -Dm644 ${src} $dir/wp-cli - install -Dm644 ${completion} $out/share/bash-completion/completions/wp + makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ + --add-flags "-c $dir/php.ini" \ + --add-flags "-f $dir/wp-cli" # this is a very basic run test - $out/bin/wp --info + $out/bin/wp --info >/dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface for WordPress"; homepage = https://wp-cli.org; license = licenses.mit; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index b5263673faa..5dc0a63c26e 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.17.0"; + version = "1.17.3"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1gviq2c96l8gh8hy7ygxyd62xc3laiglr5mhsfwhxdn039fdh0vr"; + sha256 = "050bd7bzn1kkva03q3ay2jlq574yp4k5g1pyrrdvk2cr60c4j1vj"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index e36b950f1f2..0768e98f73b 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip }: +{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: stdenv.mkDerivation rec{ pname = "cypress"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook ]; buildInputs = with xorg; [ libXScrnSaver libXdamage libXtst diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix new file mode 100644 index 00000000000..909737a6804 --- /dev/null +++ b/pkgs/games/nxengine-evo/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchpatch +, fetchurl +, cmake +, libpng +, SDL2 +, SDL2_mixer +}: + +stdenv.mkDerivation rec { + pname = "nxengine-evo"; + version = "2.6.4"; + src = fetchurl { + url = "https://github.com/nxengine/nxengine-evo/archive/v${version}.tar.gz"; + sha256 = "1xir74l0vrzrpyl7sfqfxp083dakbix26hd0arwf2y57w1mbjas8"; + }; + assets = fetchurl { + url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz"; + sha256 = "1b5hkmsrrhnjjf825ri6n62kb3fldwl7v5f1cqvqyv47zv15g5gy"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch"; + sha256 = "18j22vzkikcwqd42vlhzd6rjp26dq0zslxw5yyl07flivms0hny2"; + }) + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch"; + sha256 = "0sjr7z63gp7nfxifxisvp2w664mxxk3xi4a3d86mm0470dj5m5bx"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libpng + SDL2 + SDL2_mixer + ]; + + # Allow finding game assets. + postPatch = '' + sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp + ''; + + installPhase = '' + cd .. + unpackFile ${assets} + mkdir -p $out/bin/ $out/share/nxengine/ + install bin/* $out/bin/ + cp -r NXEngine-evo-${version}-Linux/data/ $out/share/nxengine/data + chmod -R a=r,a+X $out/share/nxengine/data + ''; + + meta = { + description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; + license = with stdenv.lib.licenses; [ + gpl3 # Game engine + unfreeRedistributable # Game assets, freeware + ]; + maintainers = [ stdenv.lib.maintainers.scubed2 ]; + homepage = "https://github.com/nxengine/nxengine-evo"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index a3ad0e637e5..2bc34a6ec9d 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,102 +1,77 @@ -{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }: +{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper }: + +# revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let - version = "0.7.0-alpha"; - TES3MP = fetchFromGitHub { - owner = "TES3MP"; - repo = "openmw-tes3mp"; - rev = version; - sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q"; - }; - CallFF = fetchFromGitHub { - owner = "Koncord"; - repo = "CallFF"; - rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b"; - sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm"; - }; - CrabNet = fetchFromGitHub { + # TES3MP_STABLE_VERSION_FILE + compatHash = "292536439eeda58becdb7e441fe2e61ebb74529e"; + rakNet = fetchFromGitHub { owner = "TES3MP"; repo = "CrabNet"; - rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567"; - sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0"; + # usually fixed: + # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 + rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; + sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; + }; + rakNetLibrary = stdenv.mkDerivation { + name = "RakNetLibrary"; + src = rakNet; + nativeBuildInputs = [ cmake ]; + installPhase = '' + install -Dm755 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a + ''; }; - CoreScripts = fetchFromGitHub { + coreScripts = fetchFromGitHub { owner = "TES3MP"; repo = "CoreScripts"; - rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea"; - sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg"; + # usually latest master + rev = "71e15fa3b1d5131b6607ba1589f41c06672ce376"; + sha256 = "1kwii8rpsxjmz4dh06wb0qaix17hq5s1qsvysv6n6209vlclfxjg"; }; - - fakegit = writeScriptBin "git" '' - #! ${stdenv.shell} - ''; -in stdenv.mkDerivation rec { - inherit version; - name = "tes3mp-${version}"; +in openmw.overrideAttrs (oldAttrs: rec { + version = "2019-06-09"; + name = "openmw-tes3mp-${version}"; src = fetchFromGitHub { - owner = "GrimKriegor"; - repo = "TES3MP-deploy"; - rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325"; - sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn"; + owner = "TES3MP"; + repo = "openmw-tes3mp"; + # usually latest in stable branch (e.g. 0.7.0) + rev = "01804af100785bc2c162d568258d9662012627a3"; + sha256 = "0j99v9vvmic0bqw3y4550k1dy058lwvs9s9qcjmxh1wkqkvrpdnp"; }; - dontUseCmakeConfigure = true; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; + buildInputs = oldAttrs.buildInputs ++ [ luajit ]; - nativeBuildInputs = [ cmake makeWrapper fakegit ]; - buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt - ncurses libGL luajit ]; + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DBUILD_OPENCS=OFF" + "-DRakNet_INCLUDES=${rakNet}/include" + "-DRakNet_LIBRARY_RELEASE=${rakNetLibrary}/lib/libRakNetLibStatic.a" + "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" + ]; - buildPhase = '' - mkdir dependencies keepers - cp --no-preserve=mode -r ${TES3MP} code - cp --no-preserve=mode -r ${CallFF} dependencies/callff - cp --no-preserve=mode -r ${CrabNet} dependencies/raknet - cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts - - substituteInPlace tes3mp-deploy.sh \ - --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out" - patchShebangs tes3mp-deploy.sh - echo y | ./tes3mp-deploy.sh -i -c $NIX_BUILD_CORES + preConfigure = '' + substituteInPlace files/version.in \ + --subst-var-by OPENMW_VERSION_COMMITHASH ${compatHash} ''; - installPhase = '' - prefix=$out/opt/tes3mp - mkdir -p $prefix/build $out/etc/openmw $out/bin - for i in build/*; do - if [ -f "$i" ] && [ -x "$i" ]; then - mv "$i" $prefix/build - fi - done - mv build/resources $prefix/build - mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw - mv keepers $prefix - mv build/tes3mp-credits.md $prefix/build - mv -f $prefix/keepers/version $prefix/build/resources - - for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh - do - bin="$out/bin/''${i%.sh}" - mv $i $bin - substituteInPlace $bin \ - --replace build/ $prefix/build/ - chmod +x $bin - done - ln -s $prefix/keepers/*.cfg $out/etc/openmw/ - + postInstall = '' + # components/process/processinvoker.cpp: path.prepend(QLatin1String("./")) + wrapProgram $out/bin/tes3mp-browser \ + --run "cd $out/bin" wrapProgram $out/bin/tes3mp-server \ --run "mkdir -p ~/.config/openmw" \ --run "cd ~/.config/openmw" \ - --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \ - --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" + --run "[ -d CoreScripts ] || cp --no-preserve=mode -r ${coreScripts} CoreScripts" \ + --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" \ + --run "cd $out/bin" ''; meta = with stdenv.lib; { description = "Multiplayer for TES3:Morrowind based on OpenMW"; - homepage = "https://tes3mp.com/"; + homepage = https://tes3mp.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; }; -} +}) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 926e360a1b4..e7636e8320e 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,20 +5,20 @@ let name = "openrct2-${version}"; - version = "0.2.2"; + version = "0.2.3"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1bfqmb6cbmsjcvj77vppy5lw1m4lkvxd1w3f218ah4788xnkysq2"; + sha256 = "01mj6jlbl2cn3wpk6sy34ldzdl0qykpn7fncznjykklj2nqzr4ig"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.9"; - sha256 = "1kng0mz8dsdbfd3g6qsk69ap2nq75aizw76j4a6lkfygnbcv8m3j"; + rev = "v1.0.11"; + sha256 = "1bh7mngpqnhzwnhhawq5y3a6hbvwxis2yagk4dcmc4w1fifq2y66"; }; title-sequences-src = fetchFromGitHub { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fa8fb3a6a9b..e1c7e5de08f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -171,12 +171,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-01-18"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "5954cef560ea19e077b1811a4bcbe831a33e2499"; - sha256 = "0gz55ql0dqmg3cd0y46adkj3s61ar6j1w17n7643y0rd7mndcnqa"; + rev = "cf9ddfe0eb36a4d57a1240735360385e3ed5534c"; + sha256 = "0504wl874fr0lzv48l8khfrx4l59c6bklndvrgmf5xj9ppz72hza"; }; }; @@ -292,12 +292,12 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-07-13"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "9cdc2b918bbbcadb580d9635ab6ee1accfc140dc"; - sha256 = "0nqv110n8ybh980yhxfcpzwg5bjzpiw9586bn700pw5xgnb9sf5r"; + rev = "9d61bbb9c5b25a61d57f72f94941cf1c1a531fa6"; + sha256 = "04igxs6g48vhj5rz3vy57amig18xfxdi4s06ap2fimds5d9904s0"; }; }; @@ -347,12 +347,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2019-07-08"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "8d1fe4278e4cfada080f023d71b9233dbfdfc41e"; - sha256 = "0h26x35gnrjhd3dqbza98317jjwsc70fv1sd99xhcshxfszal6vd"; + rev = "50343bf5e965e311444aade22599f9d247902852"; + sha256 = "08crsdw2cgn30j6mbkm74zsgi92khb1xdkx53gk1r33qcgbzi47y"; }; }; @@ -380,12 +380,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-07-14"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "5f8666ce03218f16e92d813767c2c6dd86dae175"; - sha256 = "1azxjdb75han6b3mvaqczzwxhaxr6qax4vy6zw7zqwqcskrakwzq"; + rev = "f7d3c25fbefdf53cd5458904209d066545dbddc0"; + sha256 = "1x3al8km0d61p2k42p5q2xkd1xx80hmhbv8l22wj6knrr9mpjmp2"; }; }; @@ -402,12 +402,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-07-04"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "79d02d8d3834c2a5fa44dde77b800de0b2d9746e"; - sha256 = "00d97qx4fvnwsh82j33p5jm0lxqadns4104jx9gzha7rmx1z62al"; + rev = "101d61e571389c427bb8f1bc3a81f446144be82f"; + sha256 = "1d7f1p2cy2kf0l2diyzz9z4zblis1iad9nnjy9cpjdcv1qfcvalg"; }; }; @@ -457,23 +457,23 @@ let coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; - version = "2019-07-14"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-smartf"; - rev = "340fc45a48a70b3f150fb385e9d6d10979132a78"; - sha256 = "1srnicdvm0l50qjx108vw8rkylp9yl29pbz890mfnp9ryz64qk06"; + rev = "12e76fcadda3f0bb16c64b2db2a1f8cd8025c47a"; + sha256 = "0dfr7dcrnf40flcvdydywy5xmpxbrfswcq6vj12kjbwkcxlisj0s"; }; }; coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-07-14"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "d1619fa8c4bb0a1ef3bffadecccb7ec8fd332b90"; - sha256 = "04bfn9aws3kqkvd4q5r963jb1rqxpayf6qxa4yxwsnkcvma2zk7y"; + rev = "6c89beeb6d654a8777385f59cd579ef34e132daf"; + sha256 = "0jr87y66miarkxsmgh16si2nshi2flla96m2w8kjlyb0ksz96kv2"; }; }; @@ -501,12 +501,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-07-13"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "65d8c479cc31fb906c10fa2762f98db8826295e1"; - sha256 = "04a07v9cwbid32zzj4zxq8xmhhxjdbi627mk9dfyj024z0nyw801"; + rev = "0bfb17e090e1dd44ec159c31968e0b5b249430eb"; + sha256 = "1psn13bqj1yxanh45g72npjbv9mzgv2fjnib0fyzvw7460bvqn8r"; }; }; @@ -523,23 +523,23 @@ let coc-tslint-plugin = buildVimPluginFrom2Nix { pname = "coc-tslint-plugin"; - version = "2019-07-11"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tslint-plugin"; - rev = "9076fb5f1bb185110eb79189d17f03e82f2d0f9c"; - sha256 = "1mxnpgvi12dvbhf9l1zwdlbmvqq8j311z4rfcgsi1p9kxm2dv56r"; + rev = "acc1356253a5088f630d9910b5fc13dc5d108bbc"; + sha256 = "1cjgimqgd70x5zhw641z6g4hc54vrkg3r4sscg092gkrdpkq3969"; }; }; coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-07-09"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "ee7f86fdf9c21001a1b322f219ec7c150d64d337"; - sha256 = "06yzqd5m3bz8lnqhrxsxmbz9n587vqjafwdfs9jkb3974ry88r5b"; + rev = "ed538dc3b55bb94efe2bc511327d81a90c00e674"; + sha256 = "06anjgidbf04g0wnxkmdzgdszn22afr3sxbsx445cvwinm2q3i87"; }; }; @@ -788,12 +788,12 @@ let deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-07-07"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "4879e34f353cc8c2ac8cb5c14e3efebc15c05ab0"; - sha256 = "12r2770b78rm9xx0pb4qgfzlyjmhdji4q6iga2pflxik6rk0gw4c"; + rev = "53ff81bd27dc86dafe209687df9ed8f3c205601c"; + sha256 = "1dq3457rd6jda4w4ajlq2gdiaz5nhcnfg4b4v47xzdcd63bcssir"; }; }; @@ -890,12 +890,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-07-15"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "7d28b9230e8db9ce9e6be566402a92612e0732e7"; - sha256 = "01krxg7va2x39bqs8mh0c7mdy56nzj84avmj4nn6xf5pz1ycdiv1"; + rev = "6e9f26a0cf5d7d60ddf04ce126e4adebe5a01cf2"; + sha256 = "10r7c2jjy2q3wq30rsv7bml0cxjs19hzrfmba4g407yckync92bi"; }; }; @@ -1212,12 +1212,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-06-13"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "e8316001e1130a042f8b4c8f49d78ed87b624f53"; - sha256 = "0p228laa5na7izink982ahksqhzwlxj8knb2wh5440z7chixmycc"; + rev = "c94e82ab8c62c2b6f09c00752199692e4af1c836"; + sha256 = "00vpwcq0ap4ss60v57gbhbdp4vx632qlfxdbc7jh0iawdpm1bdsq"; }; }; @@ -1411,12 +1411,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-07-12"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "08465b99774fe43d832492d7c354a317fc81f9bf"; - sha256 = "1gi10wnsqk6a58yy27qdn7hsy1gz2qrib5g59h8hchahdkmhgl2d"; + rev = "0add378423b813b15ff281a1b8176e95f444f301"; + sha256 = "1fjlp7h0fd6dbw32m056sy9z7745py9f091jmcspfvqj5mfpkg8f"; }; }; @@ -1433,12 +1433,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-07-15"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "284d3ee0dbdfe7b07a6a927a742d203851215ca4"; - sha256 = "05cmwnfky66p0i6jk7rc2qs5l6n0d89is3kwymg9qag2v6k8cz80"; + rev = "bc82a1c7b6d8517d4e9224a254968e0f0b334fdf"; + sha256 = "06irpk314qkpym8v0g3w6jdz9md5jawwck718zmlmh40f9gyjcz3"; }; }; @@ -1653,12 +1653,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-07-09"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "bc68b453e2e28bcaa5fa1bf841c78a0a4b0cc5ec"; - sha256 = "0y6qjj1czk2wiax60zsnjbixa3lp10y9777ll7r65jdrhjrysd7v"; + rev = "9c0dfbfc90c50ebbfbe53aa5a6094e1b1c806459"; + sha256 = "1rbfhmf1vnvn4p63q3pbdcyqnagb9kvckr0m6dp4hx9pc4d393xd"; }; }; @@ -2236,12 +2236,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-05-28"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "11aa21edef1627139d1cb39f5efd568942985dfc"; - sha256 = "10y0fhpcvb7hhqn5dw1bh8s9y6pmcgqn82hh7axkk7hydr715yfa"; + rev = "0336c35c0b10b46d85cdd9c3df721f978429e82c"; + sha256 = "1ylg8qlndz9981k48alhfh0m2cl8wxwmgfv0pqkvhpyqypd5rk2c"; }; }; @@ -2401,12 +2401,12 @@ let tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2019-03-03"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "2a3dcbc9085975c3b1c49c382f6c87c69d199a44"; - sha256 = "0w1x8gmssk28q730ij439qci0xwp4msdxwi6cdq3rndw14gabkgi"; + rev = "61e16ab1d1cb621385bc9c6a0c5e7744494ec9f5"; + sha256 = "1w6m69695f4gx7d5fg3bnabhjx1680fvrz44f65jhdh2y2njm68h"; }; }; @@ -2566,12 +2566,12 @@ let vim-addon-errorformats = buildVimPluginFrom2Nix { pname = "vim-addon-errorformats"; - version = "2019-02-09"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-errorformats"; - rev = "a95199208700cb8e274c03c711e35411d6ecbe60"; - sha256 = "1676s0m2xg3i8hmxi353iw39v3fh0gf787z09vi17nsqf8i6fdi8"; + rev = "bb83675cb0b8cc377fb0a79ba492ba2445674ba6"; + sha256 = "09cds33lb5gm69wv5plgidprm8nf52vvg9qdzpq9mihvinvj5qv7"; }; }; @@ -2852,12 +2852,12 @@ let vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; - version = "2018-06-11"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "t9md"; repo = "vim-choosewin"; - rev = "4ac141a9bb7188ebbbff90bb0a0bccd52eaa83f8"; - sha256 = "08glj4fk4jlcdqbyd77dwy3rbn3vc0fqz077fwvkxym47hfg9rqk"; + rev = "ee5690220fa712a448577522b9508e79a07830c6"; + sha256 = "1w42lm1rg6002030rigs5pvqf98wdpljm1pyzzikl6hgarv3c8q1"; }; }; @@ -3028,12 +3028,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-07-01"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "5b58b6dc290ece1c37e806e46ee117f5722a535a"; - sha256 = "17lzf60lm7z4r5cmfdb5di1c1rabczsjq5i0qck4l6j3xlv449xj"; + rev = "0722f74ec551b0526c9f136f3aeae8db9726db6a"; + sha256 = "0b699g537v2sja6qj12sndhas5fxiwhyn443w9ylrfn0b8vs9a93"; }; }; @@ -3149,12 +3149,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-12"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "e289d119906796550beedc133419109820b05bda"; - sha256 = "18963xg6cv3wkrx044lxsvwdc08sw3jg2r0ns5si61hh35rq065j"; + rev = "5aed1bc834456a5517221ba82f57d2577e8c932c"; + sha256 = "0gdghfpxkxx4hfsr5liqjqb8sg1qjhaadb9vqh30rhl08q47zdlk"; }; }; @@ -3215,12 +3215,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-13"; + version = "2019-07-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4da9fb8f43869125f6e1bb1ff8dd27f315623835"; - sha256 = "001jl2cvdwszhhjfjmb4mkvffkq28mqc72bgy12119zprc8z3kaa"; + rev = "adba9c6345af58b31bcba8599b5bb162575d5755"; + sha256 = "1x7rjh45npsvylcbhfyxcxpa8lhb5l8jal6x6cx4rbc6csw65nb2"; }; }; @@ -3292,12 +3292,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-07-15"; + version = "2019-07-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d42c9586ce9fe170baa62fe22ea3ecf66417f908"; - sha256 = "15x6wh8yvysrryj18dpzr6l0x06jnc6llh0shg3mcgb1vlfwl8v2"; + rev = "043984a5117262c74f8b9c85f1e15dc1a7e51872"; + sha256 = "18clcqa0dz49kkp678k0x5sx7w8salk7j25gmcws66alr2lrb4fs"; }; }; @@ -3942,12 +3942,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-07-09"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "fddbcb8f1a37e216504b3d14859a0a992a81cd5d"; - sha256 = "1ijdmp081r9dpn4ryr6j36s56ahz3lnn9g72akby4hj6da1bj4mb"; + rev = "226d6abeb2f02bcd8f5b11288543259fa2e02962"; + sha256 = "1iy0qj7wjbhp7byann4qyww5cyqrb9hsb1wm1j4ihzgrv1yw1qx3"; }; }; @@ -3986,12 +3986,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-06-19"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "92ff29c0c0085ac922cad1a24cf0b0bf69751b4d"; - sha256 = "0dj8806k7dnm0y22a6c3mdv61sa4rz8vi1y6sfawa7y58nh50az4"; + rev = "e07013ac9ed5ff998c62f5fe12800eb31b083f12"; + sha256 = "1bmcw4pawniwn01gvcxd98wp7pksd9ncqmiajvxb2pgnanpl5dk8"; }; }; @@ -4129,12 +4129,12 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2018-12-19"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "386f19cd92f7b30cd830784ae22ebbe7033564aa"; - sha256 = "122bnx9j1pdgpkfph48l4zngak1hjlijbksim05iypi7sd0bvix9"; + rev = "71195d60792fbfcd30edb25fdfc89eadf3e400a5"; + sha256 = "084vz719af6vhlrgzv0bvl9qg53p1mz1942lqj1pfc3p99w22v47"; }; }; @@ -4228,12 +4228,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-07-13"; + version = "2019-07-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "d693695ae9375794a3a0b572fd65e86bfb56ed61"; - sha256 = "0xlhkmaxssifqjq6cgi35iwrckasqszpn54ji8rjmhi9wm9w4p57"; + rev = "84ab7e118ca5fee5a67ce4c884c0c1d5c9308e21"; + sha256 = "1ya7y9alzqqy8cpz1sljaqmh8f8pnd5pap9fmg99awr7bpn431rc"; }; }; @@ -4657,12 +4657,12 @@ let vimshell-vim = buildVimPluginFrom2Nix { pname = "vimshell-vim"; - version = "2019-07-07"; + version = "2019-07-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimshell.vim"; - rev = "8aa928d4652286ad3106f6ef2cbbbf7eadec5a52"; - sha256 = "1qwccpsfjsap8lggq8k9cmvdzq1mgn1ss4bsdplk1pj7prlj9pxb"; + rev = "ee683538f57aaf5094db9860f67f4957a763ffb4"; + sha256 = "0inf9xx6ni1scxkn0b78qq0234r0ybrwpphyzcafw7i8kzisbn26"; }; }; @@ -4823,12 +4823,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-07-05"; + version = "2019-07-15"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "04c3505129cd80b92f1b6177dca8aecc55cb0760"; - sha256 = "09ws8m6s7lzs2174xanrcz8jd6sfczisv3zb5czskizkgph6vkkj"; + rev = "fa92f40d0209469a037196fdc3d949ae29d0c30a"; + sha256 = "01zmslcd0mmws0s67555i3xay4xyv0km7lfwlydi3zmalvjfn8dd"; fetchSubmodules = true; }; }; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 880b620d87c..82b0bb2f356 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "17"; + version = "21"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "19q5f1c658jdxvr2k2rb2xsnspybqjii4rifnlkzi1qzh0r152md"; + sha256 = "14lgjv0gxvfa1h5hsarh9nwpxns6jb2861nd7mcanpkm2jlxh5vm"; fetchSubmodules = true; }; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; postInstall = '' install -Dm644 $src/README.md $out/share/doc/dbus-broker/README diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index f69b3637f95..2d9f6b11b27 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "An open-source fulltext search engine and column store"; license = licenses.lgpl21; maintainers = [ maintainers.ericsagnes ]; - platforms = platforms.linux; + platforms = platforms.unix; longDescription = '' Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 44eb3731d37..f8a68bc6f64 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -2,6 +2,7 @@ , python , groff , less +, fetchpatch }: let @@ -27,6 +28,11 @@ let inherit version; sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; }; + # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 + patches = lib.singleton (fetchpatch { + url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; + sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; + }); }); }; }; diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index 4452aea280a..1ed5e48077b 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchFromGitHub, python2Packages, opencv3 }: +{ stdenv, fetchFromGitHub, pythonPackages, opencv3 }: let - opencv3_ = python2Packages.toPythonModule (opencv3.override { + opencv3_ = pythonPackages.toPythonModule (opencv3.override { + inherit pythonPackages; enablePython = true; - pythonPackages = python2Packages; enableFfmpeg = true; }); -in stdenv.mkDerivation rec { +in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.3.7"; + version = "0.3.9.1"; + + format = "other"; src = fetchFromGitHub { owner = "svsdval"; repo = pname; rev = version; - sha256 = "00ms9iqam3ml6fxf8djki3gyifn8sfzfkkfrdgrvs0sq47wrkc39"; + sha256 = "1ndzhfng8z5080n1xkcavw21dm6rjz0x1954v9llifsdmf4cpn8y"; }; - pythonPath = with python2Packages; [ opencv3_ midiutil pygame pyopengl ]; - nativeBuildInputs = with python2Packages; [ python wrapPython ]; + propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; installPhase = '' install -Dm755 v2m.py $out/bin/v2m.py - wrapPythonPrograms ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 196e15a0133..ac01dc6022b 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.4"; + version = "2.6.5"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "10djjpdv27kzjaa1saf1gq1g1yy4gj8qzjscyjh63r1kycflwnw5"; + sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 033db7c18c2..8fb002b2d7f 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "s3backer-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { - sha256 = "0rfbylahnhv8sy9a8zkkfpyavf07dq3sdq060wrxnxbpad6qf91q"; + sha256 = "1axxnhhf335xckwn43csqmvf1454izbk9dglc3r7isrk0lz1ricc"; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 03f9354445b..ea596a94213 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2019.3"; + version = "2019.7"; src = fetchurl { url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1ry9f08584vngznbja76z53as12q2i06ncfnf52dxyidfgw5mx65"; + sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; }; buildInputs = [ file desktop-file-utils ]; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 2ea93319935..8365a47830a 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -2,11 +2,11 @@ , tcl-8_5, darwin }: stdenv.mkDerivation rec { - name = "rrdtool-1.7.1"; + name = "rrdtool-1.7.2"; src = fetchurl { url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "1bhsg119j94xwykp2sbp01hhxcg78gzblfn7j98slrv9va77g6wq"; + sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 9c6f5eec11b..524b75d5582 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -5,14 +5,14 @@ , openssl, libsigcxx, zlib }: stdenv.mkDerivation rec { - name = "libtorrent-${version}"; - version = "0.13.7"; + pname = "libtorrent"; + version = "0.13.8"; src = fetchFromGitHub { owner = "rakshasa"; - repo = "libtorrent"; + repo = pname; rev = "v${version}"; - sha256 = "027qanwcisxhx0bq8dn8cpg8563q0k2pm8ls278f04n7jqvvwkp0"; + sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/rakshasa/libtorrent"; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 63652557efa..2ca31a6a1e7 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "rtorrent-${version}"; - version = "0.9.7"; + pname = "rtorrent"; + version = "0.9.8"; src = fetchFromGitHub { owner = "rakshasa"; - repo = "rtorrent"; + repo = pname; rev = "v${version}"; - sha256 = "0a9dk3cz56f7gad8ghsma79iy900rwdvzngs6k6x08nlwaqid8ga"; + sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix new file mode 100644 index 00000000000..ae8dfc59075 --- /dev/null +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, buildPythonApplication, fetchFromGitHub +, vdf, wine, winetricks, zenity +}: + +buildPythonApplication rec { + pname = "protontricks"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "Matoking"; + repo = pname; + rev = version; + sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn"; + }; + + propagatedBuildInputs = [ vdf ]; + + # The wine install shipped with Proton must run under steam's + # chrootenv, but winetricks and zenity break when running under + # it. See https://github.com/NixOS/nix/issues/902. + # + # The current workaround is to use wine from nixpkgs + makeWrapperArgs = [ + "--set STEAM_RUNTIME 0" + "--set-default WINE ${wine}/bin/wine" + "--set-default WINESERVER ${wine}/bin/wineserver" + "--prefix PATH : ${lib.makeBinPath [ + (winetricks.override { inherit wine; }) + zenity + ]}" + ]; + + meta = with stdenv.lib; { + description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; + homepage = https://github.com/Matoking/protontricks; + license = licenses.gpl3; + platforms = with platforms; linux; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index eb537c67a63..7254660cb1a 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc-O3.patch ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + meta = with stdenv.lib; { homepage = http://www.phontron.com/kytea/; description = "General toolkit developed for analyzing text"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ericsagnes ndowens ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03ae106c481..d893a5a52d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1944,9 +1944,9 @@ in enableExtraPlugins = true; }); - asciidoctor = callPackage ../tools/typesetting/asciidoctor { + asciidoctor = callPackage ../tools/typesetting/asciidoctor { # kindlegen is unfree, don't enable by default - kindlegen = null; + kindlegen = null; # epubcheck pulls in Java, which is problematic on some platforms epubcheck = null; }; @@ -5491,6 +5491,10 @@ in pythonSexy = pythonPackages.libsexy; + pyditz = callPackage ../applications/misc/pyditz { + pythonPackages = python27Packages; + }; + pytrainer = callPackage ../applications/misc/pytrainer { }; pywal = with python3Packages; toPythonApplication pywal; @@ -6512,7 +6516,9 @@ in vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; - video2midi = callPackage ../tools/audio/video2midi { }; + video2midi = callPackage ../tools/audio/video2midi { + pythonPackages = python3Packages; + }; vifm = callPackage ../applications/misc/vifm { }; @@ -8100,6 +8106,9 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-raze = callPackage ../development/tools/rust/cargo-raze { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; @@ -8304,6 +8313,10 @@ in duktape = callPackage ../development/interpreters/duktape { }; + evcxr = callPackage ../development/interpreters/evcxr { + inherit (darwin.apple_sdk.frameworks) Security; + }; + beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) @@ -16624,7 +16637,9 @@ in plano-theme = callPackage ../data/themes/plano { }; - plata-theme = callPackage ../data/themes/plata {}; + plata-theme = callPackage ../data/themes/plata { + inherit (mate) marco; + }; poly = callPackage ../data/fonts/poly { }; @@ -21813,6 +21828,8 @@ in newtonwars = callPackage ../games/newtonwars { }; + nxengine-evo = callPackage ../games/nxengine-evo { }; + odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { }; @@ -22028,6 +22045,12 @@ in gtk = pkgs.gtk3; }; + protontricks = callPackage ../tools/package-management/protontricks { + inherit (python3Packages) buildPythonApplication vdf; + inherit (gnome3) zenity; + wine = wineWowPackages.minimal; + }; + stepmania = callPackage ../games/stepmania { ffmpeg = ffmpeg_2; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fdff7d770db..2cc3e62d2da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1168,6 +1168,8 @@ in { pyunifi = callPackage ../development/python-modules/pyunifi { }; + vdf = callPackage ../development/python-modules/vdf { }; + vidstab = callPackage ../development/python-modules/vidstab { }; webapp2 = callPackage ../development/python-modules/webapp2 { }; @@ -1671,6 +1673,8 @@ in { cerberus = callPackage ../development/python-modules/cerberus { }; + cerberus11 = callPackage ../development/python-modules/cerberus11 { }; + certifi = callPackage ../development/python-modules/certifi { }; characteristic = callPackage ../development/python-modules/characteristic { }; @@ -2777,6 +2781,8 @@ in { django-sr = callPackage ../development/python-modules/django-sr { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; + django_tagging = callPackage ../development/python-modules/django_tagging { }; django_tagging_0_4_3 = if |