From 66b07e41e633bb6df1f1a57aa46856e7248da0da Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Sun, 6 Aug 2017 15:21:01 -0700 Subject: [PATCH 001/197] nixos/mosquitto: Add checkPasswords option Related to https://github.com/NixOS/nixpkgs/issues/27130. Adds an option to NixOS configuration option to have Mosquitto use the password file that it generates. When this option is false the Mosquitto server will accept login attempts with any username and any password. This option defaults to false because this matches the behavior of the service prior to the introduction of this option. When the `services.mosquitto.checkPasswords` is true, the server will only accept valid usernames and passwords. --- nixos/modules/services/networking/mosquitto.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 5451500b56f6..9aef726b268c 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -12,6 +12,10 @@ let keyfile ${cfg.ssl.keyfile} ''; + passwordConf = optionalString cfg.checkPasswords '' + password_file ${cfg.dataDir}/passwd + ''; + mosquittoConf = pkgs.writeText "mosquitto.conf" '' pid_file /run/mosquitto/pid acl_file ${aclFile} @@ -19,6 +23,7 @@ let allow_anonymous ${boolToString cfg.allowAnonymous} bind_address ${cfg.host} port ${toString cfg.port} + ${passwordConf} ${listenerConf} ${cfg.extraConf} ''; @@ -153,6 +158,15 @@ in ''; }; + checkPasswords = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Refuse connection when clients provide incorrect passwords. + ''; + }; + extraConf = mkOption { default = ""; type = types.lines; From 02d52d8f931c7548d5f4c012b4ee9781d79424d3 Mon Sep 17 00:00:00 2001 From: Daniel Wilson-Thomas Date: Sat, 12 Aug 2017 21:59:47 -0400 Subject: [PATCH 002/197] Literate: init --- .../literate-programming/Literate/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/tools/literate-programming/Literate/default.nix diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix new file mode 100644 index 000000000000..28ef14a80cc3 --- /dev/null +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchgit, dmd, dub }: + +stdenv.mkDerivation { + name = "Literate"; + src = fetchgit { + url = "https://github.com/zyedidia/Literate.git"; + rev = "23928d64bb19b5101dbcc794da6119beaf59f679"; + sha256 = "094lramvacarzj8443ns18zyv7dxnivwi7kdk5xi5r2z4gx338iq"; + }; + buildInputs = [dmd dub]; + preInstall = '' + # Gross, but the Makefile doesn't provide an install target + mkdir $out + cp -R bin $out/bin + ''; + phases = "unpackPhase patchPhase buildPhase checkPhase preInstall fixupPhase"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6ae62db18db..87fc89e4eae0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7019,6 +7019,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; + lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; From 916f1a0b8dcf94e2836c33ddd256532a7248b56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 27 Aug 2017 07:25:05 +0100 Subject: [PATCH 003/197] Literate: adapt to nixpkgs standards --- .../literate-programming/Literate/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 28ef14a80cc3..4bc3e77dbaa7 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,17 +1,22 @@ { stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { - name = "Literate"; + name = "Literate-2017-05-28"; + src = fetchgit { url = "https://github.com/zyedidia/Literate.git"; rev = "23928d64bb19b5101dbcc794da6119beaf59f679"; sha256 = "094lramvacarzj8443ns18zyv7dxnivwi7kdk5xi5r2z4gx338iq"; }; - buildInputs = [dmd dub]; - preInstall = '' - # Gross, but the Makefile doesn't provide an install target - mkdir $out - cp -R bin $out/bin - ''; - phases = "unpackPhase patchPhase buildPhase checkPhase preInstall fixupPhase"; + + buildInputs = [ dmd dub ]; + + installPhase = "install -D bin/lit $out/bin/lit"; + + meta = with stdenv.lib; { + description = "A literate programming tool for any language"; + homepage = http://literate.zbyedidia.webfactional.com/; + license = licenses.mit; + platforms = platforms.unix; + }; } From 232ff39115b9d36c55d2c170e5d785b5247c6c8d Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Thu, 11 May 2017 14:37:59 -0400 Subject: [PATCH 004/197] darwin: trash 0.9.0 --- pkgs/os-specific/darwin/trash/default.nix | 38 +++++++++++++++++++++++ pkgs/os-specific/darwin/trash/trash.diff | 13 ++++++++ pkgs/top-level/darwin-packages.nix | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/os-specific/darwin/trash/default.nix create mode 100644 pkgs/os-specific/darwin/trash/trash.diff diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix new file mode 100644 index 000000000000..4104d0d455ad --- /dev/null +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, frameworks, perl } : +stdenv.mkDerivation rec { + version = "0.9.0"; + name = "trash-${version}"; + + src = fetchFromGitHub { + owner = "ali-rantakari"; + repo = "trash"; + rev = "f68ad25a02e24cc58eb8ef9a493d6dc0122bcd8f"; + sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; + }; + + buildInputs = with frameworks; [ + Cocoa + AppKit + ScriptingBridge + perl + ]; + + patches = [ ./trash.diff ]; + + buildPhase = ''make all docs''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + install -m 0755 trash $out/bin + install -m 0444 trash.1 $out/share/man/man1 + ''; + + meta = { + homepage = https://github.com/ali-rantakari/trash; + description = "Small command-line program for OS X that moves files or + folders to the trash."; + platforms = stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff new file mode 100644 index 000000000000..546c760b10e3 --- /dev/null +++ b/pkgs/os-specific/darwin/trash/trash.diff @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 5e4306f..9c975fc 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,7 @@ trash: $(SOURCE_FILES) + @echo + @echo ---- Compiling: + @echo ====================================== +- $(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) ++ $(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) + + analyze: + @echo diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 32d540a8f967..3c0ee5802745 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -49,6 +49,8 @@ in swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { }; + trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; }; + usr-include = callPackage ../os-specific/darwin/usr-include { }; xcode = callPackage ../os-specific/darwin/xcode { }; From 6ae70046d60d98711d08fb8a5b9cd58ea5c32e26 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 30 Dec 2017 19:54:35 +0100 Subject: [PATCH 005/197] bitlbee-discord: init at 2017-12-27 --- .../bitlbee-discord/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix new file mode 100644 index 000000000000..00636c7c1e9a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "bitlbee-discord-2017-12-27"; + + src = fetchFromGitHub { + rev = "6a03db169ad44fee55609ecd16e19f3c0f99a182"; + owner = "sm00th"; + repo = "bitlbee-discord"; + sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bitlbee glib ]; + + preConfigure = '' + export BITLBEE_PLUGINDIR=$out/lib/bitlbee + ./autogen.sh + ''; + + meta = { + description = "Bitlbee plugin for Discord"; + + homepage = https://github.com/sm00th/bitlbee-discord; + license = licenses.gpl2Plus; + maintainers = [ maintainers.lassulus ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff92151ee450..b658c9ac8a2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14159,6 +14159,8 @@ with pkgs; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { }; + bitlbee-discord = callPackage ../applications/networking/instant-messengers/bitlbee-discord { }; + bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { }; bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { }; From 95913d27689c506da5f3716394f1814ba66e9f50 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 18 Dec 2017 19:07:46 +0100 Subject: [PATCH 006/197] elk: 5.6.1 -> 5.6.5 https://www.elastic.co/guide/en/elasticsearch/reference/5.6/release-notes-5.6.0.html https://www.elastic.co/guide/en/logstash/5.6/logstash-5-6-5.html https://www.elastic.co/guide/en/kibana/5.6/release-notes-5.6.5.html https://www.elastic.co/guide/en/beats/libbeat/5.6/release-notes-5.6.5.html --- pkgs/development/tools/misc/kibana/5.x.nix | 6 +++--- pkgs/misc/logging/beats/default.nix | 2 +- pkgs/servers/search/elasticsearch/5.x.nix | 2 +- pkgs/tools/misc/logstash/5.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 735f85f74569..428f24cd4e92 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "02dhhp16pmkrpi2dfrca9qzz1q7jrxhaw6l3cfflgxx77hz0hlnw"; - "i686-linux" = "1h1zr342dq7nngvzpf9pn9mvwsi7aksa3qjyqpcc4yvbmmyrlk0m"; - "x86_64-darwin" = "0van8cnir6s520crc20bf2clbkf822c3ylpk7iiq7da8hwvsypp9"; + "x86_64-linux" = "09bck05dfq4j1csyghlpw86nzn28kpx8ikli3v1s4si2hbxb1ifr"; + "i686-linux" = "0ql1611wg7i9vwqr4wmz04606hjj7w224ak34svfsn6qxyrh2dbb"; + "x86_64-darwin" = "1x24rqkkc9slm7jbyy41q5c2rbn17h85m0k6h3ijiafky6cv0cz2"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix index e3333fa5caac..ed2a2eadb65a 100644 --- a/pkgs/misc/logging/beats/default.nix +++ b/pkgs/misc/logging/beats/default.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1lbdi4c0y4bfkmim9q98ravknv4yw0dl3z57c3w5aqhi2sx0w23h"; + sha256 = "0pp4in66byggcfmvf8yx0m1vra98cs77m7mbr45sdla4hinvaqar"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index fb988b546308..e6bbc787251d 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0pvi6akicg0i3bz3lbc6k9rznxw7d25flg9wbs2dyxv8i2rrqvq0"; + sha256 = "1cks75227mxyri2r0hykc7jlvk6c4f4vaxh14mgmfmw4krwvrzxs"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 4ecc0be783eb..da165446d397 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "11qg8i0svsccr1wd0yj0ivfzpza2hd68221g38v88shvj0bb737f"; + sha256 = "18k2bhyzpxc2pad64wz0rpy43xp0nv843igjflav53jsglifh1yk"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c77658244dfc..4735f583b01b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1948,7 +1948,7 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.1"; + elk5Version = "5.6.5"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; From 803077ef1cdac1dc7f0bc9224adbb0de45f6bffc Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 18 Dec 2017 20:53:54 +0100 Subject: [PATCH 007/197] elk: add elasticsearch6, logstash6, kibana6 and the beats at v6.1.0 This change is backwards compatible since the ELK tools at version 5.x remain unchanged. The test suite now both tests ELK-5 and ELK-6. --- .../modules/services/search/elasticsearch.nix | 8 +- nixos/release.nix | 2 +- nixos/tests/elk.nix | 172 ++++++++++-------- pkgs/development/tools/misc/kibana/6.x.nix | 40 ++++ .../logging/beats/{default.nix => 5.x.nix} | 0 pkgs/misc/logging/beats/6.x.nix | 42 +++++ pkgs/servers/search/elasticsearch/6.x.nix | 45 +++++ .../search/elasticsearch/es-home-6.x.patch | 26 +++ pkgs/tools/misc/logstash/6.x.nix | 39 ++++ pkgs/top-level/all-packages.nix | 17 +- 10 files changed, 306 insertions(+), 85 deletions(-) create mode 100644 pkgs/development/tools/misc/kibana/6.x.nix rename pkgs/misc/logging/beats/{default.nix => 5.x.nix} (100%) create mode 100644 pkgs/misc/logging/beats/6.x.nix create mode 100644 pkgs/servers/search/elasticsearch/6.x.nix create mode 100644 pkgs/servers/search/elasticsearch/es-home-6.x.patch create mode 100644 pkgs/tools/misc/logstash/6.x.nix diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index c51dd5d94655..adef500b7b5c 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -6,6 +6,7 @@ let cfg = config.services.elasticsearch; es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0; + es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0; esConfig = '' network.host: ${cfg.listenAddress} @@ -92,8 +93,6 @@ in { node.name: "elasticsearch" node.master: true node.data: false - index.number_of_shards: 5 - index.number_of_replicas: 1 ''; }; @@ -165,7 +164,10 @@ in { path = [ pkgs.inetutils ]; environment = { ES_HOME = cfg.dataDir; - ES_JAVA_OPTS = toString ([ "-Des.path.conf=${configDir}" ] ++ cfg.extraJavaOptions); + ES_JAVA_OPTS = toString ( optional (!es6) [ "-Des.path.conf=${configDir}" ] + ++ cfg.extraJavaOptions); + } // optionalAttrs es6 { + ES_PATH_CONF = configDir; }; serviceConfig = { ExecStart = "${cfg.package}/bin/elasticsearch ${toString cfg.extraCmdLineOptions}"; diff --git a/nixos/release.nix b/nixos/release.nix index cf3fe6abd48c..33916243e97b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -260,7 +260,7 @@ in rec { tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; - tests.elk = hydraJob (import tests/elk.nix { system = "x86_64-linux"; }); + tests.elk = callSubTests tests/elk.nix { system = "x86_64-linux"; }; tests.env = callTest tests/env.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 65ff1cac070b..ed656b3628b9 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -1,95 +1,107 @@ -# Test the ELK stack: Elasticsearch, Logstash and Kibana. - -import ./make-test.nix ({ pkgs, ...} : +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; let esUrl = "http://localhost:9200"; -in { - name = "ELK"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow offline basvandijk ]; - }; - nodes = { - one = - { config, pkgs, ... }: { - # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: - # - # OpenJDK 64-Bit Server VM warning: - # INFO: os::commit_memory(0x0000000085330000, 2060255232, 0) - # failed; error='Cannot allocate memory' (errno=12) - # - # There is insufficient memory for the Java Runtime Environment to continue. - # Native memory allocation (mmap) failed to map 2060255232 bytes for committing reserved memory. - # - # When setting this to 2500 I got "Kernel panic - not syncing: Out of - # memory: compulsory panic_on_oom is enabled" so lets give it even a - # bit more room: - virtualisation.memorySize = 3000; + mkElkTest = name : elk : makeTest { + inherit name; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow offline basvandijk ]; + }; + nodes = { + one = + { config, pkgs, ... }: { + # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: + # + # OpenJDK 64-Bit Server VM warning: + # INFO: os::commit_memory(0x0000000085330000, 2060255232, 0) + # failed; error='Cannot allocate memory' (errno=12) + # + # There is insufficient memory for the Java Runtime Environment to continue. + # Native memory allocation (mmap) failed to map 2060255232 bytes for committing reserved memory. + # + # When setting this to 2500 I got "Kernel panic - not syncing: Out of + # memory: compulsory panic_on_oom is enabled" so lets give it even a + # bit more room: + virtualisation.memorySize = 3000; - # For querying JSON objects returned from elasticsearch and kibana. - environment.systemPackages = [ pkgs.jq ]; + # For querying JSON objects returned from elasticsearch and kibana. + environment.systemPackages = [ pkgs.jq ]; - services = { - logstash = { - enable = true; - package = pkgs.logstash5; - inputConfig = '' - exec { command => "echo -n flowers" interval => 1 type => "test" } - exec { command => "echo -n dragons" interval => 1 type => "test" } - ''; - filterConfig = '' - if [message] =~ /dragons/ { - drop {} - } - ''; - outputConfig = '' - file { - path => "/tmp/logstash.out" - codec => line { format => "%{message}" } - } - elasticsearch { - hosts => [ "${esUrl}" ] - } - ''; - }; + services = { + logstash = { + enable = true; + package = elk.logstash; + inputConfig = '' + exec { command => "echo -n flowers" interval => 1 type => "test" } + exec { command => "echo -n dragons" interval => 1 type => "test" } + ''; + filterConfig = '' + if [message] =~ /dragons/ { + drop {} + } + ''; + outputConfig = '' + file { + path => "/tmp/logstash.out" + codec => line { format => "%{message}" } + } + elasticsearch { + hosts => [ "${esUrl}" ] + } + ''; + }; - elasticsearch = { - enable = true; - package = pkgs.elasticsearch5; - }; + elasticsearch = { + enable = true; + package = elk.elasticsearch; + }; - kibana = { - enable = true; - package = pkgs.kibana5; - elasticsearch.url = esUrl; + kibana = { + enable = true; + package = elk.kibana; + elasticsearch.url = esUrl; + }; }; }; - }; - }; + }; - testScript = '' - startAll; + testScript = '' + startAll; - $one->waitForUnit("elasticsearch.service"); + $one->waitForUnit("elasticsearch.service"); - # Continue as long as the status is not "red". The status is probably - # "yellow" instead of "green" because we are using a single elasticsearch - # node which elasticsearch considers risky. - # - # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green". - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red"); + # Continue as long as the status is not "red". The status is probably + # "yellow" instead of "green" because we are using a single elasticsearch + # node which elasticsearch considers risky. + # + # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green". + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red"); - # Perform some simple logstash tests. - $one->waitForUnit("logstash.service"); - $one->waitUntilSucceeds("cat /tmp/logstash.out | grep flowers"); - $one->waitUntilSucceeds("cat /tmp/logstash.out | grep -v dragons"); + # Perform some simple logstash tests. + $one->waitForUnit("logstash.service"); + $one->waitUntilSucceeds("cat /tmp/logstash.out | grep flowers"); + $one->waitUntilSucceeds("cat /tmp/logstash.out | grep -v dragons"); - # See if kibana is healthy. - $one->waitForUnit("kibana.service"); - $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green"); + # See if kibana is healthy. + $one->waitForUnit("kibana.service"); + $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green"); - # See if logstash messages arive in elasticsearch. - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); - ''; -}) + # See if logstash messages arive in elasticsearch. + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + ''; + }; +in mapAttrs mkElkTest { + "ELK-5" = { + elasticsearch = pkgs.elasticsearch5; + logstash = pkgs.logstash5; + kibana = pkgs.kibana5; + }; + "ELK-6" = { + elasticsearch = pkgs.elasticsearch6; + logstash = pkgs.logstash6; + kibana = pkgs.kibana6; + }; +} diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix new file mode 100644 index 000000000000..64aeb38439e2 --- /dev/null +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -0,0 +1,40 @@ +{ stdenv, makeWrapper, fetchurl, elk6Version, nodejs, coreutils, which }: + +with stdenv.lib; +let + inherit (builtins) elemAt; + info = splitString "-" stdenv.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = { + "x86_64-linux" = "08lkjj9h4ij25b53bgdz825j2ccymlllijbhv9kw1q1liv2irr34"; + "x86_64-darwin" = "1iqzj01s9walj5arfdlw0dgbmrv6mjp64mch11rx5aybcafv4z9h"; + }; +in stdenv.mkDerivation rec { + name = "kibana-${version}"; + version = elk6Version; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/kibana $out/bin + mv * $out/libexec/kibana/ + rm -r $out/libexec/kibana/node + makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/5.x.nix similarity index 100% rename from pkgs/misc/logging/beats/default.nix rename to pkgs/misc/logging/beats/5.x.nix diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix new file mode 100644 index 000000000000..d9fa98c1497e --- /dev/null +++ b/pkgs/misc/logging/beats/6.x.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap }: + +let beat = package : extraArgs : buildGoPackage (rec { + name = "${package}-${version}"; + version = elk6Version; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "0pp4in66byggcfmvf8yx0m1vra98cs77m7mbr45sdla4hinvaqar"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ package ]; + + meta = with stdenv.lib; { + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; + } // extraArgs); +in { + filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat = beat "packetbeat" { + buildInputs = [ libpcap ]; + meta.description = "Network packet analyzer that ships data to Elasticsearch"; + meta.longDescription = '' + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + }; +} diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix new file mode 100644 index 000000000000..3b7ff42d4e32 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux, getopt }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = elk6Version; + name = "elasticsearch-${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; + sha256 = "1mq8lnpv5y82a7d8vxn5np6hrg2pys22v85l5l9jynk3k0kgwyf8"; + }; + + patches = [ ./es-home-6.x.patch ]; + + postPatch = '' + sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env + ''; + + buildInputs = [ makeWrapper jre_headless ] ++ + (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + + installPhase = '' + mkdir -p $out + cp -R bin config lib modules plugins $out + + chmod -x $out/bin/*.* + + wrapProgram $out/bin/elasticsearch \ + ${if (!stdenv.isDarwin) + then ''--prefix PATH : "${utillinux}/bin/"'' + else ''--prefix PATH : "${getopt}/bin"''} \ + --set JAVA_HOME "${jre_headless}" \ + --set ES_JVM_OPTIONS "$out/config/jvm.options" + + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" + ''; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ apeschar basvandijk ]; + }; +} diff --git a/pkgs/servers/search/elasticsearch/es-home-6.x.patch b/pkgs/servers/search/elasticsearch/es-home-6.x.patch new file mode 100644 index 000000000000..aba8d396a69c --- /dev/null +++ b/pkgs/servers/search/elasticsearch/es-home-6.x.patch @@ -0,0 +1,26 @@ +diff -Naur a/bin/elasticsearch-env b/bin/elasticsearch-env +--- a/bin/elasticsearch-env 2017-12-12 13:31:51.000000000 +0100 ++++ b/bin/elasticsearch-env 2017-12-18 19:51:12.282809695 +0100 +@@ -19,18 +19,10 @@ + fi + done + +-# determine Elasticsearch home; to do this, we strip from the path until we find +-# bin, and then strip bin (there is an assumption here that there is no nested +-# directory under bin also named bin) +-ES_HOME=`dirname "$SCRIPT"` +- +-# now make ES_HOME absolute +-ES_HOME=`cd "$ES_HOME"; pwd` +- +-while [ "`basename "$ES_HOME"`" != "bin" ]; do +- ES_HOME=`dirname "$ES_HOME"` +-done +-ES_HOME=`dirname "$ES_HOME"` ++if [ -z "$ES_HOME" ]; then ++ echo "You must set the ES_HOME var" >&2 ++ exit 1 ++fi + + # now set the classpath + ES_CLASSPATH="$ES_HOME/lib/*" diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix new file mode 100644 index 000000000000..3a05bedbdffd --- /dev/null +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, elk6Version, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = elk6Version; + name = "logstash-${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = "1s2w8d2siryg2wy8i9lwqbp4mjf1sv80lf3sllxwa2vqwsv6l64p"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + buildInputs = [ + makeWrapper jre + ]; + + installPhase = '' + mkdir -p $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = https://www.elastic.co/products/logstash; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4735f583b01b..ac7a2fc397c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -741,12 +741,23 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats { }) + inherit (callPackages ../misc/logging/beats/5.x.nix { }) filebeat heartbeat metricbeat packetbeat; + inherit (let beats6 = callPackages ../misc/logging/beats/6.x.nix { }; in { + filebeat6 = beats6.filebeat; + heartbeat6 = beats6.heartbeat; + metricbeat6 = beats6.metricbeat; + packetbeat6 = beats6.packetbeat; + }) + filebeat6 + heartbeat6 + metricbeat6 + packetbeat6; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -1949,10 +1960,12 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.5"; + elk6Version = "6.1.0"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; + elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } @@ -2956,6 +2969,7 @@ with pkgs; kibana = callPackage ../development/tools/misc/kibana { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -3022,6 +3036,7 @@ with pkgs; logstash = callPackage ../tools/misc/logstash { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; From e8e88c43f61fd367e5c856bc29166cab5b29e048 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 2 Jan 2018 01:21:55 +0100 Subject: [PATCH 008/197] elk: 6.1.0 -> 6.1.1 --- pkgs/development/tools/misc/kibana/6.x.nix | 4 ++-- pkgs/misc/logging/beats/6.x.nix | 2 +- pkgs/servers/search/elasticsearch/6.x.nix | 2 +- pkgs/tools/misc/logstash/6.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 64aeb38439e2..bfa1d92eb52a 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "08lkjj9h4ij25b53bgdz825j2ccymlllijbhv9kw1q1liv2irr34"; - "x86_64-darwin" = "1iqzj01s9walj5arfdlw0dgbmrv6mjp64mch11rx5aybcafv4z9h"; + "x86_64-linux" = "0847flk4sfimcdx9wqkaglk7bvbnz1iyindz10z0d1fvbldivp46"; + "x86_64-darwin" = "03f7l91r6nczzzlqxsxkpzzwafpy45fx4lss4g6kg022rwisdma7"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index d9fa98c1497e..48c2fb6973fe 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0pp4in66byggcfmvf8yx0m1vra98cs77m7mbr45sdla4hinvaqar"; + sha256 = "1vifxa0v6ha29ijvgnrkx02syckhydg6vjxjqbm8y8zysvnh1869"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 3b7ff42d4e32..23d60ca0bef3 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "1mq8lnpv5y82a7d8vxn5np6hrg2pys22v85l5l9jynk3k0kgwyf8"; + sha256 = "1dkl7crha5g8h9c1zs1ahcmv221cpipzkvk574g99gdi586ckb8c"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 3a05bedbdffd..b59fb9012efa 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "1s2w8d2siryg2wy8i9lwqbp4mjf1sv80lf3sllxwa2vqwsv6l64p"; + sha256 = "07apb0135rlbraqw3pmwf13jjhzgflr6qik0b0qxp8im0hwx082p"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac7a2fc397c4..cea9e87fef40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1960,7 +1960,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.5"; - elk6Version = "6.1.0"; + elk6Version = "6.1.1"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; From 6ea37497cd2f95c774579122cf8f97621b9cf691 Mon Sep 17 00:00:00 2001 From: Test Date: Tue, 2 Jan 2018 17:42:21 -0600 Subject: [PATCH 009/197] loosen version bounds for lzma test dependencies --- .../haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/patches/lzma-tests.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/lzma-tests.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0ff5d4f8e03a..28043a1372ae 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -566,6 +566,9 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; + # Unpin some versions + lzma = appendPatch super.lzma ./patches/lzma-tests.patch; + # https://github.com/BNFC/bnfc/issues/140 BNFC = dontCheck super.BNFC; diff --git a/pkgs/development/haskell-modules/patches/lzma-tests.patch b/pkgs/development/haskell-modules/patches/lzma-tests.patch new file mode 100644 index 000000000000..e4e327ab6bbc --- /dev/null +++ b/pkgs/development/haskell-modules/patches/lzma-tests.patch @@ -0,0 +1,13 @@ +--- a/lzma.cabal ++++ b/lzma.cabal +@@ -70,8 +70,8 @@ test-suite lzma-tests + , base + , bytestring + -- additional dependencies that require version bounds +- build-depends: HUnit >= 1.2 && <1.4 +- , QuickCheck >= 2.8 && <2.9 ++ build-depends: HUnit >= 1.2 && <2 ++ , QuickCheck >= 2.8 && <3 + , tasty >= 0.10 && <0.12 + , tasty-hunit == 0.9.* + , tasty-quickcheck >= 0.8.3.2 && < 0.9 From b1ca8517ee54b89c24c77af3b9408066cee57d74 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 25 Dec 2017 18:06:49 +0000 Subject: [PATCH 010/197] lib: generalize `addPassthru` to `extendDerivation` --- lib/customisation.nix | 17 +++++++++++++---- lib/default.nix | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 483ef6fd4866..84f7783a6aa7 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -131,8 +131,8 @@ rec { /* Add attributes to each output of a derivation without changing - the derivation itself. */ - addPassthru = drv: passthru: + the derivation itself and check a given condition when evaluating. */ + extendDerivation = condition: passthru: drv: let outputs = drv.outputs or [ "out" ]; @@ -142,13 +142,22 @@ rec { outputToAttrListElement = outputName: { name = outputName; value = commonAttrs // { - inherit (drv.${outputName}) outPath drvPath type outputName; + inherit (drv.${outputName}) type outputName; + drvPath = assert condition; drv.${outputName}.drvPath; + outPath = assert condition; drv.${outputName}.outPath; }; }; outputsList = map outputToAttrListElement outputs; - in commonAttrs // { outputUnspecified = true; }; + in commonAttrs // { + outputUnspecified = true; + drvPath = assert condition; drv.drvPath; + outPath = assert condition; drv.outPath; + }; + /* Add attributes to each output of a derivation without changing + the derivation itself. */ + addPassthru = drv: passthru: extendDerivation true passthru drv; /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the diff --git a/lib/default.nix b/lib/default.nix index 9dc4fea99fc2..b304eb62bb2b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -87,7 +87,8 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith addPassthru hydraJob makeScope; + callPackageWith callPackagesWith extendDerivation addPassthru + hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; From d1d5ecb3bf730984fcc7d8ef8ec322f1f67d0574 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 25 Dec 2017 17:38:45 +0000 Subject: [PATCH 011/197] stdenv: perform checks only when evaluating .drv and .out MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This pushes check-meta evaluation to derivation evaluation step, leaving all other attributes accessible. Before this commit: > $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen --argstr system aarch64-linux > Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate. as expected > $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.name --argstr system aarch64-linux > Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate. > $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.meta.description --argstr system aarch64-linux > Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate. which is unfortunate since its impossible to use packages in autogenerated documentation on all platforms. After this commit: > $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen --argstr system aarch64-linux still fails > $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.name --argstr system aarch64-linux > "xen-4.5.5" > $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.meta.description --argstr system aarch64-linux > "Xen hypervisor and related components (vanilla)" --- pkgs/stdenv/generic/check-meta.nix | 21 ++++++-------- pkgs/stdenv/generic/make-derivation.nix | 37 +++++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index cd20c4a3cefc..0a8dc006dc5d 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -1,6 +1,5 @@ -# Extend a derivation with checks for brokenness, license, etc. Throw a -# descriptive error when the check fails; return `derivationArg` otherwise. -# Note: no dependencies are checked in this step. +# Checks derivation meta and attrs for problems (like brokenness, +# licenses, etc). { lib, config, system, meta, derivationArg, mkDerivationArg }: @@ -196,13 +195,11 @@ let { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } else { valid = true; }; - # Throw an error if trying to evaluate an non-valid derivation - validityCondition = - let v = checkValidity attrs; - in if !v.valid - then handleEvalIssue (removeAttrs v ["valid"]) - else true; + validity = checkValidity attrs; -in - assert validityCondition; - derivationArg +in validity // { + # Throw an error if trying to evaluate an non-valid derivation + handled = if !validity.valid + then handleEvalIssue (removeAttrs validity ["valid"]) + else true; +} diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2d702ab389e6..6038e2c339bf 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -182,6 +182,14 @@ rec { outputs = outputs'; } else { })); + validity = import ./check-meta.nix { + inherit lib config meta derivationArg; + mkDerivationArg = attrs; + # Nix itself uses the `system` field of a derivation to decide where + # to build it. This is a bit confusing for cross compilation. + inherit (stdenv) system; + }; + # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not # passed to the builder and is not a dependency. But since we @@ -207,21 +215,16 @@ rec { in - lib.addPassthru - (derivation (import ./check-meta.nix - { - inherit lib config meta derivationArg; - mkDerivationArg = attrs; - # Nix itself uses the `system` field of a derivation to decide where - # to build it. This is a bit confusing for cross compilation. - inherit (stdenv) system; - })) - ( { - overrideAttrs = f: mkDerivation (attrs // (f attrs)); - inherit meta passthru; - } // - # Pass through extra attributes that are not inputs, but - # should be made available to Nix expressions using the - # derivation (e.g., in assertions). - passthru); + lib.extendDerivation + validity.handled + ({ + overrideAttrs = f: mkDerivation (attrs // (f attrs)); + inherit meta passthru; + } // + # Pass through extra attributes that are not inputs, but + # should be made available to Nix expressions using the + # derivation (e.g., in assertions). + passthru) + (derivation derivationArg); + } From c883311327f1c842faffc437f344b46a82030b59 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 5 Jan 2018 02:33:11 +0100 Subject: [PATCH 012/197] nixos/dnscrypt-wrapper: fix rotate script failing to restart the service --- nixos/modules/services/networking/dnscrypt-wrapper.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix index 23cc92946e41..bf13d5c6f5fe 100644 --- a/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -145,6 +145,16 @@ in { }; users.groups.dnscrypt-wrapper = { }; + security.polkit.extraConfig = '' + // Allow dnscrypt-wrapper user to restart dnscrypt-wrapper.service + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && + action.lookup("unit") == "dnscrypt-wrapper.service" && + subject.user == "dnscrypt-wrapper") { + return polkit.Result.YES; + } + }); + ''; systemd.services.dnscrypt-wrapper = { description = "dnscrypt-wrapper daemon"; From 7940b5b7606f4c9df2dd614a275092e932a51d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Fri, 5 Jan 2018 12:11:52 +0100 Subject: [PATCH 013/197] Beginnings of a inboxer derivation --- .../mailreaders/inboxer/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/inboxer/default.nix diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix new file mode 100644 index 000000000000..0534b8b84725 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, nodejs }: + +stdenv.mkDerivation rec { + name = "inboxer-${version}"; + version = "1.0.0"; + + meta = with stdenv.lib; { + description = "Unofficial, free and open-source Google Inbox Desktop App"; + homepage = "https://denysdovhan.com/inboxer"; + maintainers = [ maintainers.mgttlinger ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; + + src = fetchFromGitHub { + owner = "denysdovhan"; + repo = "inboxer"; + rev = "v${version}"; + sha256 = "0mvkvsqc36y3r2lxa5f4rjrj2z5jxwadpcx585sdsx37ndi1z9m5"; + }; + + buildInputs = [ nodejs ]; + + buildPhase = '' + npm install + npm test + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2074d9986eef..480e0f35b814 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2792,6 +2792,8 @@ with pkgs; inadyn = callPackage ../tools/networking/inadyn { }; + inboxer = callPackage ../applications/networking/mailreaders/inboxer { }; + inetutils = callPackage ../tools/networking/inetutils { }; inform7 = callPackage ../development/compilers/inform7 { }; From d06ab7d212fb944c181736e033e9f215f3e53128 Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Fri, 5 Jan 2018 16:03:44 +0000 Subject: [PATCH 014/197] kdeconnect: Add `sshfs` as a dependency --- pkgs/applications/misc/kdeconnect/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index a95dd6adbce6..32683ab701a8 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -13,6 +13,8 @@ , libfakekey , libXtst , qtx11extras +, sshfs +, makeWrapper }: stdenv.mkDerivation rec { @@ -28,11 +30,15 @@ stdenv.mkDerivation rec { buildInputs = [ libfakekey libXtst ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications - qca-qt5 qtx11extras + qca-qt5 qtx11extras makeWrapper ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + postInstall = '' + wrapProgram $out/lib/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} + ''; + enableParallelBuilding = true; meta = with lib; { From 8f610383628aa01cde9857eb3877016f02308eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Sat, 6 Jan 2018 12:31:54 +0100 Subject: [PATCH 015/197] All ldd misses fixed --- .../mailreaders/inboxer/default.nix | 65 ++++++++++++++++--- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index 0534b8b84725..fdc011e040e8 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nodejs }: +{ stdenv, fetchurl, binutils, patchelf, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups }: stdenv.mkDerivation rec { name = "inboxer-${version}"; @@ -12,17 +12,62 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; - src = fetchFromGitHub { - owner = "denysdovhan"; - repo = "inboxer"; - rev = "v${version}"; - sha256 = "0mvkvsqc36y3r2lxa5f4rjrj2z5jxwadpcx585sdsx37ndi1z9m5"; + src = fetchurl { + url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; + sha256 = "01384fi5vrfqpznk9389nf3bwpi2zjbnkg84g6z1css8f3gp5i1c"; }; - buildInputs = [ nodejs ]; + unpackPhase = '' + ar p $src data.tar.xz | tar xJ + ''; + buildInputs = [ binutils patchelf ]; - buildPhase = '' - npm install - npm test + preFixup = with stdenv.lib; let + lpath = makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + nss + nspr + freetype + fontconfig + gtk2-x11 + xorg.libX11 + xorg.libXcursor + xorg.libXdamage + xorg.libXi + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libXrender + xorg.libXcomposite + xorg.libXtst + xorg.libXScrnSaver + xorg.libxcb + gdk_pixbuf + glib + gnome2.pango + gnome2.GConf + expat + stdenv.cc.cc.lib + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out/opt/Inboxer:${lpath}" \ + $out/opt/Inboxer/inboxer + ''; + + installPhase = '' + mkdir -p $out/bin + cp -R usr/share opt $out/ + # fix the path in the desktop file + substituteInPlace \ + $out/share/applications/inboxer.desktop \ + --replace /opt/ $out/opt/ + # symlink the binary to bin/ + ln -s $out/opt/Inboxer/inboxer $out/bin/inboxer ''; } From a4c8f60e86252b4136ab9a8e28ca166fc9be15c8 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Sat, 6 Jan 2018 23:08:24 -0600 Subject: [PATCH 016/197] reference issue in comment --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 28043a1372ae..56ac278c165f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -566,7 +566,7 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; - # Unpin some versions + # https://github.com/haskell-hvr/lzma/issues/8 lzma = appendPatch super.lzma ./patches/lzma-tests.patch; # https://github.com/BNFC/bnfc/issues/140 From d3eaa5a4de5e171d79ea0d10f7fc5172447a7322 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 9 Jan 2018 14:38:54 +1300 Subject: [PATCH 017/197] haskell: Fix depending on libs with internal libs on darwin. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ac484b3c1124..3cbf0c004fd6 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -107,7 +107,7 @@ symlinkJoin { # Clean up the old links that may have been (transitively) included by # symlinkJoin: rm -f $dynamicLinksDir/* - for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do + for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'|sort -u); do ln -s $d/*.dylib $dynamicLinksDir done for f in $packageConfDir/*.conf; do From 90c67ea36a8396ed39bd3595d57431f6894d9745 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 08:10:41 -0600 Subject: [PATCH 018/197] whois: 5.2.18 -> 5.2.20 --- pkgs/tools/networking/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index ed8f2eebc75f..d73c5624aec0 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.18"; + version = "5.2.20"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0jzyq1rj6balc6a28swzgspv55xhkc75dw6wsn159in4ap61bzmi"; + sha256 = "1aamasivfnghr9my1j6c1rf0dfal45axjcjf3mpv0g942bkxqp5b"; }; buildInputs = [ perl gettext ]; From 364b21925fe4aa6b305a5bdd1a709aea2ee89e2d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 08:22:58 -0600 Subject: [PATCH 019/197] whois: use libidn2 to support various 'international' domains --- pkgs/tools/networking/whois/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index d73c5624aec0..bbee69e0c91b 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gettext }: +{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2 }: stdenv.mkDerivation rec { version = "5.2.20"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1aamasivfnghr9my1j6c1rf0dfal45axjcjf3mpv0g942bkxqp5b"; }; - buildInputs = [ perl gettext ]; + nativeBuildInputs = [ perl gettext pkgconfig ]; + buildInputs = [ libidn2 ]; preConfigure = '' for i in Makefile po/Makefile; do From eb7af7a82b9823d38a2dfdfa9bcd0093c18abaeb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 08:38:43 -0600 Subject: [PATCH 020/197] whois: prefer not overwriting phases, use libiconv --- pkgs/tools/networking/whois/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index bbee69e0c91b..30ecf617873a 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2 }: +{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { version = "5.2.20"; @@ -12,17 +12,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ perl gettext pkgconfig ]; - buildInputs = [ libidn2 ]; + buildInputs = [ libidn2 libiconv ]; preConfigure = '' for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done + + substituteInPlace Makefile --replace "DEFS += HAVE_ICONV" "DEFS += HAVE_ICONV\nwhois_LDADD += -liconv" ''; - buildPhase = "make whois"; + makeFlags = [ "HAVE_ICONV=1" ]; + buildFlags = [ "whois" ]; - installPhase = "make install-whois"; + installTargets = [ "install-whois" ]; meta = with stdenv.lib; { description = "Intelligent WHOIS client from Debian"; From afb7129e6b2c8e576894346ba7cfb3214ae8f815 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Wed, 10 Jan 2018 19:31:33 +0100 Subject: [PATCH 021/197] grammalecte: 0.5.18 -> 0.6.1 --- .../development/python-modules/grammalecte/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index a3de4d3f7bc1..485c5b5ef073 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -7,23 +7,19 @@ buildPythonPackage rec { pname = "grammalecte"; - version = "0.5.18"; + version = "0.6.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip"; - sha256 = "0izfsqsj8w4awhmwmn4x8wwpqsmqbnfvfafzk93i6yj0l3fn3i97"; + sha256 = "0y2ck6pkd2p3cbjlxxvz3x5rnbg3ghfx97n13302rnab66cy4zkh"; }; propagatedBuildInputs = [ bottle ]; preBuild = "cd .."; postInstall = '' - mkdir $out/bin - cp $out/cli.py $out/bin/gramalecte - cp $out/server.py $out/bin/gramalected - chmod a+rx $out/bin/gramalecte - chmod a+rx $out/bin/gramalected + rm $out/bin/bottle.py ''; disabled = !isPy3k; From ec5487a4e5a06f89fdc83c0f41c5ddec84bee97c Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 10 Jan 2018 18:10:00 +0000 Subject: [PATCH 022/197] darktable: lua support requires lua 5.3 https://github.com/NixOS/nixpkgs/issues/33710#issuecomment-356680711 Fixes #33710. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0d310984ffe..2f89921e2d6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14453,6 +14453,7 @@ with pkgs; darktable = callPackage ../applications/graphics/darktable { inherit (gnome2) GConf libglade; + lua = lua5_3; pugixml = pugixml.override { shared = true; }; }; From 6fbe54623ba8d51fa0ffb5af1d2d74a4740b5866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Wed, 10 Jan 2018 21:12:31 +0100 Subject: [PATCH 023/197] seems to work now --- .../networking/mailreaders/inboxer/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index fdc011e040e8..ef66f69f979a 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutils, patchelf, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups }: +{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }: stdenv.mkDerivation rec { name = "inboxer-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { unpackPhase = '' ar p $src data.tar.xz | tar xJ ''; - buildInputs = [ binutils patchelf ]; + buildInputs = [ binutils patchelf makeWrapper ]; preFixup = with stdenv.lib; let lpath = makeLibraryPath [ @@ -52,12 +52,23 @@ stdenv.mkDerivation rec { gnome2.GConf expat stdenv.cc.cc.lib + libpulseaudio + libudev ]; in '' + patchelf \ + --set-rpath "$out/opt/Inboxer:${lpath}" \ + $out/opt/Inboxer/libnode.so + patchelf \ + --set-rpath "$out/opt/Inboxer:${lpath}" \ + $out/opt/Inboxer/libffmpeg.so + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/Inboxer:${lpath}" \ $out/opt/Inboxer/inboxer + + wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" ''; installPhase = '' From d5988833da2fa68644af0c4a642e3959bbb74529 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 10 Jan 2018 22:57:51 +0100 Subject: [PATCH 024/197] glusterfs: 3.12.3 -> 3.12.4 --- pkgs/tools/filesystems/glusterfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 87356fd34838..494fd7036e29 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "3.12.3"; + version = "3.12.4"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "16ra4qr4ds011mmxaqdhdj7slcx8yv0xh6ww7bwsz7f1gn9sr10h"; + sha256 = "01gsc3dw491ipl47q733iznddxbg42aa749vkyaq6i6w4d7m157f"; }; buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline From d25a65b0f07d89e96f876baea3d90b851fad8a1c Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Tue, 9 Jan 2018 21:04:39 -0500 Subject: [PATCH 025/197] notbit: init at 2018-01-09 --- .../networking/mailreaders/notbit/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/notbit/default.nix diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix new file mode 100644 index 000000000000..3e235400498f --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, + gettext, openssl +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "notbit-${version}"; + version = "2018-01-09"; + + src = fetchFromGitHub { + owner = "bpeel"; + repo = "notbit"; + rev = "8b5d3d2da8ce54abae2536b4d97641d2c798cff3"; + sha256 = "1623n0lvx42mamvb2vwin5i38hh0nxpxzmkr5188ss2x7m20lmii"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ openssl gettext ]; + + meta = { + description = "A minimal Bitmessage client"; + homepage = https://github.com/bpeel/notbit; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0d310984ffe..d1cc6d3a4a71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16287,6 +16287,8 @@ with pkgs; notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; + notbit = callPackage ../applications/networking/mailreaders/notbit { }; + notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3; }; From a628055e5c7f4e21db61eb63dbd4b9cde89bb16d Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 11 Jan 2018 03:16:01 +0100 Subject: [PATCH 026/197] ponyc: FIX $CC undefined, using gcc as the linker https://github.com/ponylang/ponyc/issues/2482 --- pkgs/development/compilers/ponyc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e65c8438ed72..3427337f7a6a 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -69,8 +69,10 @@ stdenv.mkDerivation ( rec { + stdenv.lib.optionalString stdenv.isDarwin '' bits=64 '' + stdenv.lib.optionalString (stdenv.isDarwin && (!lto)) '' lto=no '' + '' install - mv $out/bin/ponyc $out/bin/ponyc.wrapped - makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \ + + wrapProgram $out/bin/ponyc \ + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" \ --prefix PONYPATH : "$out/lib" \ --prefix PONYPATH : "${stdenv.lib.getLib pcre2}/lib" \ --prefix PONYPATH : "${stdenv.lib.getLib libressl}/lib" From 9213d0cfa54883311462b82938bf05fad0ff2465 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 11 Jan 2018 12:26:50 +0100 Subject: [PATCH 027/197] spark: mark versions <= 2.2.0 && <= 2.1.2 as insecure due to CVE-2017-12612 Details can be retrieve at [1]. [1] https://spark.apache.org/security.html --- pkgs/applications/networking/cluster/spark/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 79500a33bf80..60625a407419 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline ]; + knownVulnerabilities = optional (!((versionAtLeast version "2.2.0") || (versionOlder version "2.2.0" && versionAtLeast version "2.1.2"))) "CVE-2017-12612"; repositories.git = git://git.apache.org/spark.git; }; } From e250ca072ab8afd449aa8296378a30039c1893ff Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 11 Jan 2018 12:50:51 +0100 Subject: [PATCH 028/197] spark_16: removed ancient (insecure) version --- pkgs/applications/networking/cluster/spark/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 60625a407419..ac3399445b40 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -6,10 +6,6 @@ let versionMap = { - "1.6.3" = { - hadoopVersion = "cdh4"; - sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn"; - }; "2.2.0" = { hadoopVersion = "hadoop2.7"; sparkSha256 = "0wjjn2pgalrcji8avhj5d48kl1mf7rhrdxhzf29dbiszq4fkx0s6"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1136208bf30c..30ebbe03a10e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6964,7 +6964,6 @@ with pkgs; self = callPackage_i686 ../development/interpreters/self { }; spark = spark_22; - spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; }; spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.0"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; From 3e2015c239bba4732a576cc89a538173a944ef36 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 11 Jan 2018 12:52:32 +0100 Subject: [PATCH 029/197] spark_22: 2.2.0 -> 2.2.1 --- pkgs/applications/networking/cluster/spark/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index ac3399445b40..99b7566fc713 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -6,9 +6,9 @@ let versionMap = { - "2.2.0" = { + "2.2.1" = { hadoopVersion = "hadoop2.7"; - sparkSha256 = "0wjjn2pgalrcji8avhj5d48kl1mf7rhrdxhzf29dbiszq4fkx0s6"; + sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; }; }; in @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline ]; - knownVulnerabilities = optional (!((versionAtLeast version "2.2.0") || (versionOlder version "2.2.0" && versionAtLeast version "2.1.2"))) "CVE-2017-12612"; repositories.git = git://git.apache.org/spark.git; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30ebbe03a10e..bc1708f9c91d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6964,7 +6964,7 @@ with pkgs; self = callPackage_i686 ../development/interpreters/self { }; spark = spark_22; - spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.0"; }; + spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; From a8e7ac25551391228dd1a1e2176178cf3e6b7d53 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 11 Jan 2018 08:23:18 -0600 Subject: [PATCH 030/197] qt5: reduce evaluation memory use --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 910afc8ac692..dbbb754852a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10587,7 +10587,7 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base; }); - libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); + libsForQt56 = lib.makeScope qt56.newScope mkLibsForQt5; qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { @@ -10602,7 +10602,7 @@ with pkgs; inherit (gnome3) gtk3 dconf; }); - libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5); + libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5; qt5 = qt59; libsForQt5 = libsForQt59; From 4e78aeb441075872c07e6d6dc45f2045a3d87e41 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 11 Jan 2018 10:17:56 -0500 Subject: [PATCH 031/197] callCabal2nix: Fix calling with a path in the store. --- lib/default.nix | 2 +- lib/sources.nix | 4 ++++ pkgs/build-support/safe-discard-string-context.nix | 14 ++++++++++++++ .../haskell-modules/make-package-set.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/safe-discard-string-context.nix diff --git a/lib/default.nix b/lib/default.nix index f729a36249af..03a902945a3b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -93,7 +93,7 @@ let hiPrioSet; inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices - commitIdFromGitRepo cleanSourceWith; + commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource; inherit (modules) evalModules closeModules unifyModuleSyntax applyIfFunction unpackSubmodule packSubmodule mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions diff --git a/lib/sources.nix b/lib/sources.nix index 703f5a71da6a..704711b20cd9 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -93,4 +93,8 @@ rec { else lib.head matchRef else throw ("Not a .git directory: " + path); in lib.flip readCommitFromFile "HEAD"; + + pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir); + + canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src)); } diff --git a/pkgs/build-support/safe-discard-string-context.nix b/pkgs/build-support/safe-discard-string-context.nix new file mode 100644 index 000000000000..293a15295d55 --- /dev/null +++ b/pkgs/build-support/safe-discard-string-context.nix @@ -0,0 +1,14 @@ +# | Discard the context of a string while ensuring that expected path +# validity invariants hold. +# +# This relies on import-from-derivation, but it is only useful in +# contexts where the string is going to be used in an +# import-from-derivation anyway. +# +# safeDiscardStringContext : String → String +{ writeText }: s: + builtins.seq + (import (writeText + "discard.nix" + "${builtins.substring 0 0 s}null\n")) + (builtins.unsafeDiscardStringContext s) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 5a2f7fb89f0d..b91d73c9748c 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -146,7 +146,9 @@ in package-set { inherit pkgs stdenv callPackage; } self // { overrideCabal (self.callPackage (haskellSrc2nix { inherit name; src = pkgs.lib.cleanSourceWith - { inherit src; + { src = if pkgs.lib.canCleanSource src + then src + else pkgs.safeDiscardStringContext src; filter = path: type: pkgs.lib.hasSuffix "${name}.cabal" path || pkgs.lib.hasSuffix "package.yaml" path; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbbb754852a0..1ee54227398d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20237,4 +20237,6 @@ with pkgs; wal-g = callPackage ../tools/backup/wal-g {}; tlwg = callPackage ../data/fonts/tlwg { }; + + safeDiscardStringContext = callPackage ../build-support/safe-discard-string-context.nix { }; } From e4f3fe051e4becd7d42201fa98619c2179908b45 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Wed, 10 Jan 2018 22:14:01 -0800 Subject: [PATCH 032/197] ghc, haskell-modules: ARM cross build fixes. As requested in #33405. --- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/7.10.3.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 2 +- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index b68c84711b0d..c56798e31ae4 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.isArm [ llvm_35 ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index dd5acfa16f1f..3fb70c31a7c2 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ./relocation.patch ]; - buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ] ++ stdenv.lib.optionals stdenv.isArm [ llvm_35 ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ] ++ stdenv.lib.optionals targetPlatform.isArm [ llvm_35 ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index ec2694a00286..8a08ab4b9862 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 5ef71804b570..0e87ea68649e 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (rec { sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk ''; - buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ]; + buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ] ++ stdenv.lib.optionals (targetPlatform.isArm || targetPlatform.isAarch64) [ llvm_39 ]; enableParallelBuilding = true; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bf195696f947..5b2b23fc7903 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -130,7 +130,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && !stdenv.isArm && !stdenv.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") From 4cd40bb062672ddeb2a9239d9cbe6057367ffdf1 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Thu, 11 Jan 2018 11:02:47 -0500 Subject: [PATCH 033/197] Update Elixir 1.6 RC --- pkgs/development/interpreters/elixir/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index c8b0d904ccd3..168007d22d77 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.0-rc.0"; - sha256 = "1yfyp7y0mfdbh410xsfkq9a7ai2y22mjh2qn2cvpim76s96qjpw6"; + version = "1.6.0-rc.1"; + sha256 = "06g6n9qvv57xa07fyaqhki2y8zw24m3smcjiw1wiw9pzl5a76iby"; minimumOTPVersion = "18"; } From bb9bcfa2955226b368dab5f07107e02ab65c975a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 Jan 2018 16:25:47 +0000 Subject: [PATCH 034/197] doc/cross-compilation: fixes typos --- doc/cross-compilation.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 118a82bf0b06..028fd6744910 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -61,7 +61,7 @@ The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. - Instead, it is only relevant for compatability with building certain specific compilers and build tools. + Instead, it is only relevant for compatibility with building certain specific compilers and build tools. It can be safely ignored for all other packages. @@ -162,7 +162,7 @@ A runtime dependency between 2 packages implies that between them both the host and target platforms match. This is directly implied by the meaning of "host platform" and "runtime dependency": - The package dependency exists while both packages are runnign on a single host platform. + The package dependency exists while both packages are running on a single host platform. A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package. From 93cdceafb866986fef64899d00e3f5ebff8252f7 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 5 Jan 2018 23:48:43 +0100 Subject: [PATCH 035/197] bullet: 2.86.1 -> 2.87 --- pkgs/development/libraries/bullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index f6676321860f..004911010979 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bullet-${version}"; - version = "2.86.1"; + version = "2.87"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "1k81hr5y9rs2nsal6711fal21rxp6h573cpmjjk8x8ji2crqbqlz"; + sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3"; }; buildInputs = [ cmake ] ++ From 9ab77680b6a56304f04d5c5266663d7c622d5491 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 6 Jan 2018 00:02:21 +0100 Subject: [PATCH 036/197] bullet: fix build on aarch64 --- pkgs/development/libraries/bullet/default.nix | 2 ++ .../libraries/bullet/gwen-narrowing.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/bullet/gwen-narrowing.patch diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 004911010979..39a5a9869ba7 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] else [mesa freeglut]); + patches = [ ./gwen-narrowing.patch ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt diff --git a/pkgs/development/libraries/bullet/gwen-narrowing.patch b/pkgs/development/libraries/bullet/gwen-narrowing.patch new file mode 100644 index 000000000000..c6c06325dae0 --- /dev/null +++ b/pkgs/development/libraries/bullet/gwen-narrowing.patch @@ -0,0 +1,22 @@ +commit a5d3497577c78b03c05c69d17df972fa9fb54f53 +Author: Linus Heckemann +Date: Fri Jan 5 23:57:09 2018 +0100 + + Add -Wno-narrowing to GWEN's CMakeLists + + This avoids the compilation issue that occurs on aarch64 with gcc6. + (nixpkgs-specific patch) + +diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt +index 82fa0ffba..26c4bbd37 100644 +--- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt ++++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt +@@ -15,7 +15,7 @@ IF(NOT WIN32 AND NOT APPLE) + ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1") + ENDIF() + +-ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB ) ++ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB -Wno-narrowing ) + + FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/Dialogs/*.cpp" "Controls/Layout/*.cpp" "Controls/Property/*.cpp" "Input/*.cpp" "Platforms/*.cpp" "Renderers/*.cpp" "Skins/*.cpp") + FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h") From 18af8dabab9935985600c3d4a36942d93b06f67c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 11 Jan 2018 21:29:31 +0300 Subject: [PATCH 037/197] avidemux: support alsa --- pkgs/applications/video/avidemux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 7f70818bb141..76b42acef3e1 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, alsaLib , withX265 ? true, x265 , withX264 ? true, x264 , withXvid ? true, xvidcore @@ -29,7 +30,7 @@ let enableParallelBuilding = false; nativeBuildInputs = [ cmake pkgconfig yasm ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype ] + buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype alsaLib ] ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 ++ lib.optional withXvid xvidcore From dddcd10ecce21237f8b7f8abf6acd0938bff095e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Jan 2018 18:35:09 +0100 Subject: [PATCH 038/197] Don't set 'config.xorg = {}' This makes memoization of Nixpkgs evaluation less effective, since some Nixpkgs invocations may have 'config = {}' while others may have 'config = { xorg = {}; }'. Instead set 'config = {}'. --- nixos/modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7acd621f53ab..f96d3c5afbac 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -548,7 +548,7 @@ in knownVideoDrivers; in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); - nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; }; + nixpkgs.config = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { xorg.abiCompat = "1.18"; }; assertions = [ { assertion = config.security.polkit.enable; From 4488e7c4350708157e85402dfcf7e15c7d10da3b Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 11 Jan 2018 20:12:49 +0100 Subject: [PATCH 039/197] nixos/tests/keymap: disable xterm DM --- nixos/tests/keymap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index c431c1a34174..eec674e227df 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -46,6 +46,7 @@ let in makeTest { name = "keymap-${layout}"; + machine.services.xserver.desktopManager.xterm.enable = false; machine.i18n.consoleKeyMap = mkOverride 900 layout; machine.services.xserver.layout = mkOverride 900 layout; machine.imports = [ ./common/x11.nix extraConfig ]; From e4cad917a23c3deb1956012e195de25a1aeeb1ea Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 11 Jan 2018 20:32:33 +0100 Subject: [PATCH 040/197] lf: 2017-10-30 -> 2018-01-11 --- pkgs/tools/misc/lf/default.nix | 6 +++--- pkgs/tools/misc/lf/deps.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index f8b687a5c8ba..7e5a464764ab 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-10-30"; + version = "2018-01-11"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "3f7bd0a62d1a243562e182d9051ebb54f3414aaa"; # nightly - sha256 = "0g6wf4j3dfy3yfkby3wlqajryv4kffqvhljq2q0x482fsrl4vipz"; + rev = "58538c802044a3a2590ebe4979f3c85d807ea2d9"; # nightly + sha256 = "0xp5accliwz1d0nbsc6cnsv38czcfqn5nyxfndkpw8jkh8w2pm9p"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 91a0c368d5f9..6c1e07667b35 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "10cefba34bc5e7a6e5df0836a42513c28a10e074"; # master - sha256 = "05jy6dpva2a1xfsv3yajavbx41gx8hhh5k3k901dnk0118hnyd0w"; + rev = "aa4a75b1c20a2b03751b1a9f7e41d58bd6f71c43"; # master + sha256 = "1xfd0mq6jkq55dx14nksyyfc66qla7cz0xxscpw07b25qmww9518"; }; } { From 1566b47c21bf89128c6324c39fab1970072ca8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 11 Jan 2018 07:34:21 -0200 Subject: [PATCH 041/197] materia-theme: 20171213 -> 20180110 --- pkgs/misc/themes/materia-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index 753188ed007b..f8437f6d681d 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "materia-theme-${version}"; - version = "20171213"; + version = "20180110"; src = fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; rev = "v${version}"; - sha256 = "1dn458r8ca97xz4pqyxy2rqigs97dg3k868l4yvlsdy732mspm0h"; + sha256 = "1knfcc4bqibshbk5s4461brzw780gj7c1i42b168c6jw9p6br6bf"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; From ed559bf5d31e5c0d69f44a91e1dc34ba2d14d31a Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 11 Jan 2018 15:44:45 -0500 Subject: [PATCH 042/197] pngpp: darwin support 1) Building with clang is addressed by navigating a minor #if in some of the code. 2) I noticed that even when things were building correctly, passing `${out}` as a variable assignment to `make` was actually not working: there were compiler warnings about missing include directories whose bogus paths involved the literal string `out`. I ended up fixing this by performing the assignment to the make variable `PREFIX` in the `Makefile` itself. --- pkgs/development/libraries/png++/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 6ca4734a4f7d..ef4b3ea7e010 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -21,13 +21,17 @@ stdenv.mkDerivation rec { postCheck = "cat test/test.log"; - buildInputs = [ ] - ++ stdenv.lib.optional docSupport doxygen; + buildInputs = stdenv.lib.optional docSupport doxygen; propagatedBuildInputs = [ libpng ]; - makeFlags = [ "PREFIX=\${out}" ] - ++ stdenv.lib.optional docSupport "docs"; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" + '' + '' + sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile + ''; + + makeFlags = stdenv.lib.optional docSupport "docs"; enableParallelBuilding = true; @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/pngpp/; description = "C++ wrapper for libpng library"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ramkromberg ]; }; } From 3f642b4d62289b88c091f5b3a837c4b8dd568d01 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 11 Jan 2018 22:47:24 +0100 Subject: [PATCH 043/197] zimg: 2.6.1 -> 2.7 --- pkgs/development/libraries/zimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index b5bb73e3e33b..00973350e185 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.6.1"; + version = "2.7"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj"; + sha256 = "1jvx3a523mzkc54rrjab9kz66kc6q1snry9ymwmsx7rrd3kv3j6m"; }; nativeBuildInputs = [ autoreconfHook ]; From 628fcfb30816972fd3e975ef4a219d25a4121f25 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 12 Jan 2018 00:27:10 +0100 Subject: [PATCH 044/197] pgmanage: 10.0.2 -> 10.1.0 --- pkgs/applications/misc/pgmanage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index fd66ce8fc31c..e08035aef571 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.0.2"; + version = "10.1.0"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a"; + sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw"; }; buildInputs = [ postgresql openssl ]; From 6bfa42218ddf2054f735145940585d05d84aaf64 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Fri, 12 Jan 2018 00:48:35 +0000 Subject: [PATCH 045/197] avrgcc: bake path to avr-ar into avr-gcc-ar gcc provides wrappers for binutils' ar, nm and ranlib executables, which must be used instead when using link-time optimisation. See also: http://manpages.ubuntu.com/manpages/zesty/man1/aarch64-linux-gnu-gcc-ar-5.1.html The upstream version of avr-gcc-ar searches in paths passed to the configure script for the avr-ar binary that it wraps, falling back to searching PATH instead. Thus currently avr-gcc-ar works on Nix, but only if avrbinutils is already in the environment. This change bakes the path to avr-ar into avr-gcc-ar, since its path is known at compile time. It also no longer searches PATH, meaning the user's local environment won't override this path. Note that avr-gcc-nm and avr-gcc-ranlib are compiled from the same source file as avr-gcc-ar, just with different compiler flags. Testing on master (without avrbinutils in the environment): $ nix-build -A avrgcc $ result/bin/avr-gcc-ar --version result/bin/avr-gcc-ar: Cannot find binary 'avr-ar' Testing on branch with this fix: $ nix-build -A avrgcc $ result/bin/avr-gcc-ar --version GNU ar (GNU Binutils) 2.26.20160125 ... --- .../misc/avr/gcc/avrbinutils-path.patch | 15 +++++++++++++++ pkgs/development/misc/avr/gcc/default.nix | 10 ++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/misc/avr/gcc/avrbinutils-path.patch diff --git a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch new file mode 100644 index 000000000000..f0ec21b7589f --- /dev/null +++ b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch @@ -0,0 +1,15 @@ +diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c +index 838ebc2..3ac4ee7 100644 +--- a/gcc/gcc-ar.c ++++ b/gcc/gcc-ar.c +@@ -118,8 +118,8 @@ setup_prefixes (const char *exec_path) + dir_separator, NULL); + prefix_from_string (self_libexec_prefix, &target_path); + +- /* Add path as a last resort. */ +- prefix_from_env ("PATH", &path); ++ /* Add path to avrbinutils. */ ++ prefix_from_string ("@avrbinutils@/bin", &path); + } + + int diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index f456214f9442..0bfa6d1f238d 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -11,6 +11,16 @@ stdenv.mkDerivation { sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; }; + patches = [ + ./avrbinutils-path.patch + ]; + + # avrbinutils-path.patch introduces a reference to @avrbinutils@, substitute + # it now. + postPatch = '' + substituteInPlace gcc/gcc-ar.c --subst-var-by avrbinutils ${avrbinutils} + ''; + buildInputs = [ gmp mpfr libmpc zlib avrbinutils ]; nativeBuildInputs = [ texinfo ]; From 45ade8df3731138fa5a57b1a3e36da23af4bb3b4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 15:14:53 -0600 Subject: [PATCH 046/197] nix-{delegate,deploy,diff}: add top-level attributes, static --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d20d1bcba8c..100cc5697ada 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19635,6 +19635,10 @@ with pkgs; nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; + nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; + nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy; + nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff; + nix-info = callPackage ../tools/nix/info { }; nix-info-tested = callPackage ../tools/nix/info { doCheck = true; }; From 2377d7bcb294b14d2fa8ba5bf92c37d322e8351f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 11:05:17 +0800 Subject: [PATCH 047/197] radarr: 0.2.0.846 -> 0.2.0.910 --- pkgs/servers/radarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 3b86cf1758c0..3eba04f44fba 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.846"; + version = "0.2.0.910"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1lpr05aaf6a9p2msmsh0j8krxk83sf5d3avrh5qpyjap5j3phvky"; + sha256 = "0c4msk6hvlqyy81xkjhsvsy4igpc01s4a00zwhqnds2gj4y9yplk"; }; buildInputs = [ makeWrapper ]; From f2bca2935aed496b32869ae2860679731098d780 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 11:06:21 +0800 Subject: [PATCH 048/197] sonarr: 2.0.0.5054 -> 2.0.0.4949 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index f41676a79bc4..635fd96b06fe 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5054"; + version = "2.0.0.5085"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "15qr8hwv89zv71h4q94nrxl8625viip7m185wqcyzma8wrx5i1zi"; + sha256 = "1m6gdgsxk1d50kf4wnq6zyhbyf6rc0ma86l8m65am08xb0pihldz"; }; buildInputs = [ From 42d5dd68f85825b303ca349ab44a241faaa18f77 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 11 Jan 2018 23:14:35 -0400 Subject: [PATCH 049/197] youtube-dl: disable phantomjs support on darwin by default --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 808858724e67..debfee34197e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication +{ stdenv, targetPlatform, fetchurl, buildPythonApplication , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -8,7 +8,7 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true -, phantomjsSupport ? true +, phantomjsSupport ? !targetPlatform.isDarwin # phantomjs2 is broken on darwin , hlsEncryptedSupport ? true , makeWrapper }: From c0c421c311394f7052f599926a1d30e685264af3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 12:08:21 +0800 Subject: [PATCH 050/197] kde-applications: 17.12.0 -> 17.12.1 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1688 ++++++++++++++++---------------- 2 files changed, 845 insertions(+), 845 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 5a12918fb978..1c1a0102dd06 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.12.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.12.1/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 4f6146598a19..781a59786759 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1691 +3,1691 @@ { akonadi = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-17.12.0.tar.xz"; - sha256 = "0f42wfsicibls845a50b7fzxcdyyi8k9g4l5jpf9si3q6imvq2zn"; - name = "akonadi-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-17.12.1.tar.xz"; + sha256 = "0iaw6kmbi68wd728v6m5w90xy9v0nqgd66n026r5dy64pm08hj0x"; + name = "akonadi-17.12.1.tar.xz"; }; }; akonadi-calendar = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-calendar-17.12.0.tar.xz"; - sha256 = "196gn9lbyw8dv2w4a8j1fy85hql9q8f4ps6pf7pas2pcvja3j68x"; - name = "akonadi-calendar-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-calendar-17.12.1.tar.xz"; + sha256 = "0j32xxglksya014c2199bn5k540zllmlsyvvr6jcmvbfpcilnl7d"; + name = "akonadi-calendar-17.12.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-calendar-tools-17.12.0.tar.xz"; - sha256 = "19wgijhmv3kjbwdplw9ggs1plhgd2n16aqs0wyhb18wkjv4dgl08"; - name = "akonadi-calendar-tools-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.1.tar.xz"; + sha256 = "0yk59hq0fflmv18w7i6jx48436ykhgc1q5agbjckfw9g9qfmaj04"; + name = "akonadi-calendar-tools-17.12.1.tar.xz"; }; }; akonadiconsole = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadiconsole-17.12.0.tar.xz"; - sha256 = "0xz9vr49qfsry76rmmyfm78k6wqwbsx40nkhyim0pf5npa3ax0v5"; - name = "akonadiconsole-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadiconsole-17.12.1.tar.xz"; + sha256 = "1x1cazikj7a3paf93ms2wl9cbbqhr43jpk7ijb6wjnhzv0jx0yv0"; + name = "akonadiconsole-17.12.1.tar.xz"; }; }; akonadi-contacts = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-contacts-17.12.0.tar.xz"; - sha256 = "17sxdayliw78vsnpknl81b8cd3kaz8aiblgjsh3xl9kdrmm1y0nj"; - name = "akonadi-contacts-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-contacts-17.12.1.tar.xz"; + sha256 = "12gvzwxhazwz6cn07vz2v21nh31nnxq5ckvm9bw94amhxdcrhji1"; + name = "akonadi-contacts-17.12.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-import-wizard-17.12.0.tar.xz"; - sha256 = "0pi08ab58wc6zxvw9pdkrnk5y6sg4ydb2a4dsyrb1dmzywrqcjk2"; - name = "akonadi-import-wizard-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-import-wizard-17.12.1.tar.xz"; + sha256 = "1v4sqmlbkvhi14bjpg88017slsmsingk3lcvl1hpi9wh5chhybs2"; + name = "akonadi-import-wizard-17.12.1.tar.xz"; }; }; akonadi-mime = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-mime-17.12.0.tar.xz"; - sha256 = "04snsl5152b4jfgvdg2115z06zql15ny0pjs9iqld3mmmc371317"; - name = "akonadi-mime-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-mime-17.12.1.tar.xz"; + sha256 = "0y0s4qaa00240czq1mgm3p63cagdn4kv0njwhlh5va6jknb56rsq"; + name = "akonadi-mime-17.12.1.tar.xz"; }; }; akonadi-notes = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-notes-17.12.0.tar.xz"; - sha256 = "0ckr0c0zd8f2703gkrviilqxd5kfwm7ca77728hvzccs33nr1jr4"; - name = "akonadi-notes-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-notes-17.12.1.tar.xz"; + sha256 = "1ylbrz5p5y80j7carlqwpxw222faf1ri7lyhnl09j1xsiaw74jz1"; + name = "akonadi-notes-17.12.1.tar.xz"; }; }; akonadi-search = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akonadi-search-17.12.0.tar.xz"; - sha256 = "1kmqybhk47r6wr15aqg4j4z47yl0qzyllrnpcksm5ggfam8m2k58"; - name = "akonadi-search-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akonadi-search-17.12.1.tar.xz"; + sha256 = "14blwxccz36qdmahwz14vnd7a5j01xpzijc3bbw768l1ifxac5sp"; + name = "akonadi-search-17.12.1.tar.xz"; }; }; akregator = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/akregator-17.12.0.tar.xz"; - sha256 = "0lmjiw6b2ckfrq9c1xwrhdg5f3sgrh9l1hrxc5k0xyhx8hnbqj9r"; - name = "akregator-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/akregator-17.12.1.tar.xz"; + sha256 = "03292r4l2wpsikrngldmkvjl75ijpy9sfwr14r2kk0rbkqpzn7gn"; + name = "akregator-17.12.1.tar.xz"; }; }; analitza = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/analitza-17.12.0.tar.xz"; - sha256 = "0y418j7y2lhy5mp03irqpg8lgzqmwynfc8lkmf1rxj4445z8lpg2"; - name = "analitza-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/analitza-17.12.1.tar.xz"; + sha256 = "1zp3xki1jppqzpsjxv0mif44hx5amdk9w9a8h1h9wbdwf9zn7038"; + name = "analitza-17.12.1.tar.xz"; }; }; ark = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ark-17.12.0.tar.xz"; - sha256 = "0l4agh5nd3v8chm75gha3fc6w0qzl60m28i2syfb6090xr7di5s3"; - name = "ark-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ark-17.12.1.tar.xz"; + sha256 = "0xxahw4qysynim32pi4f3kzvpn8fikii3nxdjk1f58cs7ylk7h9h"; + name = "ark-17.12.1.tar.xz"; }; }; artikulate = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/artikulate-17.12.0.tar.xz"; - sha256 = "042wf2h5jrj7dmpks6nj9vvqrc4xfw2n97lvindndhmj6sia1h72"; - name = "artikulate-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/artikulate-17.12.1.tar.xz"; + sha256 = "1f99gdjlrfxfii605d58566qkzg0vwbdj2sl7gaf2n8974qih26l"; + name = "artikulate-17.12.1.tar.xz"; }; }; audiocd-kio = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/audiocd-kio-17.12.0.tar.xz"; - sha256 = "1nwwwsklz98dj4wvb5bbgphpw42vhnj7gxjgvskf52ap9q4y6xkm"; - name = "audiocd-kio-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/audiocd-kio-17.12.1.tar.xz"; + sha256 = "1q5rl3h5vlqa16wsa2zqapqycnbqcsfskkgh47pklsbzi49p2b7w"; + name = "audiocd-kio-17.12.1.tar.xz"; }; }; baloo-widgets = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/baloo-widgets-17.12.0.tar.xz"; - sha256 = "1j8p0vfp3x8a5kbqjak8ikmby5hzabcwwa0n4lic596mb2s2v9xd"; - name = "baloo-widgets-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/baloo-widgets-17.12.1.tar.xz"; + sha256 = "1w681fxjimwnywx6dbk7486ncwgq4izj7r4q5ahism10kxjyvy1i"; + name = "baloo-widgets-17.12.1.tar.xz"; }; }; blinken = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/blinken-17.12.0.tar.xz"; - sha256 = "0djzv65akvpi69nfv9jjjff986a7ph0mlw916m1iqiwg91ix1car"; - name = "blinken-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/blinken-17.12.1.tar.xz"; + sha256 = "0935gyc499j1br0g1knkpzr73q44mqfr89rjnl5ax6cncs6kkwcd"; + name = "blinken-17.12.1.tar.xz"; }; }; bomber = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/bomber-17.12.0.tar.xz"; - sha256 = "0cr72ym979dka7bw773ng85db2qix7ikw4pwncvan07x9c6kr0p9"; - name = "bomber-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/bomber-17.12.1.tar.xz"; + sha256 = "1jmkzq07rq19dzci1p3zida12yamn3rsd1l7zy75skwm43q8210r"; + name = "bomber-17.12.1.tar.xz"; }; }; bovo = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/bovo-17.12.0.tar.xz"; - sha256 = "0m4sr7ym469lkpmc4syx0b90nn0l52iwiz59gw70bw394vmd88cn"; - name = "bovo-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/bovo-17.12.1.tar.xz"; + sha256 = "0fa0cp3w2khvsg5rvnhn9yrx7pg0qvgd3grk7dbzv9frs3nc8k8a"; + name = "bovo-17.12.1.tar.xz"; }; }; calendarsupport = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/calendarsupport-17.12.0.tar.xz"; - sha256 = "0vm6fp6cla3gwvznlzn69d9lc7nca8ns54j7jwd509gi4ssmh2bb"; - name = "calendarsupport-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/calendarsupport-17.12.1.tar.xz"; + sha256 = "02g845mnyyjma9kadi9j1y774nb157qk4s9xfh414j35wa4n4ml0"; + name = "calendarsupport-17.12.1.tar.xz"; }; }; cantor = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/cantor-17.12.0.tar.xz"; - sha256 = "10zpv1j9h6cjpxkp4dc982zyw5dqzdayljfbwywxdqryxdw00rlw"; - name = "cantor-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/cantor-17.12.1.tar.xz"; + sha256 = "1jxjv729js6na70nc8rmr65ah4bvly27qndv1g4grzyv1j5v9pwa"; + name = "cantor-17.12.1.tar.xz"; }; }; cervisia = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/cervisia-17.12.0.tar.xz"; - sha256 = "0blzqh51ii6a9ys64xphzgah1cvxaqxrxpvbhxvldywry9brbbhg"; - name = "cervisia-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/cervisia-17.12.1.tar.xz"; + sha256 = "1jjc2iarpl6vinav20rly9b2ha3d35ipm45mmn6hdqwrgh08x61a"; + name = "cervisia-17.12.1.tar.xz"; }; }; dolphin = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/dolphin-17.12.0.tar.xz"; - sha256 = "0swc8f502v3cvanxsry77bvwqzlspk934hcaahzklfigv7v5kg9v"; - name = "dolphin-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/dolphin-17.12.1.tar.xz"; + sha256 = "0pyajijsadkl1yky0p66d0sglxp7ks1bl23x4xy5zhdv3clr5gzc"; + name = "dolphin-17.12.1.tar.xz"; }; }; dolphin-plugins = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/dolphin-plugins-17.12.0.tar.xz"; - sha256 = "1cyfwp7ny8l1ak4a64gcphb0a5kvdb8d0mbqm1fbcq1zzcvi4w8b"; - name = "dolphin-plugins-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/dolphin-plugins-17.12.1.tar.xz"; + sha256 = "1igyk2jx2rsgy7rbxi84fkhi831a2v4fg0bc08ad36y43cm849zh"; + name = "dolphin-plugins-17.12.1.tar.xz"; }; }; dragon = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/dragon-17.12.0.tar.xz"; - sha256 = "1qa6mwr64z4c13jg9paqr8f462pcpk7hqvb46h3aswh4h57d837z"; - name = "dragon-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/dragon-17.12.1.tar.xz"; + sha256 = "02apbhw98sq817660ldb1gdzna4jjb2v6379mvrb2d1qgigh1afd"; + name = "dragon-17.12.1.tar.xz"; }; }; eventviews = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/eventviews-17.12.0.tar.xz"; - sha256 = "07p4fv5mzqbnafglr3ww7iccxyqm4shj03vw4aq790ld6qcxqbv4"; - name = "eventviews-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/eventviews-17.12.1.tar.xz"; + sha256 = "1cga2i941x1rgp4i8aff8vr7hlk4q312pynr44hfidx4vjig9ia9"; + name = "eventviews-17.12.1.tar.xz"; }; }; ffmpegthumbs = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ffmpegthumbs-17.12.0.tar.xz"; - sha256 = "0102nqrvcjzmmbf0k3chivhpl44vgz53k2zskpzkpvpzzgd5s484"; - name = "ffmpegthumbs-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ffmpegthumbs-17.12.1.tar.xz"; + sha256 = "0lmd8papahnqr5c830wqz8bhkvdsads97b23dnzhnck78dinww2s"; + name = "ffmpegthumbs-17.12.1.tar.xz"; }; }; filelight = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/filelight-17.12.0.tar.xz"; - sha256 = "01pbpvi74wlz60vrz3cgrnyc22zcvlkfc8m2w7h765y4gddkgplj"; - name = "filelight-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/filelight-17.12.1.tar.xz"; + sha256 = "0c0fi9dziwf5v7069wsrqnqw95cfpicg4a6xp05hhpc9qqkvdngk"; + name = "filelight-17.12.1.tar.xz"; }; }; granatier = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/granatier-17.12.0.tar.xz"; - sha256 = "1smcpjz4zfzpx92zs32hdgqkfxn0rljq6wgqjdcnbl8phjd04vqi"; - name = "granatier-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/granatier-17.12.1.tar.xz"; + sha256 = "1ja7v2xr2yyw2qh7zkf2s7ym8qv5gfr1zbii54dk2r5k4a8slvi4"; + name = "granatier-17.12.1.tar.xz"; }; }; grantlee-editor = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/grantlee-editor-17.12.0.tar.xz"; - sha256 = "0h8987qydi310q0arg3l82n6ah8zs7z02vrnb30ffw827mxsfm99"; - name = "grantlee-editor-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/grantlee-editor-17.12.1.tar.xz"; + sha256 = "19w2f30rsk65xdc8kqr03fmkm0a743mgyj6gm6207nxsm5plr3nv"; + name = "grantlee-editor-17.12.1.tar.xz"; }; }; grantleetheme = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/grantleetheme-17.12.0.tar.xz"; - sha256 = "0ak01wifp2zk10rmsnwh2df5xlqbha5jgdxjs6n873pz21hx0kng"; - name = "grantleetheme-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/grantleetheme-17.12.1.tar.xz"; + sha256 = "1nga48vvqysbh2g10wka02ibbyny77wrz8a1p336sycr76q1xmcz"; + name = "grantleetheme-17.12.1.tar.xz"; }; }; gwenview = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/gwenview-17.12.0.tar.xz"; - sha256 = "1m9vckn73i94n4gc66613ahx6i3qybafnn461fxnjwl5xykbsh9z"; - name = "gwenview-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/gwenview-17.12.1.tar.xz"; + sha256 = "1a87b6wh2ga9j8r498zyf2dga77lhky41dl31ndkx94vm8ycdnlv"; + name = "gwenview-17.12.1.tar.xz"; }; }; incidenceeditor = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/incidenceeditor-17.12.0.tar.xz"; - sha256 = "0vmiwhxa7hiplvy1m24z53293bkq14zgi5jvrc5kmficg4ms1361"; - name = "incidenceeditor-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/incidenceeditor-17.12.1.tar.xz"; + sha256 = "0x7c3j8frzqmvgz6zn98h0qiays1fdvnlngdksi7gkm82bsvk7i2"; + name = "incidenceeditor-17.12.1.tar.xz"; }; }; juk = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/juk-17.12.0.tar.xz"; - sha256 = "18nxrddy4ifyjnbc1ynh4zgym16av53j1vbnz2y6szf8gqj96ci2"; - name = "juk-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/juk-17.12.1.tar.xz"; + sha256 = "13k7j7h62mggfj79a534m58rl9fd2vzhvv0wj7752n4nbiha6q3q"; + name = "juk-17.12.1.tar.xz"; }; }; k3b = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/k3b-17.12.0.tar.xz"; - sha256 = "1rn2jk21gp3gw5l1gcl0jhiyds7wsf3cpk7jl0zwqvg17df5j82c"; - name = "k3b-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/k3b-17.12.1.tar.xz"; + sha256 = "11jsfja3r9x6drs0v1nb4h9w6hl3ab7rxjcxm8czbwmx2897vgyg"; + name = "k3b-17.12.1.tar.xz"; }; }; kaccounts-integration = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kaccounts-integration-17.12.0.tar.xz"; - sha256 = "1vawy9bq4ngq8zxflaibazdjrx1vzxpkznh07lnz9isq6d21266k"; - name = "kaccounts-integration-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kaccounts-integration-17.12.1.tar.xz"; + sha256 = "1zfq6yknn8kjjnkp3s58gj15r5qd0xpmxl49c2615j08qjbbs5k2"; + name = "kaccounts-integration-17.12.1.tar.xz"; }; }; kaccounts-providers = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kaccounts-providers-17.12.0.tar.xz"; - sha256 = "13fbq89blgics3ix0arkzdd4z6hq77n8jkdr060axs4kgnmbv7i6"; - name = "kaccounts-providers-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kaccounts-providers-17.12.1.tar.xz"; + sha256 = "1mzh7brgd42fb4nnnn607nivqpb3hvy982dini32j54k1rls4810"; + name = "kaccounts-providers-17.12.1.tar.xz"; }; }; kaddressbook = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kaddressbook-17.12.0.tar.xz"; - sha256 = "10grv5a47gwfliz17qx74dwahabcrrz4553ijqlqkbjrw0p793zg"; - name = "kaddressbook-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kaddressbook-17.12.1.tar.xz"; + sha256 = "1ls02igrp4q6zbw62gyp3rkzbyv6jm0s46z1q3ifkqyxanm3mpbv"; + name = "kaddressbook-17.12.1.tar.xz"; }; }; kajongg = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kajongg-17.12.0.tar.xz"; - sha256 = "16p6a2bzgy9r8v8zhwbdja3qkh1j75r3gr72lv7fqi2q8pnqn6m2"; - name = "kajongg-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kajongg-17.12.1.tar.xz"; + sha256 = "05vakzhzrr7p8hdrmmvy8q0mj0z5xf7zyzm4lckaj9mpfvg9gnxm"; + name = "kajongg-17.12.1.tar.xz"; }; }; kalarm = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kalarm-17.12.0.tar.xz"; - sha256 = "0s9dbl7xf6kyjxxrip11a1f9vanxlcyrcmjkillp6iah2r9zghv2"; - name = "kalarm-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kalarm-17.12.1.tar.xz"; + sha256 = "11aa89k44jzmkm3xrgi59y4fgk2vb68zhhrkm53r13wxv2k2z9d7"; + name = "kalarm-17.12.1.tar.xz"; }; }; kalarmcal = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kalarmcal-17.12.0.tar.xz"; - sha256 = "1qr6y46xzylwfr6af52gshcvh9485nfbfflcls8bp343kr0mcvyz"; - name = "kalarmcal-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kalarmcal-17.12.1.tar.xz"; + sha256 = "05ynq5rbcny5h0k43r13b019zkg8mfkpkfx6drnar7nif6ji3qg5"; + name = "kalarmcal-17.12.1.tar.xz"; }; }; kalgebra = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kalgebra-17.12.0.tar.xz"; - sha256 = "1h4ji0drl3mvxxwhfikxyg1ljwv8vjpr9npyp8qrj9swy7jjxzpw"; - name = "kalgebra-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kalgebra-17.12.1.tar.xz"; + sha256 = "10pn3b17ahxp99glza6yyj4fmn6f6mhjggfd1d612gj8jldqr7r4"; + name = "kalgebra-17.12.1.tar.xz"; }; }; kalzium = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kalzium-17.12.0.tar.xz"; - sha256 = "0y7873q3zbqm3hgh3gglrdc0bad7pcjpv5fgdmxil3m6vand3kfl"; - name = "kalzium-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kalzium-17.12.1.tar.xz"; + sha256 = "13h4134w97dbsxrg4f6bgq5l14shlzg4djzwyiad4m892hmyrajn"; + name = "kalzium-17.12.1.tar.xz"; }; }; kamera = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kamera-17.12.0.tar.xz"; - sha256 = "0n60ycp4ldrn07lci6a78i8g0y5j708s4kgdrh2sn2f91ppwr90c"; - name = "kamera-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kamera-17.12.1.tar.xz"; + sha256 = "19ps2p6cwhgfw9ll8gjjdq7k88srcixsfmfsqk8jvi9jpfqcw9mn"; + name = "kamera-17.12.1.tar.xz"; }; }; kanagram = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kanagram-17.12.0.tar.xz"; - sha256 = "15v22d7jdjjlc8lyraiiwx29qv0xf94y30zb7r1p661b7l1zqba3"; - name = "kanagram-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kanagram-17.12.1.tar.xz"; + sha256 = "0pq0iwd7qrd5rc5jgm3ll2hgdxrjb6rq1qzz1175lj4b9ackn7ad"; + name = "kanagram-17.12.1.tar.xz"; }; }; kapman = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kapman-17.12.0.tar.xz"; - sha256 = "10jwyr6dzryam720n53xmcky6a8dgvh9gpwl6c4lx68swq4s62hb"; - name = "kapman-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kapman-17.12.1.tar.xz"; + sha256 = "1d0a36jj1prp6zsxhzxz081w6wr5p7hb6lx687nfrqhbiqkr9059"; + name = "kapman-17.12.1.tar.xz"; }; }; kapptemplate = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kapptemplate-17.12.0.tar.xz"; - sha256 = "17bkfnvaj23azra44rr9pf926nvwnsbzg5j23b65q83j6wd0k12w"; - name = "kapptemplate-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kapptemplate-17.12.1.tar.xz"; + sha256 = "1gcb8gc4x6f1brxqxdsppq61n8r20p9a0qq0pp8g88q1n5r3irpc"; + name = "kapptemplate-17.12.1.tar.xz"; }; }; kate = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kate-17.12.0.tar.xz"; - sha256 = "18nygn4ibxii4va84jlxc93j8v6v1wiilbfhvri140wdlfqqs1bv"; - name = "kate-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kate-17.12.1.tar.xz"; + sha256 = "0rnkp197ranq3hi9scw1k1nmqj05fhnifyk9gjbg4mp8wwn3zgcv"; + name = "kate-17.12.1.tar.xz"; }; }; katomic = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/katomic-17.12.0.tar.xz"; - sha256 = "1flkz4cvsrma12wyz84lcpirh1ns7ldn564asg25s7mffm2mlmni"; - name = "katomic-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/katomic-17.12.1.tar.xz"; + sha256 = "13xszrnc3bgz2vbzhhz00k1hzlzi7n7jvg61rjqg0frf0n4ccih0"; + name = "katomic-17.12.1.tar.xz"; }; }; kblackbox = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kblackbox-17.12.0.tar.xz"; - sha256 = "0q9rk2cy75r9pbfl10plm4wbii3x8pp08g0kpyly20f8h4bmb5hd"; - name = "kblackbox-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kblackbox-17.12.1.tar.xz"; + sha256 = "1iish6qs2q7pn9y8k4v07gkyqs0jq6ppdvxc6jfrkzymcnnaq9by"; + name = "kblackbox-17.12.1.tar.xz"; }; }; kblocks = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kblocks-17.12.0.tar.xz"; - sha256 = "08rq5crw9d3m231g8cpnrcd8628p4ci6abc32hkpbcd01qyjlvis"; - name = "kblocks-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kblocks-17.12.1.tar.xz"; + sha256 = "11kfm99hp6a4dp5q6bapq3axgkjmwcp1cd284plm3nxsd15sv87b"; + name = "kblocks-17.12.1.tar.xz"; }; }; kblog = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kblog-17.12.0.tar.xz"; - sha256 = "16hqdsni76ajm8a00xplh4k3cjckykbnv3bbf90hamx5cm8ycdf3"; - name = "kblog-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kblog-17.12.1.tar.xz"; + sha256 = "1f7ygzb3acgjr1ax768cv94l3li8lbq6230lkgqz6lms3x9plpdc"; + name = "kblog-17.12.1.tar.xz"; }; }; kbounce = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kbounce-17.12.0.tar.xz"; - sha256 = "1kgxl7nlr0j4y921bw1alrk40n3051bgcm08877iadna783j3xnd"; - name = "kbounce-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kbounce-17.12.1.tar.xz"; + sha256 = "18w0jxdfjkvrkz1g1k0f37ajjyxc7cazbp3qxg0m2pbrkllgs12v"; + name = "kbounce-17.12.1.tar.xz"; }; }; kbreakout = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kbreakout-17.12.0.tar.xz"; - sha256 = "0pvz250z6h1x8mhdcgb662yhc6j6sxgr48r24j017q5k8r1pc2w5"; - name = "kbreakout-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kbreakout-17.12.1.tar.xz"; + sha256 = "166ck3z0x77p6n065q41fwj3lvxyzsshpgmi7xavbjgjl6cb941r"; + name = "kbreakout-17.12.1.tar.xz"; }; }; kbruch = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kbruch-17.12.0.tar.xz"; - sha256 = "13brwkadwp92rwybxjcz3sb8iiy0rhykk2wlpn7jg8vfxi203v73"; - name = "kbruch-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kbruch-17.12.1.tar.xz"; + sha256 = "04ylr7jj1qz3clnavv195gqm4hi017jzrz3vbx0dg7jfqr9jvzxh"; + name = "kbruch-17.12.1.tar.xz"; }; }; kcachegrind = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcachegrind-17.12.0.tar.xz"; - sha256 = "04ddsj0gsb7s967gn2g7018q2zl3lflybgkzq7rjkpbxyn3d503z"; - name = "kcachegrind-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcachegrind-17.12.1.tar.xz"; + sha256 = "1qiwv7xpcf01s08bm83n77nhwplg19dd0zaqcr6xagjhf9y165xf"; + name = "kcachegrind-17.12.1.tar.xz"; }; }; kcalc = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcalc-17.12.0.tar.xz"; - sha256 = "04k369crs8nsz16dk4cwyx3l7nycypjc4xs9jzkjx9rl9k9vnrqr"; - name = "kcalc-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcalc-17.12.1.tar.xz"; + sha256 = "00asfczvfvfmfg0ffd0d2rh3nmqgzqf4f9bdkwq9z8gajfz3cjs1"; + name = "kcalc-17.12.1.tar.xz"; }; }; kcalcore = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcalcore-17.12.0.tar.xz"; - sha256 = "1n5isq169dm3ngsnmwdhlcs2k4rp5zncv72vx0rb9p84skqn7xh4"; - name = "kcalcore-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcalcore-17.12.1.tar.xz"; + sha256 = "0zyf3r3zwivjzqag76pi9wrbvzqzbcnraajbb0xksf9ik53gk3pd"; + name = "kcalcore-17.12.1.tar.xz"; }; }; kcalutils = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcalutils-17.12.0.tar.xz"; - sha256 = "19jwvakjiqwg3iakc8wgdw5fpyr2a2kpbxxsj9hf1ddi6wgq5hkq"; - name = "kcalutils-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcalutils-17.12.1.tar.xz"; + sha256 = "01djf24immjn62hxs2gsi5f27q54vh254wq3sqzgxz0vbfv97bza"; + name = "kcalutils-17.12.1.tar.xz"; }; }; kcharselect = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcharselect-17.12.0.tar.xz"; - sha256 = "190dhqc121bs4s13y4zdxrlwid7p1sjqj2ggb2xma6fq67bbsc2g"; - name = "kcharselect-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcharselect-17.12.1.tar.xz"; + sha256 = "14bh4n4bqi5y7ya6xi7ykl398i2qdkmximp87r5qcimxgvxfczki"; + name = "kcharselect-17.12.1.tar.xz"; }; }; kcolorchooser = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcolorchooser-17.12.0.tar.xz"; - sha256 = "17arn0fdqkb9ixhdxmh6sicp2cs6k8f5sg4jc4z0fi076ysxwnlb"; - name = "kcolorchooser-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcolorchooser-17.12.1.tar.xz"; + sha256 = "1aqzwbw7ajb5nzj2k107m32naj0c6nsdhzmg0w0wrd80fz2qnpx3"; + name = "kcolorchooser-17.12.1.tar.xz"; }; }; kcontacts = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcontacts-17.12.0.tar.xz"; - sha256 = "0358zb2imdnlilhz58niysvpfd6l33fjyiplzjdibswq1ad8bbbl"; - name = "kcontacts-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcontacts-17.12.1.tar.xz"; + sha256 = "152a9bhyya4rigmydfh6x932pp3vi4i1zya5sdlg9vr045ljgzwk"; + name = "kcontacts-17.12.1.tar.xz"; }; }; kcron = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kcron-17.12.0.tar.xz"; - sha256 = "092s5c4x59dflkgymk17pj7spzxl2vmiq76dr4d3ilh9w0yx77zl"; - name = "kcron-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kcron-17.12.1.tar.xz"; + sha256 = "0qzc8427l1hndisq163b4ppph8ividw38lxczirv186gm01xsgqk"; + name = "kcron-17.12.1.tar.xz"; }; }; kdav = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdav-17.12.0.tar.xz"; - sha256 = "0cqshlidk4fbznpv5yk9ghmx7wxlmfmsd8w3pkqnbznzh2pd6zns"; - name = "kdav-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdav-17.12.1.tar.xz"; + sha256 = "09q1d0yzhwr4gr4xfp1zbmqbdhrw827y379blqg1351k8mxvfhzi"; + name = "kdav-17.12.1.tar.xz"; }; }; kdebugsettings = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdebugsettings-17.12.0.tar.xz"; - sha256 = "076g2hymykm6dxln3llwfhayzrdswjy9cjdhwi70kxmw3xd1x3fl"; - name = "kdebugsettings-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdebugsettings-17.12.1.tar.xz"; + sha256 = "0ac8mnjm7mvk9988ds0kvgxnjfkpv8iiwgaccsykiqgpnk8dx7qh"; + name = "kdebugsettings-17.12.1.tar.xz"; }; }; kde-dev-scripts = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kde-dev-scripts-17.12.0.tar.xz"; - sha256 = "0yl0xffgr94ymk5cw32z1y9ymn1rr9nyh9k3gip9aspi3rmrhw4r"; - name = "kde-dev-scripts-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kde-dev-scripts-17.12.1.tar.xz"; + sha256 = "1cxfjc4can7ggbrcdz03lsalq221fw5qmcw9y35kqs504wgc0g1w"; + name = "kde-dev-scripts-17.12.1.tar.xz"; }; }; kde-dev-utils = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kde-dev-utils-17.12.0.tar.xz"; - sha256 = "0qf1mpp4cq1gdhd29d5v2lvcdsi8k9xivqly1jha96b0wgziqqwq"; - name = "kde-dev-utils-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kde-dev-utils-17.12.1.tar.xz"; + sha256 = "0mnk6zzq0xa3fd32c46gyjsqsxji5p7ky5g7bly2myhl7f03hnc0"; + name = "kde-dev-utils-17.12.1.tar.xz"; }; }; kdeedu-data = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdeedu-data-17.12.0.tar.xz"; - sha256 = "0fpxhz1pj1lz2b2l45ivmlr36hayj4h1g6b0960wavmhdfacr0pi"; - name = "kdeedu-data-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdeedu-data-17.12.1.tar.xz"; + sha256 = "0i917gys8bpsmswm7rp2idbrwv5470cvp4xa0wxfnnq0y6nxj0w3"; + name = "kdeedu-data-17.12.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdegraphics-mobipocket-17.12.0.tar.xz"; - sha256 = "1015nd0cn1mbak68h0gl2hsax6angwxvssa8j8wsv96rnjfpds9f"; - name = "kdegraphics-mobipocket-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdegraphics-mobipocket-17.12.1.tar.xz"; + sha256 = "09bh0qjzr27zkvz5cyrxpx5pkz9fldr2yxzc1f3hxs2fmqgj7rc6"; + name = "kdegraphics-mobipocket-17.12.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdegraphics-thumbnailers-17.12.0.tar.xz"; - sha256 = "1p0jj4j28rab2m68zaiqfkz5h65ar99v5qd7v3jj7yqkgimiqrkh"; - name = "kdegraphics-thumbnailers-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdegraphics-thumbnailers-17.12.1.tar.xz"; + sha256 = "0fm8vsbmaxibjlkjkbic7b8x3xrz8nrjn8r8ps4mka4hnsmkk2b9"; + name = "kdegraphics-thumbnailers-17.12.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdenetwork-filesharing-17.12.0.tar.xz"; - sha256 = "0hhgxmsnjxv99qjbgyw0fli9mxffbk0i4lnmzla186i3wbbq0fng"; - name = "kdenetwork-filesharing-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdenetwork-filesharing-17.12.1.tar.xz"; + sha256 = "10d0ayd3krkac0249smnxn8jfyj9rfy1jjx0d2sqs28jhq5z8892"; + name = "kdenetwork-filesharing-17.12.1.tar.xz"; }; }; kdenlive = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdenlive-17.12.0.tar.xz"; - sha256 = "1jn8bbsdishccdp7lqqyr9y7wcw7rq4gsisp3cjkdbzg44ahjmnp"; - name = "kdenlive-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdenlive-17.12.1.tar.xz"; + sha256 = "0rv52w6kccsz6796nhn5hw0x5x2jjwx7y8jxmglc7jbdlsf90bj1"; + name = "kdenlive-17.12.1.tar.xz"; }; }; kdepim-addons = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdepim-addons-17.12.0.tar.xz"; - sha256 = "0z13271dwavf4fiixbxc17l4iajk5dyfnfmjgdq95cpfajk5zchs"; - name = "kdepim-addons-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdepim-addons-17.12.1.tar.xz"; + sha256 = "19sn4j4ks5iqmcgnir1p2hgzvgncy2iqdvwq7p4ns7hy35bl59n3"; + name = "kdepim-addons-17.12.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdepim-apps-libs-17.12.0.tar.xz"; - sha256 = "19ml929qzxzdm3rgnvqni63xq4h692wwr3gnh8x3m32gdc1shslx"; - name = "kdepim-apps-libs-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdepim-apps-libs-17.12.1.tar.xz"; + sha256 = "1xy7wcz4wk9qcgmss3xfbkhyhvfp31c13n1wj7a4ar724s35sja9"; + name = "kdepim-apps-libs-17.12.1.tar.xz"; }; }; kdepim-runtime = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdepim-runtime-17.12.0.tar.xz"; - sha256 = "1xxka2hi0ih8g4lxdga47zix3hf3krdh9rf5bvmpj7z1j317zvnp"; - name = "kdepim-runtime-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdepim-runtime-17.12.1.tar.xz"; + sha256 = "0k2b52smz68b9ijcdawimnh471zzadqnfxhvkvprkah952p23z32"; + name = "kdepim-runtime-17.12.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdesdk-kioslaves-17.12.0.tar.xz"; - sha256 = "020a7d4k5901rpwxibm4ncm8vdncyranp8bmajzq4d3x1q2i63x8"; - name = "kdesdk-kioslaves-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdesdk-kioslaves-17.12.1.tar.xz"; + sha256 = "07zv4xkgqpirc0jzidbv0nc5bgqn5sywz9lvgs2v73v1pz1gy13m"; + name = "kdesdk-kioslaves-17.12.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdesdk-thumbnailers-17.12.0.tar.xz"; - sha256 = "11fmy2g1nhzgv158vhc1x57is4qjhkv4gkkafnmvww3cj2alsipx"; - name = "kdesdk-thumbnailers-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdesdk-thumbnailers-17.12.1.tar.xz"; + sha256 = "0r2dpin3cf19qii0sfl4s8pj99n0fsxgc1l1lh3bnm94z7myld2c"; + name = "kdesdk-thumbnailers-17.12.1.tar.xz"; }; }; kdf = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdf-17.12.0.tar.xz"; - sha256 = "1g55wzjwyi3x1bfr4vpv4rbiah3fb5cdqx4h4cb4pxi7438hifbg"; - name = "kdf-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdf-17.12.1.tar.xz"; + sha256 = "0jk9i94mc0jb08z4vnnr3m6mlih6y877hll42p0iywliwsbnyz21"; + name = "kdf-17.12.1.tar.xz"; }; }; kdialog = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdialog-17.12.0.tar.xz"; - sha256 = "1n1466qsgcj0x9z1745pvqcyljz3215kz71jd9ckghz8v3xllyrw"; - name = "kdialog-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdialog-17.12.1.tar.xz"; + sha256 = "075xhg3bzyxaanixlzr740km2z84csx4jbq37gijdz6rllnxjxwl"; + name = "kdialog-17.12.1.tar.xz"; }; }; kdiamond = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kdiamond-17.12.0.tar.xz"; - sha256 = "1x08y561l3qwnwwx4wp7j4y26cv0g102csm9zgy8pwp32r74c7my"; - name = "kdiamond-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kdiamond-17.12.1.tar.xz"; + sha256 = "08qw7gry0zdrslq5dpzm45blcr951xnrgfs75jpw3f7g9xy042kx"; + name = "kdiamond-17.12.1.tar.xz"; }; }; keditbookmarks = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/keditbookmarks-17.12.0.tar.xz"; - sha256 = "0kpm9a3b7ylf0admyfll7ysjmn76gihgh1d0faxvcdg099f19n2z"; - name = "keditbookmarks-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/keditbookmarks-17.12.1.tar.xz"; + sha256 = "1ml3bl6f24c6cs4hfa87rvyax36wcjxkh94iy5xwlhfd176qcjnn"; + name = "keditbookmarks-17.12.1.tar.xz"; }; }; kfind = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kfind-17.12.0.tar.xz"; - sha256 = "066780dnn031ppavin14jikxs8v1qv5b5hvxxdbfhay01gmj6fzy"; - name = "kfind-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kfind-17.12.1.tar.xz"; + sha256 = "0z97w4p86ylkndq12dphpfa0r10ld2b5fvcj1xdfa9cic14lgfxk"; + name = "kfind-17.12.1.tar.xz"; }; }; kfloppy = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kfloppy-17.12.0.tar.xz"; - sha256 = "0q61b8yw69gf9ssxkvisnk5i2f9plsxybdnzx6pfv6fxi427pv69"; - name = "kfloppy-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kfloppy-17.12.1.tar.xz"; + sha256 = "11gc0v1nkwg6f334ydsh289s5bgxr7ccdybbw3zq16q0vih9px3a"; + name = "kfloppy-17.12.1.tar.xz"; }; }; kfourinline = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kfourinline-17.12.0.tar.xz"; - sha256 = "0gs5lpbv4vwknkj90i874ylmanc5lw5dx0hibg9khadqv7qgj1cr"; - name = "kfourinline-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kfourinline-17.12.1.tar.xz"; + sha256 = "0rb6z0siw8yhf4w3m9hrkv6csm4vdr8qj7754c41fqkrnlfa8w96"; + name = "kfourinline-17.12.1.tar.xz"; }; }; kgeography = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kgeography-17.12.0.tar.xz"; - sha256 = "14i0bpncqgldg7sviyqjhv2nw81g5niidvm15d3n4v5p2msabvv4"; - name = "kgeography-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kgeography-17.12.1.tar.xz"; + sha256 = "1v6xyqv8d4faj0ix7jwq8ralr8s8vi8ryn6hy1i4lj3a06mvgk5z"; + name = "kgeography-17.12.1.tar.xz"; }; }; kget = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kget-17.12.0.tar.xz"; - sha256 = "17al8j2dw0hdsrpgjbz4j8qgxqsj8asy9s4pqb5ks34an2vb7bp3"; - name = "kget-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kget-17.12.1.tar.xz"; + sha256 = "1n6z92fcbvnvzk3wwpfrf8ycx3kv8vnybpay6hmr63vnbgn7bssw"; + name = "kget-17.12.1.tar.xz"; }; }; kgoldrunner = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kgoldrunner-17.12.0.tar.xz"; - sha256 = "0cm6rw2ar2j7xpnzrih39rrjky2cv6s6samqv2bfal7l7ra6ad3h"; - name = "kgoldrunner-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kgoldrunner-17.12.1.tar.xz"; + sha256 = "01c2439a7vic3nxhnzhjph3qnfp6qm7yv6qcanxaf2jy7idbm5zq"; + name = "kgoldrunner-17.12.1.tar.xz"; }; }; kgpg = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kgpg-17.12.0.tar.xz"; - sha256 = "1mabbarra8kca0r72pacbrgp3pcbb94ycm7z2sb65gd8d0qily7k"; - name = "kgpg-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kgpg-17.12.1.tar.xz"; + sha256 = "1h82gx0y7vm3n7idhqdawns47fmjv6szz3qivds4jj0wx9z2gc9f"; + name = "kgpg-17.12.1.tar.xz"; }; }; khangman = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/khangman-17.12.0.tar.xz"; - sha256 = "09n62lkxrryvq36hmcygi4mdiy0r1ydql9khv3yz1p2zfz81qmwg"; - name = "khangman-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/khangman-17.12.1.tar.xz"; + sha256 = "1a5ifxm2flkbxy1lqvkaz48ff57yvhqm49j3l637q60i7v2gd75q"; + name = "khangman-17.12.1.tar.xz"; }; }; khelpcenter = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/khelpcenter-17.12.0.tar.xz"; - sha256 = "0mcw60w3d93zgncvakzdds3mazw7ck469i20x4wwv6cd98cg1f7k"; - name = "khelpcenter-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/khelpcenter-17.12.1.tar.xz"; + sha256 = "0y7axdqfmbd2sas5c6ncsi6bpbh95mgymsbpvp2gv7r7d3p11irj"; + name = "khelpcenter-17.12.1.tar.xz"; }; }; kholidays = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kholidays-17.12.0.tar.xz"; - sha256 = "1m6vh2f0mm71jhbil0ck31axvhbxqpibzpf7x82fcrwmgvwjlzyg"; - name = "kholidays-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kholidays-17.12.1.tar.xz"; + sha256 = "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8"; + name = "kholidays-17.12.1.tar.xz"; }; }; kidentitymanagement = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kidentitymanagement-17.12.0.tar.xz"; - sha256 = "1jdlnjzabpfsbxp0yv1xanhp4hbigj7z80qsi0h27b3k0h3i4i8p"; - name = "kidentitymanagement-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kidentitymanagement-17.12.1.tar.xz"; + sha256 = "1hz1zawc3zmbj0ylhxc4p1qgffpjbpvzhj5mi4b5zvi0nblqsnk6"; + name = "kidentitymanagement-17.12.1.tar.xz"; }; }; kig = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kig-17.12.0.tar.xz"; - sha256 = "06f5dcwqf012a4rszyf4mxjaaj4g35kn30pklsvb7kvdd2ybnmcf"; - name = "kig-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kig-17.12.1.tar.xz"; + sha256 = "0nvsz4q51bjr380w8gfzfahigpxyap7bf54lnllhfbad673b897d"; + name = "kig-17.12.1.tar.xz"; }; }; kigo = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kigo-17.12.0.tar.xz"; - sha256 = "0zrl0js6zj41ag9xp65kzmmli6phqps6w7a0sbg8h7qd0m1ml1v7"; - name = "kigo-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kigo-17.12.1.tar.xz"; + sha256 = "01f0l6fs12v5m88hc9g788mq4k61irgdnf47h7hln4k62rn7yfp9"; + name = "kigo-17.12.1.tar.xz"; }; }; killbots = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/killbots-17.12.0.tar.xz"; - sha256 = "1594mdzdj9754gb26smains54lf1xs7mdxkx716cqjkm9fs7vv3s"; - name = "killbots-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/killbots-17.12.1.tar.xz"; + sha256 = "16x72i36vy8a2r7bsg5qmg7bs91cxk3r1yhk8ch8666jl8jvxlnx"; + name = "killbots-17.12.1.tar.xz"; }; }; kimagemapeditor = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kimagemapeditor-17.12.0.tar.xz"; - sha256 = "0dd0yg29r6cada1arm2b7ihjxc015hd56dzygc66cxy0ni8cxmyn"; - name = "kimagemapeditor-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kimagemapeditor-17.12.1.tar.xz"; + sha256 = "0zhrfr17596swxp7g53y74kh3pndgpjk8lrxfhpvxn45628wzb62"; + name = "kimagemapeditor-17.12.1.tar.xz"; }; }; kimap = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kimap-17.12.0.tar.xz"; - sha256 = "08hh5phcj33sni2bz8jqcip7ilvv9q0i0m4wxnlawli2wxkpzab5"; - name = "kimap-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kimap-17.12.1.tar.xz"; + sha256 = "1isga4zz98qcgfhvvjmkm0fv8fm27japzc69il814bypd49bkvmb"; + name = "kimap-17.12.1.tar.xz"; }; }; kio-extras = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kio-extras-17.12.0.tar.xz"; - sha256 = "07jj8fhvyl84y8b9q4vc2lha4fin44qjr77iynif4l79g98ns5ls"; - name = "kio-extras-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kio-extras-17.12.1.tar.xz"; + sha256 = "0vqzvd9linv6y6pfqdi9az79d9294wadz96pr03zwhbak0z5bw65"; + name = "kio-extras-17.12.1.tar.xz"; }; }; kiriki = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kiriki-17.12.0.tar.xz"; - sha256 = "0q7av2ff41vlnpb5p0zi1arzwc6568ddq98lypkkm376rjg47759"; - name = "kiriki-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kiriki-17.12.1.tar.xz"; + sha256 = "08xhsdxz0w0qw155zasyq49r1hfqqrbk916lxilmqgkxqww53wgw"; + name = "kiriki-17.12.1.tar.xz"; }; }; kiten = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kiten-17.12.0.tar.xz"; - sha256 = "004x368gnw4x79q0g2c3xk4xj1qfqs9l9la46051kapbr96qkjgl"; - name = "kiten-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kiten-17.12.1.tar.xz"; + sha256 = "1mrlj80m1g7r9wwmyrz7iq0lz5lmx56h8fzwcg4nkpim571cn6ch"; + name = "kiten-17.12.1.tar.xz"; }; }; kjumpingcube = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kjumpingcube-17.12.0.tar.xz"; - sha256 = "12w7grdiddgk6k6qliw2n7b6smfw16ba4scmdy047ckfdajxm73f"; - name = "kjumpingcube-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kjumpingcube-17.12.1.tar.xz"; + sha256 = "04bzxq4r7jr776g7hyf2wm08y7j9y5wy0c2war7mn2nc8an2rnna"; + name = "kjumpingcube-17.12.1.tar.xz"; }; }; kldap = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kldap-17.12.0.tar.xz"; - sha256 = "18bx8fsamz6p791nmmgpd25rhy5zwb15hwkf0qsfyvxkygpw5jvv"; - name = "kldap-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kldap-17.12.1.tar.xz"; + sha256 = "0gn84blvrfspvw4gaqisrsdxp2051j5xva00cw3lv9n0vyrq8vqf"; + name = "kldap-17.12.1.tar.xz"; }; }; kleopatra = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kleopatra-17.12.0.tar.xz"; - sha256 = "1dkgby8v7dxy4h69hm2j46ch3599drdj9p8x0da184d9isvjzyc2"; - name = "kleopatra-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kleopatra-17.12.1.tar.xz"; + sha256 = "1rzil9m982iilwpz8qi6j8brrwvzcdrmzldrwaqdpa1v56sjq5f0"; + name = "kleopatra-17.12.1.tar.xz"; }; }; klettres = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/klettres-17.12.0.tar.xz"; - sha256 = "1wfihmsx6sb3d2d8y6m5v1x17sraw8ql63qjprf80nzdrg5c1hyf"; - name = "klettres-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/klettres-17.12.1.tar.xz"; + sha256 = "1ibrkwy9bb60cilmnv46zhw0zl4lv8sn9wddjg53havh38rwjgwc"; + name = "klettres-17.12.1.tar.xz"; }; }; klickety = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/klickety-17.12.0.tar.xz"; - sha256 = "1s6bj19z9vvqcv8pwx5ja38mwpw05vkbfbfaay55y5ssxq8wvdfm"; - name = "klickety-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/klickety-17.12.1.tar.xz"; + sha256 = "09d8mkca0p5fp93i5w30zbvz746j7cvz11wrscjbg2n6vi36pcbd"; + name = "klickety-17.12.1.tar.xz"; }; }; klines = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/klines-17.12.0.tar.xz"; - sha256 = "1abwgyfm0qhwy07zbjs8pbq2s3m0kbwlmpfah3g4cvjq0b2i0wch"; - name = "klines-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/klines-17.12.1.tar.xz"; + sha256 = "0b9srbianz3c5knbm9cwn9f5i88pg5v5gc1fnz1vgir2izlyx5pg"; + name = "klines-17.12.1.tar.xz"; }; }; kmag = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmag-17.12.0.tar.xz"; - sha256 = "0i8h8c4ajvri4chwl3whmbcikrqkx32ijgkxihlmfk1s1h3hiqj5"; - name = "kmag-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmag-17.12.1.tar.xz"; + sha256 = "04z02kyaf5xfb8j4fxq1i5b08hvl2j9dbik2liiykzdhv5kn8di8"; + name = "kmag-17.12.1.tar.xz"; }; }; kmahjongg = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmahjongg-17.12.0.tar.xz"; - sha256 = "0cqgjnm12g7c5dagd6677a1bbcj8y4ccn38bv624zc8444nm3n6y"; - name = "kmahjongg-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmahjongg-17.12.1.tar.xz"; + sha256 = "1d46d8dpx969sih2dlc6qf3kiqj9ry7w8jgqczsjnm1irh6l7gqd"; + name = "kmahjongg-17.12.1.tar.xz"; }; }; kmail = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmail-17.12.0.tar.xz"; - sha256 = "1bykjx68d2fnspv0if8sqhgz3bg3fh0hhsmhsanrl5zkbswi2krp"; - name = "kmail-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmail-17.12.1.tar.xz"; + sha256 = "0dfzgf0mpjanq43fwlv4165ggxi1iqv8dfxpgdf8vg1l8ckb86p0"; + name = "kmail-17.12.1.tar.xz"; }; }; kmail-account-wizard = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmail-account-wizard-17.12.0.tar.xz"; - sha256 = "0mz5jkxqn2vd5py1ndf9ly02a9ixmah6z360y021bhl55zdh96z6"; - name = "kmail-account-wizard-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmail-account-wizard-17.12.1.tar.xz"; + sha256 = "0swilpfry4fqkjpd4hwqxycxy2655znphppp67h5fjrnjbvpkyfv"; + name = "kmail-account-wizard-17.12.1.tar.xz"; }; }; kmailtransport = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmailtransport-17.12.0.tar.xz"; - sha256 = "06izygskzkgcz3aaadnd33dbk26n0nrk6nvy3bic7g1p7s26qf9m"; - name = "kmailtransport-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmailtransport-17.12.1.tar.xz"; + sha256 = "1yxxj93lxfb068z5f5dhz85jy3f0a76zifvxgh8ph05n2kr23rq3"; + name = "kmailtransport-17.12.1.tar.xz"; }; }; kmbox = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmbox-17.12.0.tar.xz"; - sha256 = "1nwnygb483r9sfxa67g6s6z1ix4nwx6cy6jq2i7sbzcxzv7qyxga"; - name = "kmbox-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmbox-17.12.1.tar.xz"; + sha256 = "12ds7kzrjb885ip73drd9q40gb59d8yhr3y8pdkmz048z7495dh9"; + name = "kmbox-17.12.1.tar.xz"; }; }; kmime = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmime-17.12.0.tar.xz"; - sha256 = "0fyfjc6l1jqs5m0pvk12714b5hjdkd4rsbk5b8i2pxddlqxa0m8x"; - name = "kmime-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmime-17.12.1.tar.xz"; + sha256 = "1659ri4fxmfnkfa6nqbhkvpj349ynhcl254hwp43pngf1zmk280x"; + name = "kmime-17.12.1.tar.xz"; }; }; kmines = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmines-17.12.0.tar.xz"; - sha256 = "0cv0rby602c32zpcprp9fvx3w8pijzavsmmnwma6kk289bmw8klm"; - name = "kmines-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmines-17.12.1.tar.xz"; + sha256 = "0dhwda6gkjix0lmb3wcz6ds8fglzw7i8wg85a2ij6amc6am9014j"; + name = "kmines-17.12.1.tar.xz"; }; }; kmix = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmix-17.12.0.tar.xz"; - sha256 = "18g7hwz0p496bcvdxpa9n82wgs9a2xplrkk4jhx0svh2wd0zihj0"; - name = "kmix-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmix-17.12.1.tar.xz"; + sha256 = "1xf46qjn6ax5w8z7l78wcw4k4j59c40vncmrpqdb62kmr4zi0m7q"; + name = "kmix-17.12.1.tar.xz"; }; }; kmousetool = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmousetool-17.12.0.tar.xz"; - sha256 = "0kzkpq2nc961pik8kw4cdd3k9wad40bczgaz9k5iwxxwwk3b8wl0"; - name = "kmousetool-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmousetool-17.12.1.tar.xz"; + sha256 = "1qbxq4b892i4ssjbky0i5jk96q8zs4lr859y3190kz538g5jakh0"; + name = "kmousetool-17.12.1.tar.xz"; }; }; kmouth = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmouth-17.12.0.tar.xz"; - sha256 = "1npzrfiddy5frnga20xiqblzfn0mk9xfdq60l2xi9wanlbbhfi2x"; - name = "kmouth-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmouth-17.12.1.tar.xz"; + sha256 = "1yn510zhcw9kw0qcy21k85ryhki56lvgzgzq2hjqbjq0ymzpmlmp"; + name = "kmouth-17.12.1.tar.xz"; }; }; kmplot = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kmplot-17.12.0.tar.xz"; - sha256 = "1z8i1klj8irix7nylkqfchwryk1h5il7snlgmndcfkyd71yhb71k"; - name = "kmplot-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kmplot-17.12.1.tar.xz"; + sha256 = "06ybsjl9m9awjb70inm7i2hg92p34gqmb4vc5sn8jm2ckm5qsgc6"; + name = "kmplot-17.12.1.tar.xz"; }; }; knavalbattle = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/knavalbattle-17.12.0.tar.xz"; - sha256 = "1bw7l197690rq9m347nk79rrgdfyap436l01m45y9bkyk0lxmgk8"; - name = "knavalbattle-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/knavalbattle-17.12.1.tar.xz"; + sha256 = "1yzf70lnjvyk63bv88ycjcwxnbwp0wh2lifqq7m34n3c51ifhd5g"; + name = "knavalbattle-17.12.1.tar.xz"; }; }; knetwalk = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/knetwalk-17.12.0.tar.xz"; - sha256 = "0hax9p3lypaqqvvgyjp8082bvaz6fp8nsbgm0qicl55j5ah9gzjs"; - name = "knetwalk-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/knetwalk-17.12.1.tar.xz"; + sha256 = "078gzqyq33val8kvsfw63r0jhnh8q2lwv7p11a8z2qy44cp0bg25"; + name = "knetwalk-17.12.1.tar.xz"; }; }; knotes = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/knotes-17.12.0.tar.xz"; - sha256 = "1awmn4drm0vb8ppabc9ljcwpbvrmvziib82ik46g5lsdg0bd1xl0"; - name = "knotes-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/knotes-17.12.1.tar.xz"; + sha256 = "16bjbxc5l3nxcw6k7csq0phr2hamk4ps1b367s8j6x5w81y3gypw"; + name = "knotes-17.12.1.tar.xz"; }; }; kolf = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kolf-17.12.0.tar.xz"; - sha256 = "03hxknch0mjwmmgjqgg1wn27mz3d4zrsppmajxkm1mafr517gx5n"; - name = "kolf-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kolf-17.12.1.tar.xz"; + sha256 = "0sgn5702rf3kmflrb0dxlgvx0lb7ajfyq6izzqh147kkp9s8h44i"; + name = "kolf-17.12.1.tar.xz"; }; }; kollision = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kollision-17.12.0.tar.xz"; - sha256 = "13wg2j3pdr5qlwp1hcqfxamxfdx6ppdr4ccvbabn6s8w7n73cm02"; - name = "kollision-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kollision-17.12.1.tar.xz"; + sha256 = "08px3m7jl78cg4mbsfwp4xa0fm7kp0p12zb973iy2ipqnhp1wkqp"; + name = "kollision-17.12.1.tar.xz"; }; }; kolourpaint = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kolourpaint-17.12.0.tar.xz"; - sha256 = "1pcld1anafnb9s7dvm1kzr1wbhf9728z4v1pk44n9grqas8p3z5l"; - name = "kolourpaint-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kolourpaint-17.12.1.tar.xz"; + sha256 = "1cdz7dhjmg757y70lzsxzsn1k2ih2q89vdcy8vgwggx9b47xgbar"; + name = "kolourpaint-17.12.1.tar.xz"; }; }; kompare = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kompare-17.12.0.tar.xz"; - sha256 = "1aiiw11g7ipfsil7wfaabqr1y9k31s3l1swhhx4chcdri2d00gwc"; - name = "kompare-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kompare-17.12.1.tar.xz"; + sha256 = "09w9g20hkgnvdv7g27pmw3kb82f52ia30fbg9dswbv5snjr82db3"; + name = "kompare-17.12.1.tar.xz"; }; }; konqueror = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/konqueror-17.12.0.tar.xz"; - sha256 = "19ypj6kgawvn5jkz73l4j54lpjm9ldikl3i35nc1xp0pzgd6vkjy"; - name = "konqueror-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/konqueror-17.12.1.tar.xz"; + sha256 = "0nfsfzyzd27m9sxrs2yx2rywkj31ip0qkna5frflsh4fa13jbnjw"; + name = "konqueror-17.12.1.tar.xz"; }; }; konquest = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/konquest-17.12.0.tar.xz"; - sha256 = "0p5d0bzzpnqnnqvxryn5l1a5gf3w50fihm777607q74mvx4m2h1l"; - name = "konquest-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/konquest-17.12.1.tar.xz"; + sha256 = "1yph9hp40v1z9kfz7n72hi7y17fbrsgfn7jqdyk0dc7j3ldhji5y"; + name = "konquest-17.12.1.tar.xz"; }; }; konsole = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/konsole-17.12.0.tar.xz"; - sha256 = "0hazq3yjsw9f4vg9dksasvslhldcyn9zl17fn46ldw44dp9y5imd"; - name = "konsole-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/konsole-17.12.1.tar.xz"; + sha256 = "0k8d5am4qb5p1w02fbn164ffwlg1mg5hjxh5848dvrip8gxhhq40"; + name = "konsole-17.12.1.tar.xz"; }; }; kontact = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kontact-17.12.0.tar.xz"; - sha256 = "0spryq6m9hvljn3s55ahlacsqymrf1yv149imhalkfr26h3zqsna"; - name = "kontact-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kontact-17.12.1.tar.xz"; + sha256 = "1ml71112422sggpi7y3lyn0gs374k99hpy9g4991vsyx53z5yn53"; + name = "kontact-17.12.1.tar.xz"; }; }; kontactinterface = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kontactinterface-17.12.0.tar.xz"; - sha256 = "15fhrq4hfxi84zw2gm0i1wq9inxxaaic64z71zvaw0wv4hf9js9b"; - name = "kontactinterface-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kontactinterface-17.12.1.tar.xz"; + sha256 = "13a898b60mfbi6ara411ns0b7r57vfsq3wbdkq2c6fag5jsafaxl"; + name = "kontactinterface-17.12.1.tar.xz"; }; }; korganizer = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/korganizer-17.12.0.tar.xz"; - sha256 = "0s7j2myr873rajmn49kd1lm99a7gcj65ajqz75l207cvni9z2ydl"; - name = "korganizer-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/korganizer-17.12.1.tar.xz"; + sha256 = "0qrqmiv86f17w8ycfxk8dj3r5ajzyp667kd8cq9yz9xzzf76xhlh"; + name = "korganizer-17.12.1.tar.xz"; }; }; kpat = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kpat-17.12.0.tar.xz"; - sha256 = "1zzhzsx6kpaqvawihyd8lascig1m0f5rh41b38jbvcc9ihfknwhp"; - name = "kpat-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kpat-17.12.1.tar.xz"; + sha256 = "1f12jad1439zbrmya1hwbfsz6mxgjncchy94a1ynic5p8ixmja32"; + name = "kpat-17.12.1.tar.xz"; }; }; kpimtextedit = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kpimtextedit-17.12.0.tar.xz"; - sha256 = "07092z46r94hh5r5qxpwfqzinmaqnanv3ah220cckp8axv04njrm"; - name = "kpimtextedit-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kpimtextedit-17.12.1.tar.xz"; + sha256 = "08qcrd6ii0hp8afjwk2g64lvxyndy36lnzklc8hszls82h5qablp"; + name = "kpimtextedit-17.12.1.tar.xz"; }; }; kqtquickcharts = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kqtquickcharts-17.12.0.tar.xz"; - sha256 = "02vf68nnixvsqg14gp5ddif20rp2b6ag1amr91zp8ymw9vpaqsfg"; - name = "kqtquickcharts-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kqtquickcharts-17.12.1.tar.xz"; + sha256 = "09ppnv95dxrl1wr4h9kmxjhrj8q3h40jjjz68k3d9nzhzb1lz7vi"; + name = "kqtquickcharts-17.12.1.tar.xz"; }; }; krdc = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/krdc-17.12.0.tar.xz"; - sha256 = "07ggwr59y71bkkd83v2ilhm4vkn6fhwjki9svsm1f366x8fhsjx6"; - name = "krdc-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/krdc-17.12.1.tar.xz"; + sha256 = "1hs7f55s8r6f9h1f5g357zvdzn1dgw5y9pih9n3yxa2522bh0j7r"; + name = "krdc-17.12.1.tar.xz"; }; }; kreversi = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kreversi-17.12.0.tar.xz"; - sha256 = "0b4ibgyra929vy0ml2j8qrh731gbnrwzy213qsrj19ax7rdbg242"; - name = "kreversi-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kreversi-17.12.1.tar.xz"; + sha256 = "0vgxwv0cpnpr4q2fdgc1nsrxrac59db558gwbw706a2yh3bn69dk"; + name = "kreversi-17.12.1.tar.xz"; }; }; krfb = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/krfb-17.12.0.tar.xz"; - sha256 = "10m6xsbs8qbzx9gsb754gydvnylrnq9d6kfbb4m2zz2fpqp4pf36"; - name = "krfb-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/krfb-17.12.1.tar.xz"; + sha256 = "101h35f8vk3fgbjpw3f32cs6nc184z43qd3q345cq564cmh6h7z3"; + name = "krfb-17.12.1.tar.xz"; }; }; kross-interpreters = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kross-interpreters-17.12.0.tar.xz"; - sha256 = "1bzwq47dz00ap42z3060b7jnshjajscc3c0wzbdhy1a4dyw51845"; - name = "kross-interpreters-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kross-interpreters-17.12.1.tar.xz"; + sha256 = "1n9y7ynnkg8h61kyv894bwja3i2z1a5h2542flriny9788xfwwp0"; + name = "kross-interpreters-17.12.1.tar.xz"; }; }; kruler = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kruler-17.12.0.tar.xz"; - sha256 = "1234ixmjvd193lhw5k5s56mp9mzazy3dkhr0gs8nnqxr3rnzk76j"; - name = "kruler-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kruler-17.12.1.tar.xz"; + sha256 = "0yxyqrz901fimdqap20rdarikdlcd9rlxmsl7dbfgrgjygxdhwlf"; + name = "kruler-17.12.1.tar.xz"; }; }; kshisen = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kshisen-17.12.0.tar.xz"; - sha256 = "0cibkb65sg0nrv8xld5x30jdbkbvz473hk3dsf6ag206cya21k4s"; - name = "kshisen-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kshisen-17.12.1.tar.xz"; + sha256 = "1sx1dcjg1pbww3xx3r8ackswp61nmlawi5nf38ppgnpmcgz3b7md"; + name = "kshisen-17.12.1.tar.xz"; }; }; ksirk = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ksirk-17.12.0.tar.xz"; - sha256 = "1jp15l6j1cds282vz4yr1c8aq33q9zim9plhk3l56i1pbqsiwm4j"; - name = "ksirk-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ksirk-17.12.1.tar.xz"; + sha256 = "112m9liq8xfjqnz0fbb7qpi54vys4mcp3i0zvph8i7aidqch6jbk"; + name = "ksirk-17.12.1.tar.xz"; }; }; ksmtp = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ksmtp-17.12.0.tar.xz"; - sha256 = "0kii3ikf18bqzyxzw48qymrafnwxz2761i9vgfbnsl55v96jwjyq"; - name = "ksmtp-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ksmtp-17.12.1.tar.xz"; + sha256 = "11y0pwfy2pzjj678b53x222x0vzbxsng8j936s4afy1dbpx66ms2"; + name = "ksmtp-17.12.1.tar.xz"; }; }; ksnakeduel = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ksnakeduel-17.12.0.tar.xz"; - sha256 = "0ial173raw00kv5l6ysb3y0s6fvazy9zvgmqllxsaqsbdc5pamk4"; - name = "ksnakeduel-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ksnakeduel-17.12.1.tar.xz"; + sha256 = "1py4zcn311kh4kjzmwrviy91i9gj94fivdqyvfhzkbis59hwvnf4"; + name = "ksnakeduel-17.12.1.tar.xz"; }; }; kspaceduel = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kspaceduel-17.12.0.tar.xz"; - sha256 = "0azf2dq8mpabqq29fcmp660hvp5ziq1c63ypby4r60cw07a224qg"; - name = "kspaceduel-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kspaceduel-17.12.1.tar.xz"; + sha256 = "16flrinzg2pysgab2mygijc9pb96ps28pk4ybnxc5bswzhkbhqyz"; + name = "kspaceduel-17.12.1.tar.xz"; }; }; ksquares = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ksquares-17.12.0.tar.xz"; - sha256 = "1lv1bxn6p5d08r7a4w03kr12z518xjr1v74vj0lmyhrx234kzbn4"; - name = "ksquares-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ksquares-17.12.1.tar.xz"; + sha256 = "0ma162lsh0vgis1qgsbav6w3v628s29mj4hgs05hlhl576f7h1zw"; + name = "ksquares-17.12.1.tar.xz"; }; }; ksudoku = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ksudoku-17.12.0.tar.xz"; - sha256 = "0bwr93lc2fp25qdzz0d45zya9cqkxq0jmfmbncvz3j4229dlgz71"; - name = "ksudoku-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ksudoku-17.12.1.tar.xz"; + sha256 = "16d2r0vwy1yzwlkvwq98by35zpg6w35j2npfzacjzmy5xxq2k63m"; + name = "ksudoku-17.12.1.tar.xz"; }; }; ksystemlog = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ksystemlog-17.12.0.tar.xz"; - sha256 = "02i83i0ixkk9whlbbp5f0mk0ldgf8gw9sk0bxvab9hdj8k545im4"; - name = "ksystemlog-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ksystemlog-17.12.1.tar.xz"; + sha256 = "03f0pjxc8zbkn47csm45dqswl9sc37cfyawlmnl7pwjbsqmimpi6"; + name = "ksystemlog-17.12.1.tar.xz"; }; }; kteatime = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kteatime-17.12.0.tar.xz"; - sha256 = "1ky9ajzlq67z2rqh2n8s6ynz5fhj96whi2bb56x0q4l9kcm777yc"; - name = "kteatime-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kteatime-17.12.1.tar.xz"; + sha256 = "0zvr3qkasnf26m6x2lg0pa7m3f2va4favz2sdav0g2ix9jdglqz6"; + name = "kteatime-17.12.1.tar.xz"; }; }; ktimer = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktimer-17.12.0.tar.xz"; - sha256 = "13q7c6avhmjqb4ilpnd4sn8ddsxspdf7vrdnknb0g9fh8sjrfyqz"; - name = "ktimer-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktimer-17.12.1.tar.xz"; + sha256 = "00v8za6dhs7lb2aynlsrfjdq1zzbrxcxk7hr6x5vrxw7q6wp730c"; + name = "ktimer-17.12.1.tar.xz"; }; }; ktnef = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktnef-17.12.0.tar.xz"; - sha256 = "0vvl0lqqgfx9isizaciz6dvx7f913zkzqn4lzjsnbnhr19r3h5wj"; - name = "ktnef-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktnef-17.12.1.tar.xz"; + sha256 = "0b6axld4h9dr1a4cr650ibgm2avp1yynwvfyz1s8jaz58lpw8l1b"; + name = "ktnef-17.12.1.tar.xz"; }; }; ktouch = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktouch-17.12.0.tar.xz"; - sha256 = "089wy9apy2i3y4w83barfhwigcpp35idiav023wx6zy9dj63gl2p"; - name = "ktouch-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktouch-17.12.1.tar.xz"; + sha256 = "006ng7ajz4x37k2zy2gk7i1wpw2f2yqwvx6lc7vny3s8hz61a8zr"; + name = "ktouch-17.12.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-accounts-kcm-17.12.0.tar.xz"; - sha256 = "0q840r44i0bwj7b55ck6id5v5vl3f18r86diaihqawy600k32f0r"; - name = "ktp-accounts-kcm-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-accounts-kcm-17.12.1.tar.xz"; + sha256 = "003v1228nk2x8h9r8698fij1q461ibs76ycybgk2611r547jqwxm"; + name = "ktp-accounts-kcm-17.12.1.tar.xz"; }; }; ktp-approver = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-approver-17.12.0.tar.xz"; - sha256 = "1ryyfnxksfvyfgpi4q0qzv1mdlrfbp9scbnxgi1br599wqxk4va9"; - name = "ktp-approver-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-approver-17.12.1.tar.xz"; + sha256 = "0f3cqq005c2363b23c393qcml84g3h23906rsnc6id0b2zcdfkp3"; + name = "ktp-approver-17.12.1.tar.xz"; }; }; ktp-auth-handler = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-auth-handler-17.12.0.tar.xz"; - sha256 = "1qjc2vh1533wh9pv634m9s6j9a0q5k0chvh1f1w2s0mrayhis4kq"; - name = "ktp-auth-handler-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-auth-handler-17.12.1.tar.xz"; + sha256 = "0z6c1p7v8zkj54knpxvcnk1xk88ncm751nd6j2lrzg3fxnk4kdyj"; + name = "ktp-auth-handler-17.12.1.tar.xz"; }; }; ktp-call-ui = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-call-ui-17.12.0.tar.xz"; - sha256 = "0qg2l3040ayi1znfqk8l1bpmnqknpjb5spmlyqgjmn5cf6xv7pgq"; - name = "ktp-call-ui-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-call-ui-17.12.1.tar.xz"; + sha256 = "07x0n8b21sfrc01rvya51rg0shvbi265i2pzc0c3kv0d6di74bs1"; + name = "ktp-call-ui-17.12.1.tar.xz"; }; }; ktp-common-internals = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-common-internals-17.12.0.tar.xz"; - sha256 = "1ixsj8dr15zf9hxrmngrz4839yk4dvll0gj059yq2nigfzibmh8d"; - name = "ktp-common-internals-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-common-internals-17.12.1.tar.xz"; + sha256 = "0h6vd98168rs1rcxpj43c7i57yd4lch95qxihy32l8nbyjxn0cc2"; + name = "ktp-common-internals-17.12.1.tar.xz"; }; }; ktp-contact-list = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-contact-list-17.12.0.tar.xz"; - sha256 = "1mx9cm6hh7k6n61wl9x1shmyl10am5y0kj7gz5df0p8p9fnwfqz9"; - name = "ktp-contact-list-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-contact-list-17.12.1.tar.xz"; + sha256 = "1b8x9mxd00f9zvlni95q6arvv912srsshgdfrig6jl8l94aknhfz"; + name = "ktp-contact-list-17.12.1.tar.xz"; }; }; ktp-contact-runner = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-contact-runner-17.12.0.tar.xz"; - sha256 = "14ljix2rbwq1n29hli2qy5kvnw058205ydq2bqif4w8v83wg1af6"; - name = "ktp-contact-runner-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-contact-runner-17.12.1.tar.xz"; + sha256 = "03bxpcgxazp4g44iidbc2y8a4i147bxvm9hqkglv5bdy86lvg0y3"; + name = "ktp-contact-runner-17.12.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-desktop-applets-17.12.0.tar.xz"; - sha256 = "1ns03f2zhmwqc4wigi5clykyyaydlikk92f6k7b42410v0s0vqvc"; - name = "ktp-desktop-applets-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-desktop-applets-17.12.1.tar.xz"; + sha256 = "1qb54wpyh5pz4d0nan02gkf2n16cvq2cfj61vpi2xml6cb1yqypf"; + name = "ktp-desktop-applets-17.12.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-filetransfer-handler-17.12.0.tar.xz"; - sha256 = "1pmvm5r1ik310cif954ka2l6abkr269akhwgk9s5ldpzgzc726b8"; - name = "ktp-filetransfer-handler-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-filetransfer-handler-17.12.1.tar.xz"; + sha256 = "1976sjks028faahm6gha2kd0if0czbiyplj2vq9x1jnwh9fcbvcx"; + name = "ktp-filetransfer-handler-17.12.1.tar.xz"; }; }; ktp-kded-module = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-kded-module-17.12.0.tar.xz"; - sha256 = "028jr1dfq3mpj0lmwhdb351dg50rqr1m5y8dyil3mgcgfvgda5cn"; - name = "ktp-kded-module-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-kded-module-17.12.1.tar.xz"; + sha256 = "1l8jkixyc41irmf8ak358nfkn6m7nab5a2hxzfhgzi4grr2cassc"; + name = "ktp-kded-module-17.12.1.tar.xz"; }; }; ktp-send-file = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-send-file-17.12.0.tar.xz"; - sha256 = "0zsxs11zk1d5wni9nmf92mwy63c3b69l8964ph9hiqqr0gd3vqba"; - name = "ktp-send-file-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-send-file-17.12.1.tar.xz"; + sha256 = "0fhqf15dl0rq1dlgb42na64dj5sr53hqdgk4fghjpma4lvr8qd4p"; + name = "ktp-send-file-17.12.1.tar.xz"; }; }; ktp-text-ui = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktp-text-ui-17.12.0.tar.xz"; - sha256 = "1lvc989l1lmgbfqk6z91cpj96lkhqlf75384qx3ynkmqpjrkyv41"; - name = "ktp-text-ui-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktp-text-ui-17.12.1.tar.xz"; + sha256 = "0zjvxncvr1cbis2amd0s5x3kxgd2dw4mcjbfnqgf30mjbg13bn5m"; + name = "ktp-text-ui-17.12.1.tar.xz"; }; }; ktuberling = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/ktuberling-17.12.0.tar.xz"; - sha256 = "0wj6nf4zsvf65zyi15dcw7jzzznw03gxi07gjzv2ncak48i9si0v"; - name = "ktuberling-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/ktuberling-17.12.1.tar.xz"; + sha256 = "0b1wfmkd8lxh0cdalcniwz53wkv3iqlgfcb5wkp40xk4yzgm1i2g"; + name = "ktuberling-17.12.1.tar.xz"; }; }; kturtle = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kturtle-17.12.0.tar.xz"; - sha256 = "0qc7clrqc75xqs7iyl44qp2z6pswp7kmwdf55zwv4pq2phvssxvf"; - name = "kturtle-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kturtle-17.12.1.tar.xz"; + sha256 = "1f1gij16s5501p41h6m9z5qf8ldix4avw7cgxcib0s273fds8wxl"; + name = "kturtle-17.12.1.tar.xz"; }; }; kubrick = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kubrick-17.12.0.tar.xz"; - sha256 = "0dd6g4kah0kvlavy5swiz1a81ms63wzwp045zliay5i4x1bf8jjj"; - name = "kubrick-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kubrick-17.12.1.tar.xz"; + sha256 = "15vy1srmfsbxcjrm2jp0yqqn0x984jlblapma6jvgpcygxf2cxjg"; + name = "kubrick-17.12.1.tar.xz"; }; }; kwalletmanager = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kwalletmanager-17.12.0.tar.xz"; - sha256 = "0jvbyyqqhz7gz2szwx2gb00xxgazczb52331s3sb1rscxb1dbmxq"; - name = "kwalletmanager-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kwalletmanager-17.12.1.tar.xz"; + sha256 = "00x122kr7vbf6wans95spq0qxlavnjnp25h1pqzxg4y4sqdgy88p"; + name = "kwalletmanager-17.12.1.tar.xz"; }; }; kwave = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kwave-17.12.0.tar.xz"; - sha256 = "1iwpqnl92y3js4x43wkvxnhlc6ql8jkbacbj1qrlwxv3d8cm8rb9"; - name = "kwave-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kwave-17.12.1.tar.xz"; + sha256 = "0ry9hgmkhs6sx9plqzyds5qn0b7qvq9g2hhxrycahsaj2q9kwk8a"; + name = "kwave-17.12.1.tar.xz"; }; }; kwordquiz = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/kwordquiz-17.12.0.tar.xz"; - sha256 = "1zb6y85bgwvc3z016bq7x687yfvs45kh7h3lj9g2r3bh4l14aggx"; - name = "kwordquiz-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/kwordquiz-17.12.1.tar.xz"; + sha256 = "1a427jy3vyqc3jadrlwfvq8gh8zx6mfwrnwwaf4skixlwgnpwcp4"; + name = "kwordquiz-17.12.1.tar.xz"; }; }; libgravatar = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libgravatar-17.12.0.tar.xz"; - sha256 = "1rnhvg2s622vpm9b2nvfxl16d2rm2vjjqd9g6k0jsdj15gd6i22q"; - name = "libgravatar-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libgravatar-17.12.1.tar.xz"; + sha256 = "0v0xnmfv272hppv7ccdj3ccq6g344v1n883pcp0fbsppkhrfwbwq"; + name = "libgravatar-17.12.1.tar.xz"; }; }; libkcddb = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkcddb-17.12.0.tar.xz"; - sha256 = "0xr97hmqhnjlybhlr73j3p1i7skg17cbm0269rpwg52pqk7w1hg5"; - name = "libkcddb-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkcddb-17.12.1.tar.xz"; + sha256 = "03iz1cf69pzk0vfgjkdfwlp3iq2zj3ybzqp8mds9m7725qad35bq"; + name = "libkcddb-17.12.1.tar.xz"; }; }; libkcompactdisc = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkcompactdisc-17.12.0.tar.xz"; - sha256 = "1pz652n7rmyjf0m4i67y5wv423fnpif18vvqdbawhij58vh3cfxj"; - name = "libkcompactdisc-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkcompactdisc-17.12.1.tar.xz"; + sha256 = "19ifymhr3wbf3bcsdhdbjqwnnbqrdhkxc6bq35av2n40b7395avc"; + name = "libkcompactdisc-17.12.1.tar.xz"; }; }; libkdcraw = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkdcraw-17.12.0.tar.xz"; - sha256 = "1w8gwvi42kin58dx7scsbg9wfmqi7917dvx4gi6s0k6m7arg4w97"; - name = "libkdcraw-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkdcraw-17.12.1.tar.xz"; + sha256 = "05ji1s7p5sdcvrzmivp7dw98kxl6zm8vsfb6wc41x1syp18xvbxj"; + name = "libkdcraw-17.12.1.tar.xz"; }; }; libkdegames = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkdegames-17.12.0.tar.xz"; - sha256 = "0l1iwpngwsqs11scx2pbafkxgjazcj86qwc3fznrq0h3zg22zzxk"; - name = "libkdegames-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkdegames-17.12.1.tar.xz"; + sha256 = "0sqiq3xsfigd77czw3mrgrdn4bhz6f08ibv0yy4vfvgzx5ldysbp"; + name = "libkdegames-17.12.1.tar.xz"; }; }; libkdepim = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkdepim-17.12.0.tar.xz"; - sha256 = "1dmbs48xfy50dmfyfkglphlakn3bg4ww2rqkbwv68qy6hwkj750m"; - name = "libkdepim-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkdepim-17.12.1.tar.xz"; + sha256 = "1h6gcn1lsk9zd2q4m4w4gwgx2nawf7iqzxq4liyrx9s0j980v9vy"; + name = "libkdepim-17.12.1.tar.xz"; }; }; libkeduvocdocument = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkeduvocdocument-17.12.0.tar.xz"; - sha256 = "1m9ff4qswjlczv7j5ravfagjw8dga5iw8x2d3mxyalgffc3810ab"; - name = "libkeduvocdocument-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkeduvocdocument-17.12.1.tar.xz"; + sha256 = "0qfhfhy18w5fa8989hjqrk9910sb3j99xpp55zkwvfssxjnrwwxj"; + name = "libkeduvocdocument-17.12.1.tar.xz"; }; }; libkexiv2 = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkexiv2-17.12.0.tar.xz"; - sha256 = "0isqxj8c8inxdjs1gqvc1wv17nzvm8y9ga85n45417hxcfccrdrd"; - name = "libkexiv2-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkexiv2-17.12.1.tar.xz"; + sha256 = "18has05apcfw2qvyzkk4ywi0vbx46k0abvk6ai2rpag9kqw877i9"; + name = "libkexiv2-17.12.1.tar.xz"; }; }; libkgapi = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkgapi-17.12.0.tar.xz"; - sha256 = "0nsn2kicdparjwqncian7v1b4m0jr5z99cc6ijycp3agg07lvppi"; - name = "libkgapi-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkgapi-17.12.1.tar.xz"; + sha256 = "177m12jfswilb1qfi7zyhymscxrz52wplm8nzlrmwv7pr3brnmnl"; + name = "libkgapi-17.12.1.tar.xz"; }; }; libkgeomap = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkgeomap-17.12.0.tar.xz"; - sha256 = "11mcqqcjmspjyskxd8r1vzrg2zcyx2cwdamwv40x4jmcx4g4nijp"; - name = "libkgeomap-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkgeomap-17.12.1.tar.xz"; + sha256 = "0zixbp0vkmf8nrlzhwkbsgn0bxpwx6xcgslhjrl5q8w1bvp2hfjp"; + name = "libkgeomap-17.12.1.tar.xz"; }; }; libkipi = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkipi-17.12.0.tar.xz"; - sha256 = "0fmjjy49cl8qam1bm335fvm8mzn68dli6nnx1d3m4kxffrzzi9gy"; - name = "libkipi-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkipi-17.12.1.tar.xz"; + sha256 = "11438klx8lj16py2vvyahs1pf0as0dx1523bsrxy8hmyx5gsivas"; + name = "libkipi-17.12.1.tar.xz"; }; }; libkleo = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkleo-17.12.0.tar.xz"; - sha256 = "0b15z81g6062qh9x7fqmn04gx7z7xkncbpf0ngp2m6795k38rp0s"; - name = "libkleo-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkleo-17.12.1.tar.xz"; + sha256 = "1mbiljd4xpzlmf7xmf21pr2ka0cz5sg4f38z0m9if61903ag2bcc"; + name = "libkleo-17.12.1.tar.xz"; }; }; libkmahjongg = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkmahjongg-17.12.0.tar.xz"; - sha256 = "0vg9041q5yp6ld7sn5pnzldxlci1kxzpq66vx4c67s81lpr3hqlm"; - name = "libkmahjongg-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkmahjongg-17.12.1.tar.xz"; + sha256 = "1x8zbldp66my0pn4p44pg2wxybh7hq221bda91p2andaqa72nswq"; + name = "libkmahjongg-17.12.1.tar.xz"; }; }; libkomparediff2 = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libkomparediff2-17.12.0.tar.xz"; - sha256 = "0ylhw5vj6frrffr27q4s5zidaxviggxwj592s3hxpy9np8avf7mq"; - name = "libkomparediff2-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libkomparediff2-17.12.1.tar.xz"; + sha256 = "0jd700pjw51vyan5d22k6j60jgb95pfn2nvwz2nfs2f4xlsly1hz"; + name = "libkomparediff2-17.12.1.tar.xz"; }; }; libksane = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libksane-17.12.0.tar.xz"; - sha256 = "1qznn9s203ny37khg4lj8mpy9z3qblp8skh0lyw6s4wd46ni0vxw"; - name = "libksane-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libksane-17.12.1.tar.xz"; + sha256 = "1jglv4b5zqgs3qysadcrizfwlzwv39w369hhj4180xjjc07kxjw0"; + name = "libksane-17.12.1.tar.xz"; }; }; libksieve = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/libksieve-17.12.0.tar.xz"; - sha256 = "1yvs69c7lz5kqcnb16lq8sbykr22l0bmxsbgl7a1wzg3fqwnqlyn"; - name = "libksieve-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/libksieve-17.12.1.tar.xz"; + sha256 = "1w3cqhig1nwy5q98503f0s6i0vibsrq35js8y9vqqa22hyksy8xb"; + name = "libksieve-17.12.1.tar.xz"; }; }; lokalize = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/lokalize-17.12.0.tar.xz"; - sha256 = "189vrvdmavlnpk8cqyclwyqf2xml2fismfrncnh3nnaawr99mxmb"; - name = "lokalize-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/lokalize-17.12.1.tar.xz"; + sha256 = "0ygsz8mbind93sc148rd3asdpzlki1ps7xkc6y2zgf069ikrp504"; + name = "lokalize-17.12.1.tar.xz"; }; }; lskat = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/lskat-17.12.0.tar.xz"; - sha256 = "0bfp2h566xry428b77a8wz91w2hxd7jwjzfgvvzj4rjajrydkr1m"; - name = "lskat-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/lskat-17.12.1.tar.xz"; + sha256 = "036lhwx0d49cb2ml514rawbcngrrxhly4cjrrhf21yw8apxfwa92"; + name = "lskat-17.12.1.tar.xz"; }; }; mailcommon = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/mailcommon-17.12.0.tar.xz"; - sha256 = "03jwf8g646wlxw5qxdcn4hghbrb7176zcchisky7mpb4cpkbl148"; - name = "mailcommon-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/mailcommon-17.12.1.tar.xz"; + sha256 = "0m9ng8mj0hwj5zg9da5cqy8paa80q2v92qn6a6b1wm34ylbdfhsm"; + name = "mailcommon-17.12.1.tar.xz"; }; }; mailimporter = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/mailimporter-17.12.0.tar.xz"; - sha256 = "18f2zp63y95f14b9bwqgq68q4s5lqa9kv0l5xq4mylk4cdsb76kx"; - name = "mailimporter-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/mailimporter-17.12.1.tar.xz"; + sha256 = "1rd55alsa502v1vrp2fbmfxyf29h248n78d9wcw93grwg50sabdn"; + name = "mailimporter-17.12.1.tar.xz"; }; }; marble = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/marble-17.12.0.tar.xz"; - sha256 = "0zqwyf2lmdsf1cc7c9ld8agmp7fd9rdh2v2jn0p2ghzm578d0r34"; - name = "marble-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/marble-17.12.1.tar.xz"; + sha256 = "0g4vr27ggc3xdr274apcmv8ys9584lzxxc78ssr16snb1rkrb9my"; + name = "marble-17.12.1.tar.xz"; }; }; mbox-importer = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/mbox-importer-17.12.0.tar.xz"; - sha256 = "0zw6qslsr0rdhz3crq7h5ngaz0g0v6c12v7bz3749pm4pqd4wri9"; - name = "mbox-importer-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/mbox-importer-17.12.1.tar.xz"; + sha256 = "1vm0f2yb5adrnsdl6dy34bb7zggrh6xd89n0cvz1grq5fsrb3ilk"; + name = "mbox-importer-17.12.1.tar.xz"; }; }; messagelib = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/messagelib-17.12.0.tar.xz"; - sha256 = "1rz81bpf5s0nsf823l467p3dcyb7h746ipiv514frxddahh2kikz"; - name = "messagelib-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/messagelib-17.12.1.tar.xz"; + sha256 = "1nc6vh68fy26kcisqbr4lvhwxx3dzmjdawgzhy7jnbhdx36siw3b"; + name = "messagelib-17.12.1.tar.xz"; }; }; minuet = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/minuet-17.12.0.tar.xz"; - sha256 = "12ih1x8dl7w581jkagp59l8430gd7iip6m4pj3gh79sldsy3hkiq"; - name = "minuet-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/minuet-17.12.1.tar.xz"; + sha256 = "1y7l1qh3vwhhkv9mp165kyhf3ps4xzclnmbml3kpczhgxs0hzw47"; + name = "minuet-17.12.1.tar.xz"; }; }; okteta = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/okteta-17.12.0.tar.xz"; - sha256 = "0zyhm8kbi064iics3f53k0g8z3j6kk9cy0cbmpn1bpwl481hkk7k"; - name = "okteta-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/okteta-17.12.1.tar.xz"; + sha256 = "1ryaqbccqlir910v628wcv7gwp85w82d6f1lwwg92dh55zmlx6a4"; + name = "okteta-17.12.1.tar.xz"; }; }; okular = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/okular-17.12.0.tar.xz"; - sha256 = "0czzh1djmmxmj8fa3sy3601i4mmd2hmnhsj1lmp5k6lkpmhyp505"; - name = "okular-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/okular-17.12.1.tar.xz"; + sha256 = "0rai5m7alks6lri2fwg07s842azd6q9xizwsk0ib4pnw07hj2fqj"; + name = "okular-17.12.1.tar.xz"; }; }; palapeli = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/palapeli-17.12.0.tar.xz"; - sha256 = "1988z8ggchxbzqqrigybvx0hkpj0ikvzlzskk84s2wmm5nvvqwpq"; - name = "palapeli-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/palapeli-17.12.1.tar.xz"; + sha256 = "0xbcfsrzlj41wr2fx0awgmvdxdd6y890sigf42nzi8mizvd70b5v"; + name = "palapeli-17.12.1.tar.xz"; }; }; parley = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/parley-17.12.0.tar.xz"; - sha256 = "0qhx7wbk7wl6mdzv7arjidn80bagrxi4y8rpvylmpacn3skl1p55"; - name = "parley-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/parley-17.12.1.tar.xz"; + sha256 = "199qkhsrgcviyi3hfaazr8acd1xji1rraqvwlrb8b1bsrdnknbfs"; + name = "parley-17.12.1.tar.xz"; }; }; picmi = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/picmi-17.12.0.tar.xz"; - sha256 = "04ykhzdwpgq34i7inqs9a29v9dkmnh9sj44vv5m97xqpsg64pkj8"; - name = "picmi-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/picmi-17.12.1.tar.xz"; + sha256 = "024bia05vczjaz2df0lg4jqkjn8l7x36cjr6jkr0c77p37vm3w6k"; + name = "picmi-17.12.1.tar.xz"; }; }; pimcommon = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/pimcommon-17.12.0.tar.xz"; - sha256 = "1naxg9954vd0j7n4j9dyjwn3jbx6n1ngc3apm0gxr49b9m6shbfj"; - name = "pimcommon-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/pimcommon-17.12.1.tar.xz"; + sha256 = "0wmlzx43730zgdvgnw1ljplspbg19r5i88s0nvz53s0fa70nbga2"; + name = "pimcommon-17.12.1.tar.xz"; }; }; pim-data-exporter = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/pim-data-exporter-17.12.0.tar.xz"; - sha256 = "09q7rwsnc0hinag48y54mfkw642nqgnvvw2dnzn8bvc76jvjy4xc"; - name = "pim-data-exporter-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/pim-data-exporter-17.12.1.tar.xz"; + sha256 = "0ryw03lb5lhj5k6g7rqnmmqfgrd6004im7p3wwf9v3ynmjbkx0v7"; + name = "pim-data-exporter-17.12.1.tar.xz"; }; }; pim-sieve-editor = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/pim-sieve-editor-17.12.0.tar.xz"; - sha256 = "0mjs8daycp7g287hfidixw13g83pclsz5k22m7vx4swa8hnsw885"; - name = "pim-sieve-editor-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/pim-sieve-editor-17.12.1.tar.xz"; + sha256 = "1adz9whyvqz0fw2ggkr7g8xd67m779vyymqbyx3h05kwmdy6kims"; + name = "pim-sieve-editor-17.12.1.tar.xz"; }; }; poxml = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/poxml-17.12.0.tar.xz"; - sha256 = "0v5ydzcpr4khbwwz9170ag7hdyqxsqamnhgr4nn4xhsdl3wxf36m"; - name = "poxml-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/poxml-17.12.1.tar.xz"; + sha256 = "1ynycpwvsx2514rar3ycvmyv6fj2ac1adxx2gcip9vkb4chija6b"; + name = "poxml-17.12.1.tar.xz"; }; }; print-manager = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/print-manager-17.12.0.tar.xz"; - sha256 = "1v43kmlbyvmm5s4yijqizypzjar9ang4czbm8zk4k1pspbwvqm9v"; - name = "print-manager-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/print-manager-17.12.1.tar.xz"; + sha256 = "024hzc2ja1cb6wvag0w040q3ifrpzlb6s23d75hvkpyqqgi1qq5d"; + name = "print-manager-17.12.1.tar.xz"; }; }; rocs = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/rocs-17.12.0.tar.xz"; - sha256 = "1ii2v9mhj42ydvgalc8xj1liy93xlf39bcc64vc6f7l76786kbvr"; - name = "rocs-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/rocs-17.12.1.tar.xz"; + sha256 = "04v3khfyz7gg7krn3v3j5885ivmf0avmgl5xwyqh8vy7zwxajvq7"; + name = "rocs-17.12.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/signon-kwallet-extension-17.12.0.tar.xz"; - sha256 = "1iv26ny02qamnyxk7r3m1fiyqqmxi75y65vavxqqngdqrx5h9s45"; - name = "signon-kwallet-extension-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/signon-kwallet-extension-17.12.1.tar.xz"; + sha256 = "05w8hpxc2fmm5w1fj8df8dqj8hag62f154mpyiq5zy04a0j69mbl"; + name = "signon-kwallet-extension-17.12.1.tar.xz"; }; }; spectacle = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/spectacle-17.12.0.tar.xz"; - sha256 = "008j8nl26phr24329wqj9z4bw078bj81mpy267pwzaqf411xfgd5"; - name = "spectacle-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/spectacle-17.12.1.tar.xz"; + sha256 = "0zl2wr9n5lb6ry5xp33wv73r5xkadm4zm1bnric85q383qzwzhvd"; + name = "spectacle-17.12.1.tar.xz"; }; }; step = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/step-17.12.0.tar.xz"; - sha256 = "0krd8kl29sk1ib6kszhkz6328d3ap2fl7lw4hcycl1z0cnrpf1b0"; - name = "step-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/step-17.12.1.tar.xz"; + sha256 = "027czrw3dkvcbw74jrh8qwi577zxb7hzbzmnpd7b01qal486qj0f"; + name = "step-17.12.1.tar.xz"; }; }; svgpart = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/svgpart-17.12.0.tar.xz"; - sha256 = "0q157qnyl6sabd879200s1fp22qb3rc940pw70dyy03sd16vb0k0"; - name = "svgpart-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/svgpart-17.12.1.tar.xz"; + sha256 = "13g89s83y7wwwkx06zxcghcv9rdpziyq5f2lc81y583qsqg6j6lh"; + name = "svgpart-17.12.1.tar.xz"; }; }; sweeper = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/sweeper-17.12.0.tar.xz"; - sha256 = "0csccxd3pjw2ih2h4m168vkmiyyzvqzqx8pyhxjc2jgqkmqy0njj"; - name = "sweeper-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/sweeper-17.12.1.tar.xz"; + sha256 = "0rhn2ia3sxjlig9vp15jdvi7ij5xgyn4bz8cbh5g93an79z4mi59"; + name = "sweeper-17.12.1.tar.xz"; }; }; syndication = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/syndication-17.12.0.tar.xz"; - sha256 = "1cxbrckgpbzgj791c97840yy011x6vii0nzxd6sc7sp5sh8y2k6l"; - name = "syndication-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/syndication-17.12.1.tar.xz"; + sha256 = "1y8nsrbdc69cyh0rhjfvi99qx2fgvpvfsixpqjsyis1xhkxc3901"; + name = "syndication-17.12.1.tar.xz"; }; }; umbrello = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/umbrello-17.12.0.tar.xz"; - sha256 = "1i6rvxgpk166gpjm91g1d87lhcswpfvsysa4jc1bmxw8qyzd6yc9"; - name = "umbrello-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/umbrello-17.12.1.tar.xz"; + sha256 = "13krbjzg840rhr74zwday4p5min0zwrpxri6k1sdz7mhqm4lbj19"; + name = "umbrello-17.12.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.12.0"; + version = "17.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.0/src/zeroconf-ioslave-17.12.0.tar.xz"; - sha256 = "07mxy2wg5f92zv2vcy72d2z73jfm0w6rzs2vlixsyzmig3v8azga"; - name = "zeroconf-ioslave-17.12.0.tar.xz"; + url = "${mirror}/stable/applications/17.12.1/src/zeroconf-ioslave-17.12.1.tar.xz"; + sha256 = "10n0zyr2by91d0985r8cq6d8p0h3pxxq3kckrz2pmafr0q7l1zqx"; + name = "zeroconf-ioslave-17.12.1.tar.xz"; }; }; } From 67ce7cb2f9402da568eec501b034418c1850e085 Mon Sep 17 00:00:00 2001 From: Joel Rivera Date: Fri, 12 Jan 2018 00:07:15 -0600 Subject: [PATCH 051/197] enpass: 5.6.0 -> 5.6.5 --- pkgs/tools/security/enpass/data.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index 28d568d30ae8..accb92b13ea8 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.6.0_amd64.deb", - "sha256": "129ae4b4bfb8e0b4fa9acdfb3aebac3dd894364f2f31e9cd3bd5d3567e3a13b7", - "version": "5.6.0" + "path": "pool/main/e/enpass/enpass_5.6.5_amd64.deb", + "sha256": "c7529b745aa462b56eac17af6fe88d4c1610fd2f446d222aaad9510f19212a7d", + "version": "5.6.5" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.6.0_i386.deb", - "sha256": "c456002194c0be08a2c0da68ecf224425e35c46de5292098208e4e2b1f6d88ae", - "version": "5.6.0" + "path": "pool/main/e/enpass/enpass_5.6.5_i386.deb", + "sha256": "de46e27d5552dcd9d72abac8e5c3b6161ad551ce191a2ee689c67367b63ff8f9", + "version": "5.6.5" } } \ No newline at end of file From c02a8831693e91275bb4612f052d7eea51debf7d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 12 Jan 2018 10:07:46 +0100 Subject: [PATCH 052/197] pythonPackages.elasticsearch: move derivation to python-modules --- .../python-modules/elasticsearch/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/elasticsearch/default.nix diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix new file mode 100644 index 000000000000..9b90b09c5f5f --- /dev/null +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, urllib3, requests +, nosexcover, mock +, stdenv +}: + +buildPythonPackage (rec { + pname = "elasticsearch"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz"; + }; + + # Check is disabled because running them destroy the content of the local cluster! + # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch + doCheck = false; + propagatedBuildInputs = [ urllib3 requests ]; + buildInputs = [ nosexcover mock ]; + + meta = with stdenv.lib; { + description = "Official low-level client for Elasticsearch"; + homepage = https://github.com/elasticsearch/elasticsearch-py; + license = licenses.asl20; + maintainers = with maintainers; [ desiderius ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 855b340071a4..ee6996e55b02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4431,29 +4431,7 @@ in { edward = callPackage ../development/python-modules/edward { }; - elasticsearch = buildPythonPackage (rec { - pname = "elasticsearch"; - version = "6.0.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz"; - }; - - # Check is disabled because running them destroy the content of the local cluster! - # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch - doCheck = false; - propagatedBuildInputs = with self; [ urllib3 requests ]; - buildInputs = with self; [ nosexcover mock ]; - - meta = { - description = "Official low-level client for Elasticsearch"; - homepage = https://github.com/elasticsearch/elasticsearch-py; - license = licenses.asl20; - maintainers = with maintainers; [ desiderius ]; - }; - }); + elasticsearch = callPackage ../development/python-modules/elasticsearch { }; elasticsearchdsl = buildPythonPackage (rec { name = "elasticsearch-dsl-0.0.9"; From 762f5ea557aff17e70332c36582d0fc4c57d7cc3 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 12 Jan 2018 10:08:39 +0100 Subject: [PATCH 053/197] python-modules: removed unnecessary name attributes --- .../development/python-modules/elasticsearch-curator/default.nix | 1 - pkgs/development/python-modules/voluptuous/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index bbd2904fd9ee..bdace9220849 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { pname = "elasticsearch-curator"; version = "5.4.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 250a0951d96c..00c13cba0669 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "voluptuous"; version = "0.10.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; From dffe1e569cd7901dbaddcd691f476860d71e78b2 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 12 Jan 2018 10:31:58 +0100 Subject: [PATCH 054/197] minio: 2017-09-29T19-16-56Z -> 2018-01-02T23-07-00Z (#33724) Contains security fixes (see: https://blog.minio.io/minio-release-jan-2nd-2018-security-advisory-ef0342a4ddba) Use buildGoPackage, otherwise we will have the go build toolchain in our runtime closure. --- pkgs/servers/minio/default.nix | 42 +++++++++++++--------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index c9dfe9136df5..a1ea5edaa6d9 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,38 +1,28 @@ -{ lib, stdenv, fetchurl, go }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "minio-${version}"; - version = "2017-09-29T19-16-56Z"; + version = "2018-01-02T23-07-00Z"; - src = fetchurl { - url = "https://github.com/minio/minio/archive/RELEASE.${version}.tar.gz"; - sha256 = "1h028gyfvyh5x6k4fsj4s64sgzqy7jgln6kvs27bnxzigj6dp2wx"; + src = fetchFromGitHub { + owner = "minio"; + repo = "minio"; + rev = "RELEASE.${version}"; + sha256 = "1bpiy6q9782mxs5f5lzw6c7zx83s2i68rf5f65xa9z7cyl19si74"; }; - buildInputs = [ go ]; + goPackagePath = "github.com/minio/minio"; - unpackPhase = '' - d=$TMPDIR/src/github.com/minio/minio - mkdir -p $d - tar xf $src -C $d --strip-component 1 - export GOPATH=$TMPDIR - cd $d - ''; + buildFlagsArray = [''-ldflags= + -X github.com/minio/minio/cmd.Version=${version} + '']; - buildPhase = '' - mkdir -p $out/bin - go build -o $out/bin/minio \ - --ldflags "-X github.com/minio/minio/cmd.Version=${version}" - ''; - - installPhase = "true"; - - meta = { + meta = with stdenv.lib; { homepage = https://www.minio.io/; description = "An S3-compatible object storage server"; - maintainers = with lib.maintainers; [ eelco bachp ]; - platforms = lib.platforms.x86_64; - license = lib.licenses.asl20; + maintainers = with maintainers; [ eelco bachp ]; + platforms = platforms.x86_64 ++ ["aarch64-linux"]; + license = licenses.asl20; }; } From f40ecb29aa34384e285dd00f93f9fe4eed7a5abe Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 31 Oct 2017 21:50:23 +0100 Subject: [PATCH 055/197] Add documentation for haskell-modules/lib.nix --- pkgs/development/haskell-modules/lib.nix | 145 ++++++++++++++++++++++- 1 file changed, 139 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index da4e9c6777bd..bb2cf8b36f05 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -3,33 +3,127 @@ { pkgs, lib }: rec { + /* This function takes a file like `hackage-packages.nix` and constructs + a full package set out of that. + */ makePackageSet = import ./make-package-set.nix; + /* The function overrideCabal lets you alter the arguments to the + mkDerivation function. + + Example: + + First, note how the aeson package is constructed in hackage-packages.nix: + + "aeson" = callPackage ({ mkDerivation, attoparsec, + }: + mkDerivation { + pname = "aeson"; + + homepage = "https://github.com/bos/aeson"; + }) + + The mkDerivation function of haskellPackages will take care of putting + the homepage in the right place, in meta. + + > haskellPackages.aeson.meta.homepage + "https://github.com/bos/aeson" + + > x = haskell.lib.overrideCabal haskellPackages.aeson (old: { homepage = old.homepage + "#readme"; }) + > x.meta.homepage + "https://github.com/bos/aeson#readme" + + */ overrideCabal = drv: f: (drv.override (args: args // { mkDerivation = drv: (args.mkDerivation drv).override f; })) // { overrideScope = scope: overrideCabal (drv.overrideScope scope) f; }; + /* doCoverage modifies a haskell package to enable the generation + and installation of a coverage report. + + See https://wiki.haskell.org/Haskell_program_coverage + */ doCoverage = drv: overrideCabal drv (drv: { doCoverage = true; }); + + /* dontCoverage modifies a haskell package to disable the generation + and installation of a coverage report. + */ dontCoverage = drv: overrideCabal drv (drv: { doCoverage = false; }); + /* doHaddock modifies a haskell package to enable the generation and + installation of API documentation from code comments using the + haddock tool. + */ doHaddock = drv: overrideCabal drv (drv: { doHaddock = true; }); + + /* dontHaddock modifies a haskell package to disable the generation and + installation of API documentation from code comments using the + haddock tool. + */ dontHaddock = drv: overrideCabal drv (drv: { doHaddock = false; }); + /* doJailbreak enables the removal of version bounds from the cabal + file. You may want to avoid this function. + + This is useful when a package reports that it can not be built + due to version mismatches. In some cases, removing the version + bounds entirely is an easy way to make a package build, but at + the risk of breaking software in non-obvious ways now or in the + future. + + Instead of jailbreaking, you can patch the cabal file. + */ doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; }); + + /* dontJailbreak restores the use of the version bounds the check + the use of dependencies in the package description. + */ dontJailbreak = drv: overrideCabal drv (drv: { jailbreak = false; }); + /* doCheck enables dependency checking, compilation and execution + of test suites listed in the package description file. + */ doCheck = drv: overrideCabal drv (drv: { doCheck = true; }); + /* dontCheck disables dependency checking, compilation and execution + of test suites listed in the package description file. + */ dontCheck = drv: overrideCabal drv (drv: { doCheck = false; }); + /* doBenchmark enables dependency checking, compilation and execution + for benchmarks listed in the package description file. + */ doBenchmark = drv: overrideCabal drv (drv: { doBenchmark = true; }); + /* dontBenchmark disables dependency checking, compilation and execution + for benchmarks listed in the package description file. + */ dontBenchmark = drv: overrideCabal drv (drv: { doBenchmark = false; }); + /* doDistribute enables the distribution of binaries for the package + via hydra. + */ doDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = drv.platforms or ["i686-linux" "x86_64-linux" "x86_64-darwin"]; }); + /* dontDistribute disables the distribution of binaries for the package + via hydra. + */ dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; }); + /* appendConfigureFlag adds a single argument that will be passed to the + cabal configure command, after the arguments that have been defined + in the initial declaration or previous overrides. + + Example: + + > haskell.lib.appendConfigureFlag haskellPackages.servant "--profiling-detail=all-functions" + */ appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); + + /* removeConfigureFlag drv x is a Haskell package like drv, but with + all cabal configure arguments that are equal to x removed. + + > haskell.lib.removeConfigureFlag haskellPackages.servant "--verbose" + */ removeConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = lib.remove x (drv.configureFlags or []); }); addBuildTool = drv: x: addBuildTools drv [x]; @@ -76,17 +170,28 @@ rec { disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); - # Controls if Nix should strip the binary files (removes debug symbols) + /* Let Nix strip the binary files. + * This removes debugging symbols. + */ doStrip = drv: overrideCabal drv (drv: { dontStrip = false; }); + + /* Stop Nix from stripping the binary files. + * This keeps debugging symbols. + */ dontStrip = drv: overrideCabal drv (drv: { dontStrip = true; }); - # Useful for debugging segfaults with gdb. - # -g: enables debugging symbols - # --disable-*-stripping: tell GHC not to strip resulting binaries - # dontStrip: see above + /* Useful for debugging segfaults with gdb. + * This includes dontStrip. + */ enableDWARFDebugging = drv: + # -g: enables debugging symbols + # --disable-*-stripping: tell GHC not to strip resulting binaries + # dontStrip: see above appendConfigureFlag (dontStrip drv) "--ghc-options=-g --disable-executable-stripping --disable-library-stripping"; + /* Create a source distribution tarball like those found on hackage, + instead of building the package. + */ sdistTarball = pkg: lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; # Since we disable the haddock phase, we also need to override the @@ -99,10 +204,15 @@ rec { fixupPhase = ":"; }); + /* Use the gold linker. It is a linker for ELF that is designed + "to run as fast as possible on modern systems" + */ linkWithGold = drv : appendConfigureFlag drv "--ghc-option=-optl-fuse-ld=gold --ld-option=-fuse-ld=gold --with-ld=ld.gold"; - # link executables statically against haskell libs to reduce closure size + /* link executables statically against haskell libs to reduce + closure size + */ justStaticExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; isLibrary = false; @@ -112,6 +222,11 @@ rec { configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; }); + /* Build a source distribution tarball instead of using the source files + directly. The effect is that the package is built as if it were published + on hackage. This can be used as a test for the source distribution, + assuming the build fails when packaging mistakes are in the cabal file. + */ buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" @@ -120,10 +235,22 @@ rec { ''; }); + /* Build the package in a strict way to uncover potential problems. + This includes buildFromSdist and failOnAllWarnings. + */ buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg); + /* Turn on most of the compiler warnings and fail the build if any + of them occur. */ failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror"; + /* Add a post-build check to verify that dependencies declared in + the cabal file are actually used. + + The first attrset argument can be used to configure the strictness + of this check and a list of ignored package names that would otherwise + cause false alarms. + */ checkUnusedPackages = { ignoreEmptyImports ? false , ignoreMainModule ? false @@ -142,8 +269,14 @@ rec { buildStackProject = pkgs.callPackage ./generic-stack-builder.nix { }; + /* Add a dummy command to trigger a build despite an equivalent + earlier build that is present in the store or cache. + */ triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); + /* Override the sources for the package and optionaly the version. + This also takes of removing editedCabalFile. + */ overrideSrc = drv: { src, version ? drv.version }: overrideCabal drv (_: { inherit src version; editedCabalFile = null; }); From 2eba34d96094d10f53465a6f4350d346b030ed0d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 12 Jan 2018 11:29:13 +0100 Subject: [PATCH 056/197] sigal: Move to applications/misc --- pkgs/applications/misc/sigal/default.nix | 33 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ pkgs/top-level/python-packages.nix | 23 ----------------- 3 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 pkgs/applications/misc/sigal/default.nix diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix new file mode 100644 index 000000000000..d66ca8586ec4 --- /dev/null +++ b/pkgs/applications/misc/sigal/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonApplication, fetchurl, pythonPackages }: + +buildPythonApplication rec { + version = "1.0.1"; + name = "sigal-${version}"; + + src = fetchurl { + url = "mirror://pypi/s/sigal/${name}.tar.gz"; + sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34"; + }; + + buildInputs = with pythonPackages; [ pytest ]; + propagatedBuildInputs = with pythonPackages; [ + jinja2 + markdown + pillow + pilkit + clint + click + blinker + ]; + + # No tests included + doCheck = false; + + meta = with lib; { + description = "Yet another simple static gallery generator"; + homepage = http://sigal.saimon.org/en/latest/index.html; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a632a0fe6ab..f23bc44c6a73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4519,6 +4519,10 @@ with pkgs; siege = callPackage ../tools/networking/siege {}; + sigal = callPackage ../applications/misc/sigal { + inherit (pythonPackages) buildPythonApplication; + }; + sigil = libsForQt56.callPackage ../applications/editors/sigil { }; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 855b340071a4..fec2e3fd4932 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16273,29 +16273,6 @@ in { }; }; - sigal = buildPythonPackage rec { - name = "sigal-1.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sigal/${name}.tar.gz"; - sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click blinker ]; - - # No tests included - doCheck = false; - - - meta = { - description = "Yet another simple static gallery generator"; - homepage = http://sigal.saimon.org/en/latest/index.html; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - }; - slob = buildPythonPackage rec { name = "slob-unstable-2016-11-03"; From 0a339f5a55e5dde637dc3f01d1f4d9c7da186c9b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 12 Jan 2018 11:31:09 +0100 Subject: [PATCH 057/197] sigal: Use fetchPypi instead of fetchurl --- pkgs/applications/misc/sigal/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index d66ca8586ec4..e08ccbb025fd 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonApplication, fetchurl, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, pythonPackages }: buildPythonApplication rec { version = "1.0.1"; - name = "sigal-${version}"; + pname = "sigal"; - src = fetchurl { - url = "mirror://pypi/s/sigal/${name}.tar.gz"; + src = fetchPypi { + inherit version pname; sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f23bc44c6a73..426af532a988 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4520,7 +4520,7 @@ with pkgs; siege = callPackage ../tools/networking/siege {}; sigal = callPackage ../applications/misc/sigal { - inherit (pythonPackages) buildPythonApplication; + inherit (pythonPackages) buildPythonApplication fetchPypi; }; sigil = libsForQt56.callPackage ../applications/editors/sigil { }; From b9bade971d2f2a6ae7791ad11b230b8a674b944c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 12 Jan 2018 11:32:29 +0100 Subject: [PATCH 058/197] sigal: 1.0.1 -> 1.3.0 --- pkgs/applications/misc/sigal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index e08ccbb025fd..ae2bab64187d 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonApplication, fetchPypi, pythonPackages }: buildPythonApplication rec { - version = "1.0.1"; + version = "1.3.0"; pname = "sigal"; src = fetchPypi { inherit version pname; - sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34"; + sha256 = "0ycyrap4rc0yrjagi5c5fs5gpw9whvkli656syfpj99dq1q9q1d0"; }; buildInputs = with pythonPackages; [ pytest ]; From 6bbf50374fee84eb5d89e3c255d53e451f1beae9 Mon Sep 17 00:00:00 2001 From: markuskowa Date: Fri, 12 Jan 2018 02:43:56 -0800 Subject: [PATCH 059/197] libbladeRF: 1.4.0 -> 1.9.0 (#33551) --- pkgs/development/libraries/libbladeRF/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 8948a74ad630..3f4f48775c1b 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -2,14 +2,14 @@ , libusb1, udev }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.9.0"; name = "libbladeRF-v${version}"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c"; + sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa"; }; nativeBuildInputs = [ pkgconfig ]; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; - platforms = platforms.linux; + platforms = with platforms; linux; }; } From e90412debb744dfc481cebf4243e48aef512c726 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 12 Jan 2018 13:15:50 +0100 Subject: [PATCH 060/197] Ruby: 2.2.8 -> 2.2.9, 2.3.5 -> 2.3.6, 2.4.2 -> 2.4.3 --- .../development/interpreters/ruby/default.nix | 24 +++++++++---------- .../interpreters/ruby/patchsets.nix | 6 ++--- pkgs/top-level/all-packages.nix | 12 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 6a49107361ab..9d82810900f0 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -205,27 +205,27 @@ in { }; }; - ruby_2_2_8 = generic { - version = rubyVersion "2" "2" "8" ""; + ruby_2_2_9 = generic { + version = rubyVersion "2" "2" "9" ""; sha256 = { - src = "12i6v5i0djl4xx3x7fq12snqb5d4drqjmnwqs05fby4bagcbjdwg"; - git = "16nw0795nhrj13crp5x4jis8hmi3gsyjl96pwk698wlrb89lf9bw"; + src = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg"; + git = "03qrjh55098wcqh2khxryzkzfqkznjrcdgwf27r2bgcycbg5ca5q"; }; }; - ruby_2_3_5 = generic { - version = rubyVersion "2" "3" "5" ""; + ruby_2_3_6 = generic { + version = rubyVersion "2" "3" "6" ""; sha256 = { - src = "1k6x4g68lq30i0myip5bn56rcbwjxmqq95j1fkdgbvwbnaxzfqjl"; - git = "0spwqz4b5xxqzs13azsd4xz4jkc3is7d9q4s6s2qilb8ib4863jl"; + src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3"; + git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds"; }; }; - ruby_2_4_2 = generic { - version = rubyVersion "2" "4" "2" ""; + ruby_2_4_3 = generic { + version = rubyVersion "2" "4" "3" ""; sha256 = { - src = "174cdiz3am1f76vsnm3iqi9c5vqphypbf9kbxx6vqqmj01gfgfck"; - git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; + src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx"; + git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 858bc0a13f34..55f4a9ef237b 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,17 +24,17 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.8" = ops useRailsExpress [ + "2.2.9" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.5" = ops useRailsExpress [ + "2.3.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.2" = ops useRailsExpress [ + "2.4.3" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a632a0fe6ab..b2a98700b8fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6945,18 +6945,18 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_8 - ruby_2_3_5 - ruby_2_4_2 + ruby_2_2_9 + ruby_2_3_6 + ruby_2_4_3 ruby_2_5_0; # Ruby aliases ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_8; - ruby_2_3 = ruby_2_3_5; - ruby_2_4 = ruby_2_4_2; + ruby_2_2 = ruby_2_2_9; + ruby_2_3 = ruby_2_3_6; + ruby_2_4 = ruby_2_4_3; ruby_2_5 = ruby_2_5_0; scsh = callPackage ../development/interpreters/scsh { }; From 0e9a729b7765cc852ee8acc3b77c6e0fea9f8a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 10:24:36 -0200 Subject: [PATCH 061/197] qlipper: 5.0.0 -> 5.1.1 --- pkgs/desktops/lxqt/optional/qlipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix index 04b0cd3e6ac6..e09c8bc09d50 100644 --- a/pkgs/desktops/lxqt/optional/qlipper/default.nix +++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qlipper"; - version = "5.0.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "pvanek"; repo = pname; rev = version; - sha256 = "1y34vadxxjg2l7021y1rpvb8x6pzhk2sk9p35wfm9inilwi8bg8j"; + sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76"; }; nativeBuildInputs = [ cmake ]; From d411899576e525d258e9341678b76be34c6bd81b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 12 Jan 2018 13:51:04 +0000 Subject: [PATCH 062/197] google-cloud-sdk: 182.0.0 -> 184.0.0 (#33784) --- pkgs/tools/admin/google-cloud-sdk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 4588a6f7fb43..00bd00a6542a 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,23 +19,23 @@ let sources = name: system: { i686-linux = { url = "${baseUrl}/${name}-linux-x86.tar.gz"; - sha256 = "127f98a25293d537d5a64d0df559d4053e6a8c77bbdc13566896ff7e6c2ceede"; + sha256 = "0fq8zw1a5c0mnmw6f7j9j80y6kq0f0v2wn1d7b8mfq8ih5x53a85"; }; x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "7b0f037db60b6ebde89afd80ba7c96f036637dd5cba77201952d1137801d5060"; + sha256 = "1h4m70fk3hri4lgm9lh2pm0v196nc2r3hpf42h3xx5k7sqklsns2"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "3cae8a7b021f3c9eaab6c0b59a1301eb7cda3a422e645b3b0c6ccfe89b1e0332"; + sha256 = "1ynvllxzjr3y4qflw06njj7qqcf7539mbp06rs03i8hargsgbamx"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "182.0.0"; + version = "184.0.0"; src = fetchurl (sources name stdenv.system); From e1f3c42502f2bacc7e3788389b224693adca60ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 12:20:50 -0200 Subject: [PATCH 063/197] zuki-themes: 3.24-2 -> 3.24-3 --- pkgs/misc/themes/zuki/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index 00743a345c93..1d5b7ad311cf 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zuki-themes-${version}"; - version = "3.24-2"; + version = "3.24-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; rev = "v${version}"; - sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km"; + sha256 = "02zallh1kwxp3sarz6nxm6j7v1rf6wwz7gf8gn81xslqjg188dq6"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { installPhase = '' install -dm 755 $out/share/themes - cp -va Zuki* $out/share/themes/ + cp -a Zuki* $out/share/themes/ ''; meta = { - description = "A selection of themes for GTK3, gnome-shell and more"; + description = "Themes for GTK3, gnome-shell and more"; homepage = https://github.com/lassekongo83/zuki-themes; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; From 843ea6b57ddd6f052c4dc86fcaa2b92236c44654 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 15 Dec 2017 15:51:19 +0100 Subject: [PATCH 064/197] notary: init at 0.5.1 Signed-off-by: Vincent Demeester --- pkgs/tools/security/notary/default.nix | 44 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/security/notary/default.nix diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix new file mode 100644 index 000000000000..b0c0ef02461d --- /dev/null +++ b/pkgs/tools/security/notary/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchgit, buildGoPackage, git, libtool }: + +buildGoPackage rec { + name = "notary-${version}"; + version = "0.5.1"; + gitcommit = "9211198"; + + src = fetchgit { + url = "https://github.com/theupdateframework/notary"; + rev = "refs/tags/v${version}"; + sha256 = "1iybkwvl7021g7kklqybrip8d7hsvvqggpb19yx9kjjisasi2dw6"; + leaveDotGit = true; + }; + + buildInputs = [ git libtool ]; + + goPackagePath = "github.com/docker/notary"; + buildPhase = '' + cd go/src/github.com/docker/notary + make GITCOMMIT=${gitcommit} client + ''; + + installPhase = '' + mkdir -p $bin/bin + cp bin/notary $bin/bin/notary + ''; + + meta = with stdenv.lib; { + description = " Notary is a project that allows anyone to have trust over arbitrary collections of data"; + longDescription = '' + The Notary project comprises a server and a client for running and interacting with trusted collections. See the service architecture documentation for more information. + + Notary aims to make the internet more secure by making it easy for people to publish and verify content. We often rely on TLS to secure our communications with a web server which is inherently flawed, as any compromise of the server enables malicious content to be substituted for the legitimate content. + + With Notary, publishers can sign their content offline using keys kept highly secure. Once the publisher is ready to make the content available, they can push their signed trusted collection to a Notary Server. + + Consumers, having acquired the publisher's public key through a secure channel, can then communicate with any notary server or (insecure) mirror, relying only on the publisher's key to determine the validity and integrity of the received content. + ''; + license = licenses.asl20; + homepage = https://github.com/theupdateframework/notary; + maintainers = with maintainers; [ vdemeester ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7512da925b86..793e40694771 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3707,6 +3707,8 @@ with pkgs; nnn = callPackage ../applications/misc/nnn { }; + notary = callPackage ../tools/security/notary { }; + notify-osd = callPackage ../applications/misc/notify-osd { }; nox = callPackage ../tools/package-management/nox { From ae34ecdde71f1c3c5dbd3c87a059ca331e1b303b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 12:51:30 -0200 Subject: [PATCH 065/197] plano-theme: init at 3.24-3 --- pkgs/misc/themes/plano/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/misc/themes/plano/default.nix diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix new file mode 100644 index 000000000000..64d4e807e425 --- /dev/null +++ b/pkgs/misc/themes/plano/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "plano-theme-${version}"; + version = "3.24-3"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = "plano-theme"; + rev = "v${version}"; + sha256 = "079gj3kgsim01r7yb9dcxvrci3my1y0zkn86igdlspxcnjzmxkq0"; + }; + + buildInputs = [ gdk_pixbuf gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/themes/Plano + cp -a * $out/share/themes/Plano/ + rm $out/share/themes/Plano/{LICENSE,README.md} + ''; + + meta = { + description = "Flat theme for GNOME & Xfce4"; + homepage = https://github.com/lassekongo83/plano-theme; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d927ae22accb..37bd7f042d28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19736,6 +19736,8 @@ with pkgs; pjsip = callPackage ../applications/networking/pjsip { }; + plano-theme = callPackage ../misc/themes/plano { }; + ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; From 754b5961a25c4329c45860333410d4713b0a7ffe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 12 Jan 2018 22:46:48 +0800 Subject: [PATCH 066/197] uchiwa: 1.1.0 -> 1.1.1 --- pkgs/servers/monitoring/uchiwa/bower-packages.nix | 12 ++++++------ pkgs/servers/monitoring/uchiwa/src.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 6108f01e0b9e..c4147e35e49c 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,15 +1,15 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.1.0" "1.1.0" "0nv7csb38vx93yk08nwa9wj4x0b5icx9nl56d4v5azndcck2py30") - (fetchbower "angular" "1.6.7" "~1.6.3" "0sg9mqh94za8rv5ip9hmxyji6cmsb26sg3v60ppy6rld62f7gfj9") + (fetchbower "uchiwa-web" "1.1.1" "1.1.1" "19f9xprmjkhk4wbb88xmnp1fhqp2zc3gazzi4iczg65jzak4xzw0") + (fetchbower "angular" "1.6.8" "~1.6.3" "07bwbahxaz5myjj7sqv7k211avs23a9j7msl373h1qvp05fblajf") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") - (fetchbower "angular-cookies" "1.6.7" "~1.6.3" "0v5sqrxi411vjjz6m817pkh20vrw8lxdhxj30l4lhqws9cxj289z") + (fetchbower "angular-cookies" "1.6.8" "~1.6.3" "0p3skdg2pmzgwm9a0gyl1vhq4lcwyrymmii7lxlrmypjhwm83il6") (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi") (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj") - (fetchbower "angular-resource" "1.6.7" "~1.6.3" "0qrr1rxksfw0ynrs23kbrcnwswrqaa6pymx3z3cfgawzq85fp4hh") - (fetchbower "angular-route" "1.6.7" "~1.6.3" "0k7bizyihpna0542j6d219df4x0rbb7s8z2kmjnv3l7f2p8ghy83") - (fetchbower "angular-sanitize" "1.6.7" "~1.6.3" "1kzr57cb5irxs2mpv6kaxhfryr556y0dy2d84k5bk8rm0c0jnnl8") + (fetchbower "angular-resource" "1.6.8" "~1.6.3" "0pnv12c61i8giwj0fmzf38f3x6ckf24g6izrak9y7zy28nlb3y5q") + (fetchbower "angular-route" "1.6.8" "~1.6.3" "0k8sy5dkn589w8ykn65fhrcrfi7wkn7gagwwl5j5zgzj4m91wlar") + (fetchbower "angular-sanitize" "1.6.8" "~1.6.3" "0q7hy5iyjlf745yisphwa5b8rvkhc43zwwmiwfkqcdcbf3w6564l") (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh") (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8") (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9") diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 51d3dfc0ffc2..fd434193d74d 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.1.0-1"; - sha256 = "1ljrqz3ads5nn1alw4pa6lz7mbwhs09w498bpgg2hlcf8vklxg1y"; + version = "1.1.1-1"; + sha256 = "1j1l5cmhiz19k6lhvaxqhgkj7v5m3fyxpkspvbrdbmp461g4j9bi"; } From 96e777adfdcdb82efe41f6f88e312d23f2e80654 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 12 Jan 2018 23:02:30 +0800 Subject: [PATCH 067/197] uchiwa: add update script --- pkgs/servers/monitoring/uchiwa/update.sh | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100755 pkgs/servers/monitoring/uchiwa/update.sh diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh new file mode 100755 index 000000000000..10da7f8adbf9 --- /dev/null +++ b/pkgs/servers/monitoring/uchiwa/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl.bin git.out nix jq.out nodePackages.bower2nix + +set -euo pipefail +IFS=$'\n\t' + +# set -x + +REPO=sensu/uchiwa +VERSION=0.0.1 +SHA="1111111111111111111111111111111111111111111111111111" +DIR=$(pwd) + +write_src() { + cat <<_EOF > $DIR/src.nix +{ + version = "${VERSION}"; + sha256 = "${SHA}"; +} +_EOF +} + +LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) +echo "Latest version: ${LATEST_VERSION}" + +VERSION=${1:-${LATEST_VERSION}} +echo "Updating to: ${VERSION}" + +TOP=$(git rev-parse --show-toplevel) + +cd $(dirname $0) + +write_src +pushd $TOP >/dev/null +SHA=$(nix-prefetch-url -A uchiwa.src) +popd >/dev/null +write_src + +curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > bower.json +rm -f bower-packages.nix +bower2nix bower.json $DIR/bower-packages.nix +rm -f bower.json From 0ca055a753b1993c7f438a8e226a59f65fe168cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 13:04:55 -0200 Subject: [PATCH 068/197] blackbird: 2016-02-20 -> 2017-12-13 --- pkgs/misc/themes/blackbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 5eead87b1c7b..4b7702ed6359 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "Blackbird"; - version = "2017-02-20"; + version = "2017-12-13"; name = "${pname}-${version}"; src = fetchFromGitHub { repo = "${pname}"; owner = "shimmerproject"; - rev = "51eaa1853675866e2e4bd026876162b35ab1a196"; - sha256 = "06d040s5jmw9v6fkif6zjcd3lp56dmvwchcwflinc165iazbp5n2"; + rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4"; + sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw"; }; nativeBuildInputs = [ autoreconfHook ]; From e094e782f802698077e5cb1021b10ad60cf733d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 13:17:01 -0200 Subject: [PATCH 069/197] jgmenu: 0.7.6 -> 0.8 --- pkgs/applications/misc/jgmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 39f555794765..b7b09816abd4 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.7.6"; + version = "0.8"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "13bmvg9kqjng8jqc3xiif587l05ygk5b3k9xn2lq8yxcwxi9p30v"; + sha256 = "042nvix85a37aalc2rwg4yc2g3wyy6lym3c2ljj2xkl6c1b0c1r7"; }; nativeBuildInputs = [ From 563e2e3226990be59687474144ea2ac51686d151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 13:29:52 -0200 Subject: [PATCH 070/197] pmenu: 2017-04-10 -> 2018-01-01 --- pkgs/applications/misc/pmenu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 2472b05a2e0b..b14bb445b5d1 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmenu-${version}"; - version = "2017-04-10"; + version = "2018-01-01"; src = fetchFromGitLab { owner = "o9000"; repo = "pmenu"; - rev = "87fec9ddf594f1046d03348de2bafcfa6e94cfd1"; - sha256 = "0ynhml46bi5k52v7fw2pjpcac9dswkmlvh6gynvnyqjp4p153fl4"; + rev = "f98a5bdf20deb0b7f0543e5ce6a8f5574f695e07"; + sha256 = "131nqafbmbfpgsgss27pz4cyb9fb29m5h1ai1fyvcn286rr9dnp2"; }; nativeBuildInputs = [ python2Packages.wrapPython ]; From 4eba35bc9da0ceaa25d2ff6b5468572da6643da7 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Fri, 12 Jan 2018 17:01:19 +0100 Subject: [PATCH 071/197] jenkins: 2.95 -> 2.101 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index f44187a0ac16..399fc62bd172 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.95"; + version = "2.101"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "08pmsxsk5qbs7h3m1ya7xbik95n58ak8m4p01y97l49kc70bj2hv"; + sha256 = "0ragl8hhdlx2zpjzrx3xsvr5i0fvgshgbkqx0h48hgm73pf99227"; }; buildCommand = '' From 6b6e95ae1f8a80aa042e8cac8481a7ed5404ca90 Mon Sep 17 00:00:00 2001 From: Sebastian Galkin Date: Fri, 12 Jan 2018 14:39:44 -0200 Subject: [PATCH 072/197] Add paraseba as maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b7b5232c170b..2249ed822b13 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -506,6 +506,7 @@ pakhfn = "Fedor Pakhomov "; panaeon = "Vitalii Voloshyn Date: Fri, 12 Jan 2018 14:41:20 -0200 Subject: [PATCH 073/197] scid-vs-pc: init at version 4.18.1 scid vs pc is a chess database and playing program, a more maintained fork of scid. scid was already packaged so this change adds a very similar expression. Currently scid and scid-vs-pc collide since they install the same binaries. --- .../scid-vs-pc/0001-put-fonts-in-out.patch | 77 +++++++++++++++++++ pkgs/games/scid-vs-pc/default.nix | 70 +++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 3 files changed, 152 insertions(+) create mode 100644 pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch create mode 100644 pkgs/games/scid-vs-pc/default.nix diff --git a/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch b/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch new file mode 100644 index 000000000000..63f31d7ef9e0 --- /dev/null +++ b/pkgs/games/scid-vs-pc/0001-put-fonts-in-out.patch @@ -0,0 +1,77 @@ +From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001 +From: Sebastian Galkin +Date: Wed, 20 Dec 2017 18:23:03 -0200 +Subject: [PATCH] put fonts in $out + +--- + Makefile.conf | 22 ++++------------------ + configure | 12 ------------ + 2 files changed, 4 insertions(+), 30 deletions(-) + +diff --git a/Makefile.conf b/Makefile.conf +index e7f8de9..87f3fff 100644 +--- a/Makefile.conf ++++ b/Makefile.conf +@@ -226,19 +226,11 @@ install_scid: all_scid + fi + install -m 755 -d $(SHAREDIR)/bitmaps + cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/ +- @if [ "`id -u`" -eq 0 ]; then \ +- install -m 755 -d $(FONTDIR); \ +- install -m 644 -p fonts/*.ttf $(FONTDIR); \ +- else \ +- install -m 755 -d ~/.fonts; \ +- install -m 644 -p fonts/*.ttf ~/.fonts; \ +- fi ++ install -m 755 -d $(FONTDIR); \ ++ install -m 644 -p fonts/*.ttf $(FONTDIR); \ ++ + @if [ ! -z "`which fc-cache`" ]; then \ +- if [ "`id -u`" -eq 0 ]; then \ +- fc-cache -fv $(FONTDIR); \ +- else \ +- fc-cache -fv ~/.fonts; \ +- fi; \ ++ fc-cache -fv $(FONTDIR); \ + else \ + echo "Don't know how to setup truetype fonts (fc-cache not available)."; \ + echo "Please contact your system administrator."; \ +@@ -292,12 +284,6 @@ uninstall: + for f in `ls fonts/*.ttf`; do \ + rm -f ~/.$$f; \ + done; \ +- if [ ! -z "`which fc-cache`" ]; then \ +- fc-cache -fv ~/.fonts; \ +- fi; \ +- if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \ +- rmdir ~/.fonts; \ +- fi; \ + fi + + clean: +diff --git a/configure b/configure +index 4599c77..8b09678 100755 +--- a/configure ++++ b/configure +@@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} { + exit 1 + } + +- if {[isDarwin]} { +- set var(FONTDIR) /Library/Fonts/ +- } else { +- # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active +- set prefix /usr +- if {![file isdirectory $prefix/share/fonts]} { +- set var(FONTDIR) "~/.fonts" +- } else { +- set var(FONTDIR) $prefix/share/fonts/truetype/Scid +- } +- } +- + set line [gets $from] + while {1} { + set line [gets $from] +-- +2.15.1 + diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix new file mode 100644 index 000000000000..60fa7bf56216 --- /dev/null +++ b/pkgs/games/scid-vs-pc/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: + +stdenv.mkDerivation rec { + name = "scid-vs-pc-${version}"; + version = "4.18.1"; + + src = fetchurl { + url = "mirror://sourceforge/scidvspc/scid_vs_pc-4.18.1.tgz"; + sha256 = "01nd88g3wh3avz1yk9fka9zf20ij8dlnpwzz8gnx78i5b06cp459"; + }; + + buildInputs = [ tcl tk libX11 zlib makeWrapper ]; + + prePatch = '' + sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ + -e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \ + -e '/^ *set x11Path *{/a ${libX11}/lib/' \ + configure + + sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \ + tcl/config.tcl + ''; + + # configureFlags = [ + # "BINDIR=$(out)/bin" + # "SHAREDIR=$(out)/share" + # "FONTDIR=$(out)/fonts" + # ]; + + preConfigure = ''configureFlags=" + BINDIR=$out/bin + SHAREDIR=$out/share + FONTDIR=$out/fonts" + ''; + + patches = [ + ./0001-put-fonts-in-out.patch + ]; + + hardeningDisable = [ "format" ]; + + dontPatchShebangs = true; + + postFixup = '' + for cmd in sc_addmove sc_eco sc_epgn scidpgn \ + sc_import sc_spell sc_tree spliteco + do + sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/$cmd" + done + + sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote" + sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid" + + for cmd in $out/bin/* + do + wrapProgram "$cmd" \ + --set TCLLIBPATH "${tcl}/${tcl.libdir}" \ + --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" + done + ''; + + + meta = with stdenv.lib; { + description = "Chess database with play and training functionality"; + homepage = http://scidvspc.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.paraseba ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d20d1bcba8c..6aeca613bc6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18424,6 +18424,11 @@ with pkgs; tk = tk-8_5; }; + scid-vs-pc = callPackage ../games/scid-vs-pc { + tcl = tcl-8_6; + tk = tk-8_6; + }; + scummvm = callPackage ../games/scummvm { }; scorched3d = callPackage ../games/scorched3d { }; From 79db7c0616c38ac15ea0f6734034053e92b3cca2 Mon Sep 17 00:00:00 2001 From: Gregory Pfeil Date: Fri, 12 Jan 2018 10:19:46 -0700 Subject: [PATCH 074/197] flootty: init at 3.2.1 --- lib/maintainers.nix | 1 + .../python-modules/flootty/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/flootty/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ea1cff03fe2e..85669a28c281 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -530,6 +530,7 @@ schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; sdll = "Sasha Illarionov "; + sellout = "Greg Pfeil "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; shanemikel = "Shane Pearlman "; diff --git a/pkgs/development/python-modules/flootty/default.nix b/pkgs/development/python-modules/flootty/default.nix new file mode 100644 index 000000000000..92ce520fd194 --- /dev/null +++ b/pkgs/development/python-modules/flootty/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "Flootty"; + version = "3.2.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs"; + }; + + meta = with stdenv.lib; { + description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; + homepage = "https://floobits.com/help/flootty"; + license = licenses.asl20; + maintainers = with maintainers; [ sellout ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 175b3a98df13..1cb45cf76573 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7004,7 +7004,7 @@ with pkgs; findbugs = callPackage ../development/tools/analysis/findbugs { }; - foreman = callPackage ../tools/system/foreman { }; + flootty = pythonPackages.flootty; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -7012,6 +7012,8 @@ with pkgs; inherit (ocamlPackages_4_03) ocaml findlib camlp4 sedlex ocamlbuild; }; + foreman = callPackage ../tools/system/foreman { }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d89d6bd8d76..e01434758fae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -167,6 +167,8 @@ in { distorm3 = callPackage ../development/python-modules/distorm3 { }; + flootty = callPackage ../development/python-modules/flootty { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; From 43e7cf5eb76e25833988432061876dfe78bc23b6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 12 Jan 2018 13:04:57 -0500 Subject: [PATCH 075/197] haskellPackages.ChasingBottoms: Disable testsuite --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 77498619abd2..16eb66a4ad08 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -939,4 +939,6 @@ self: super: { # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; + # Sporadically OOMs even with 16G + ChasingBottoms = dontCheck super.ChasingBottoms; } From 09fb3b5e94fc70bc5a3b20670469d5986c2bcb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 16:52:29 -0200 Subject: [PATCH 076/197] gstreamermm: 1.8.0 -> 1.10.0 --- .../libraries/gstreamer/gstreamermm/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index f6138fafaefc..bee80cb24ecf 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }: let - ver_maj = "1.8"; + ver_maj = "1.10"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,16 +9,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; - sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry"; + sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y"; }; - patches = [ - (fetchurl { - url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765; - sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0"; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig file ]; @@ -31,8 +24,8 @@ stdenv.mkDerivation rec { description = "C++ interface for GStreamer"; homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ romildo ]; platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; }; } From 9e27701d64e74912eb57d83da0eee8fc94249d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 12 Jan 2018 19:16:20 +0000 Subject: [PATCH 077/197] notary: get rid of .git folder in source tested with: $ notary version --- pkgs/tools/security/notary/default.nix | 53 ++++++++++++++++---------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index b0c0ef02461d..36685b1d1e49 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -1,44 +1,55 @@ -{ stdenv, fetchgit, buildGoPackage, git, libtool }: +{ stdenv, fetchFromGitHub, buildGoPackage, git, libtool }: buildGoPackage rec { name = "notary-${version}"; version = "0.5.1"; gitcommit = "9211198"; - src = fetchgit { - url = "https://github.com/theupdateframework/notary"; - rev = "refs/tags/v${version}"; - sha256 = "1iybkwvl7021g7kklqybrip8d7hsvvqggpb19yx9kjjisasi2dw6"; - leaveDotGit = true; + src = fetchFromGitHub { + owner = "theupdateframework"; + repo = "notary"; + rev = "v${version}"; + sha256 = "0z9nsb1mrl0q5j02jkyzbc6xqsm83qzacsckypsxcrijhw935rs5"; }; - buildInputs = [ git libtool ]; + buildInputs = [ libtool ]; goPackagePath = "github.com/docker/notary"; + buildPhase = '' cd go/src/github.com/docker/notary - make GITCOMMIT=${gitcommit} client + make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client ''; installPhase = '' - mkdir -p $bin/bin - cp bin/notary $bin/bin/notary + install -D bin/notary $bin/bin/notary ''; meta = with stdenv.lib; { - description = " Notary is a project that allows anyone to have trust over arbitrary collections of data"; - longDescription = '' - The Notary project comprises a server and a client for running and interacting with trusted collections. See the service architecture documentation for more information. + description = " Notary is a project that allows anyone to have trust over arbitrary collections of data"; + longDescription = '' + The Notary project comprises a server and a client for running and + interacting with trusted collections. See the service architecture + documentation for more information. - Notary aims to make the internet more secure by making it easy for people to publish and verify content. We often rely on TLS to secure our communications with a web server which is inherently flawed, as any compromise of the server enables malicious content to be substituted for the legitimate content. + Notary aims to make the internet more secure by making it easy for people + to publish and verify content. We often rely on TLS to secure our + communications with a web server which is inherently flawed, as any + compromise of the server enables malicious content to be substituted for + the legitimate content. - With Notary, publishers can sign their content offline using keys kept highly secure. Once the publisher is ready to make the content available, they can push their signed trusted collection to a Notary Server. + With Notary, publishers can sign their content offline using keys kept + highly secure. Once the publisher is ready to make the content available, + they can push their signed trusted collection to a Notary Server. - Consumers, having acquired the publisher's public key through a secure channel, can then communicate with any notary server or (insecure) mirror, relying only on the publisher's key to determine the validity and integrity of the received content. - ''; - license = licenses.asl20; - homepage = https://github.com/theupdateframework/notary; - maintainers = with maintainers; [ vdemeester ]; - platforms = with platforms; unix; + Consumers, having acquired the publisher's public key through a secure + channel, can then communicate with any notary server or (insecure) mirror, + relying only on the publisher's key to determine the validity and + integrity of the received content. + ''; + license = licenses.asl20; + homepage = https://github.com/theupdateframework/notary; + maintainers = with maintainers; [ vdemeester ]; + platforms = with platforms; unix; }; } From 48776d58b1384aa5d37cbc57b85e5b4e950f9a66 Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Fri, 12 Jan 2018 20:03:31 +0100 Subject: [PATCH 078/197] lolcat: 42.1.0 -> 90.8.8 --- lib/maintainers.nix | 1 + pkgs/tools/misc/lolcat/Gemfile.lock | 13 ++++++++----- pkgs/tools/misc/lolcat/default.nix | 15 +++++++++------ pkgs/tools/misc/lolcat/gemset.nix | 26 +++++++++++++------------- 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b7b5232c170b..a18e8a24b12c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -640,6 +640,7 @@ sternenseemann = "Lukas Epple "; stesie = "Stefan Siegl "; steveej = "Stefan Junker "; + StillerHarpo = "Florian Engel "; stumoss = "Stuart Moss "; SuprDewd = "Bjarki Ágúst Guðmundsson "; swarren83 = "Shawn Warren "; diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index 4b318ea1473b..a97f1eb9c871 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,14 +1,17 @@ GEM remote: http://rubygems.org/ specs: - lolcat (42.1.0) - paint (~> 0.8.3) - trollop (~> 1.16.2) - paint (0.8.7) - trollop (1.16.2) + lolcat (90.8.8) + paint (~> 2.0.0) + trollop (~> 2.1.2) + paint (2.0.1) + trollop (2.1.2) PLATFORMS ruby DEPENDENCIES lolcat + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix index 21377d7bfa4a..827484e885fd 100644 --- a/pkgs/tools/misc/lolcat/default.nix +++ b/pkgs/tools/misc/lolcat/default.nix @@ -1,16 +1,19 @@ -{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian -, pkgconfig, which }: +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "${pname}-${version}"; + pname = "lolcat"; + version = (import ./gemset.nix).lolcat.version; -bundlerEnv { inherit ruby; - pname = "lolcat"; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory gemdir = ./.; meta = with lib; { description = "A rainbow version of cat"; homepage = https://github.com/busyloop/lolcat; - license = licenses.wtfpl; - maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; + maintainers = with maintainers; [ StillerHarpo ]; }; } diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 85acf7767a81..6d0962780f4c 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -1,27 +1,27 @@ { - "lolcat" = { - version = "42.1.0"; + lolcat = { + dependencies = ["paint" "trollop"]; source = { + remotes = ["http://rubygems.org"]; + sha256 = "1q031wq8wvp09llb39w0ql5k1zkblvkbmhlvrkc3ym832pibk06f"; type = "gem"; - sha256 = "1jp0g7k958dg709dm1qs7nr8dmi4vlgvmcvqcr1zhk8ygx89rwgc"; }; - dependencies = [ - "paint" - "trollop" - ]; + version = "90.8.8"; }; - "paint" = { - version = "0.8.7"; + paint = { source = { + remotes = ["http://rubygems.org"]; + sha256 = "1gnh9cihc84w4xbw51pg15crjvhblbq6nkzljrp7kmn3434nsg0d"; type = "gem"; - sha256 = "0nl1x0190d44bfczlxdy16gxsvm95y14kxv3k9n92h9ap2zvdyd8"; }; + version = "2.0.1"; }; - "trollop" = { - version = "1.16.2"; + trollop = { source = { + remotes = ["http://rubygems.org"]; + sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; type = "gem"; - sha256 = "0frrp90dw266h3kf9g925dppir9l7p8jxknw6dn5nz6fa6c4g5lg"; }; + version = "2.1.2"; }; } \ No newline at end of file From 4c96412189142be885550fabfd079af55f3bc9af Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 12 Jan 2018 14:18:40 -0500 Subject: [PATCH 079/197] nixUnstable: pre5810_5d5b931f -> pre5849_74f75c85 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 33f132ae74f2..45f7ab665377 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-unstable-1.12${suffix}"; - suffix = "pre5810_5d5b931f"; + suffix = "pre5849_74f75c85"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5d5b931fb178046ba286b8ef2b56a00b3a85c51c"; - sha256 = "0sspf8np53j335dvgxw03lid0w43wzjkcbx6fqym2kqdcvbzw57j"; + rev = "74f75c855837bce7f48491e9ce8ac03794e5b40d"; + sha256 = "1ch3v8rk1jf7yk9zd10fqgk11q63vjrk3mi2niv495zvkdjh4rf1"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 2769a38c1dae03f010c2250fe3574f46f4f33149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 12 Jan 2018 19:40:08 +0000 Subject: [PATCH 080/197] telegraf: 1.5.0 -> 1.5.1 --- pkgs/servers/monitoring/telegraf/default.nix | 2 +- .../monitoring/telegraf/{deps-1.5.0.nix => deps-1.5.1.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/servers/monitoring/telegraf/{deps-1.5.0.nix => deps-1.5.1.nix} (100%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index d5411e40a399..65a95c021c40 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.5.0"; + version = "1.5.1"; goPackagePath = "github.com/influxdata/telegraf"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.1.nix similarity index 100% rename from pkgs/servers/monitoring/telegraf/deps-1.5.0.nix rename to pkgs/servers/monitoring/telegraf/deps-1.5.1.nix From 46a4ea5186c1ab962e4d952fa4185cd49b57fbeb Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 03:47:10 +0800 Subject: [PATCH 081/197] pythonPackages.uranium: 3.0.3 -> 3.1.0 --- pkgs/development/python-modules/uranium/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 2e4a232f1f1e..24eecf82311a 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,17 +5,17 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "3.0.3"; + version = "3.1.0"; pname = "uranium"; name = "${pname}-${version}"; - + src = fetchFromGitHub { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1pyzpcdb6kb0basvhgpjdiws8x0bwl71k7nkf3j3s9wk1dvyw824"; + sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk"; }; - + buildInputs = [ python gettext ]; propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fec2e3fd4932..f5349747869a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22541,10 +22541,7 @@ EOF twilio = callPackage ../development/python-modules/twilio { }; - uranium = callPackage ../development/python-modules/uranium { - # https://github.com/Ultimaker/Cura/issues/2596 - pyqt5 = self.pyqt56; - }; + uranium = callPackage ../development/python-modules/uranium { }; vine = callPackage ../development/python-modules/vine { }; From 907b143dc41d13c2f47659f26b7d286bfac65dc0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 03:47:40 +0800 Subject: [PATCH 082/197] pythonPackages.python-utils: Fix build --- pkgs/development/python-modules/python-utils/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 37c15c07537e..a7826758af05 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -14,6 +14,14 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; + postPatch = '' + # pytest-runner is only actually required in checkPhase + substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "" + ''; + + # Tests failing + doCheck = false; + checkPhase = '' rm nix_run_setup.py py.test From 964da1b91a115c7a3e4dee64420d8b7dd894b408 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 03:48:23 +0800 Subject: [PATCH 083/197] pythonPackages.pyqt56: Drop unused package --- pkgs/top-level/python-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f5349747869a..59f04e04fb66 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -320,10 +320,6 @@ in { pythonPackages = self; }; - pyqt56 = pkgs.libsForQt56.callPackage ../development/python-modules/pyqt/5.x.nix { - pythonPackages = self; - }; - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; From 0e30e9b7ae791f51533b68363b90e7c9ab0b2520 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 03:50:09 +0800 Subject: [PATCH 084/197] cura: 3.0.3 -> 3.1.0 --- pkgs/applications/misc/cura/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 1012f187497a..b9a160564a5d 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa"; + sha256 = "1x732bzxdxnz1av8jlv5kzs08jpmsg6bz9i88jr63kw32d901xsm"; }; buildInputs = [ qtbase qtquickcontrols ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04be1c44978c..7a970e235c3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16976,7 +16976,7 @@ with pkgs; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt56.callPackage ../applications/misc/cura { }; + cura = qt5.callPackage ../applications/misc/cura { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; From eb29b006213b752c5a5ca312f709fc62f600f307 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 03:07:26 +0800 Subject: [PATCH 085/197] mumble_git: 2017-05-25 -> 2018-01-12 --- pkgs/applications/networking/mumble/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 283307fc9de5..dd4491be3410 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -119,14 +119,14 @@ let }; gitSource = rec { - version = "2017-05-25"; + version = "2018-01-12"; qtVersion = 5; # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3"; - sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f"; + rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e"; + sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3"; }; }; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04be1c44978c..9444a191fc8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16132,7 +16132,6 @@ with pkgs; avahi = avahi.override { withLibdnssdCompat = true; }; - qt5 = qt56; # Mumble doesn't work with Qt > 5.5 jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -16143,7 +16142,6 @@ with pkgs; avahi = avahi.override { withLibdnssdCompat = true; }; - qt5 = qt56; # Mumble doesn't work with Qt > 5.5 jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; From f378232f0526cf964b52cab3c8cdecdf0d47eb38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 17:58:20 -0200 Subject: [PATCH 086/197] paper-icon-theme: 2017-02-13 -> 2017-11-20 --- pkgs/data/icons/paper-icon-theme/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 9e793caf9de8..f161d6fbbd67 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -3,21 +3,17 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "paper-icon-theme"; - version = "2017-02-13"; + version = "2017-11-20"; src = fetchFromGitHub { owner = "snwh"; repo = package-name; - rev = "fcaf8bb2aacdd1bb7dcde3d45ef92d0751567e8e"; - sha256 = "1l1w99411jrv4l7jr5dvwszghrncsir23c7lpc26gh2f0ydf3d0d"; + rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8"; + sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m"; }; nativeBuildInputs = [ autoreconfHook ]; - postPatch = '' - substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out - ''; - meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; homepage = https://snwh.org/paper; From 0fbb2f1517e83a0bb35c8e06d57170a3574c2f04 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jan 2018 18:11:10 +0800 Subject: [PATCH 087/197] qgo: unstable-2016-06-23 -> unstable-2017-12-18 --- pkgs/games/qgo/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 4848d1a3e215..924101c2d4a8 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -1,8 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qmake, qt56 }: +{ stdenv +, fetchFromGitHub +, makeWrapper +, qmake +, qtbase +, qtmultimedia +, qttranslations +}: stdenv.mkDerivation rec { name = "qgo-${version}"; - version = "unstable-2016-06-23"; + version = "unstable-2017-12-18"; meta = with stdenv.lib; { description = "A Go client based on Qt5"; @@ -26,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "pzorin"; repo = "qgo"; - rev = "1e65b0c74914e534ea4d040f8f0ef8908383e374"; + rev = "bef526dda4c79686edd95c88cc68de24f716703c"; sha256 = "1xzkayclmhsi07p9mnbf8185jw8n5ikxp2mik3x8qz1i6rmrfl5b"; }; @@ -35,14 +42,7 @@ stdenv.mkDerivation rec { sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h ''; nativeBuildInputs = [ makeWrapper qmake ]; - # qt58 does not provide platform plugins - # We need lib/qt*/plugins/platforms/libqxcb.so - buildInputs = with qt56; [ qtbase.out qtmultimedia qttranslations ]; + buildInputs = [ qtbase qtmultimedia qttranslations ]; enableParallelBuilding = true; - postFixup = '' - # libQt5XcbQpa is a platform plugin dependency and doesn't get linked - patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo - wrapProgram $out/bin/qgo \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "${stdenv.lib.getBin qt56.qtbase}/lib/qt-5.6/plugins/platforms/" - ''; + } From 747431cf4229e7f02f691534d7203acb8d1b07e9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 22:31:43 +0800 Subject: [PATCH 088/197] smtube: 17.5.0 -> 18.1.0 --- pkgs/applications/video/smtube/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index b05887967093..406d49c99391 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "17.5.0"; + version = "18.1.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld"; + sha256 = "1sw2b89ricxfbmgbzsp9f89n0gwh9dbnii6lr9gcccs8djpp1ad1"; }; makeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04be1c44978c..a4359884eee0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16226,7 +16226,7 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt56.callPackage ../applications/video/smtube {}; + smtube = libsForQt5.callPackage ../applications/video/smtube {}; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; From 4ffc43f49cf0636ca0e4169bf0dd76f61e5a080b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 22:44:58 +0800 Subject: [PATCH 089/197] sigil: 0.9.7 -> 0.9.9 --- pkgs/applications/editors/sigil/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 0c716ed63c14..a6f454deaf5c 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { - sha256 = "17m2f7pj2sx5rxrbry6wk1lvviy8fi2m270h47sisywnrhddarh7"; + sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4359884eee0..71b3ab98bb7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4525,7 +4525,7 @@ with pkgs; inherit (pythonPackages) buildPythonApplication fetchPypi; }; - sigil = libsForQt56.callPackage ../applications/editors/sigil { }; + sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; From 1ec304ce0122ba8bf9d001495f2a03d9f37f0afd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 01:02:21 +0800 Subject: [PATCH 090/197] owncloud-client: 2.3.3 -> 2.3.4 --- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index e900f90f46ee..94e3b7d0ba6a 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1r5ddln1wc9iyjizgqb104i0r6qhzsmm2wdnxfaif119cv0vphda"; + sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49"; }; patches = [ ../nextcloud-client/find-sql.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71b3ab98bb7c..6f4ec1a5d894 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3896,7 +3896,7 @@ with pkgs; owncloud90 owncloud91; - owncloud-client = libsForQt56.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; p2pvc = callPackage ../applications/video/p2pvc {}; From 7dea1f20ed5512fd2992ced563e9b355e70afe97 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 01:27:06 +0800 Subject: [PATCH 091/197] supercollider: 3.8.0 -> 3.8.1 --- pkgs/development/interpreters/supercollider/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 642fd928f41d..19abfe1cea27 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "053b2xc2x1sczvlb41w6iciqlwy0zyfiv3jrynx4f8jgd6mizsm6"; + sha256 = "1y8yb20k3lvj7c93qz2srrkvfv175n4n7p3qj89w0dp085mj0qmw"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f4ec1a5d894..0b79a11913ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,7 +6983,7 @@ with pkgs; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; - supercollider = libsForQt56.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; From 08ab28b9a32254445e3fcf1b8ccb2bd68071bde4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 01:43:26 +0800 Subject: [PATCH 092/197] qcachegrind: Use kcachegrind src/name attributes --- .../tools/analysis/qcachegrind/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 395f720906c9..8db532d2febe 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }: +{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind }: -stdenv.mkDerivation rec { - name = "qcachegrind-${version}"; - version = "16.12.3"; +let + name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; - src = fetchurl { - url = "http://download.kde.org/stable/applications/${version}/src/kcachegrind-${version}.tar.xz"; - sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q"; - }; +in stdenv.mkDerivation rec { + inherit name; + + src = kcachegrind.src; buildInputs = [ qtbase perl python php ]; @@ -28,8 +27,8 @@ stdenv.mkDerivation rec { '' else '' install qcachegrind/qcachegrind cgview/cgview -t "$out/bin" install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications" - install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png" - install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" + install -Dm644 kcachegrind/32-apps-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png" + install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" ''); meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b79a11913ce..4ab498ec7549 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7925,7 +7925,7 @@ with pkgs; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {}; + qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {}; verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { coq = coq_8_4; From cad14c782b15da7bb5b636a8bd70fee985905b40 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 01:57:39 +0800 Subject: [PATCH 093/197] luminanceHDR: 2.4.0 -> 2.5.1 --- .../graphics/luminance-hdr/default.nix | 17 +++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 30d34a88d90a..867c0a558382 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,28 +1,21 @@ -{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, boost, exiv2, fftwFloat, gsl +{ stdenv, cmake, fetchurl, pkgconfig, boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr -, qtbase, qtdeclarative, qttools, qtwebkit +, qtbase, qtdeclarative, qttools, qtwebengine }: stdenv.mkDerivation rec { - name = "luminance-hdr-2.4.0"; + name = "luminance-hdr-2.5.1"; src = fetchurl { url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2"; - sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l"; + sha256 = "15hnyk9yjkkc97dmnrg2ipfgwqxprlcyv2kyvbls4d54zc56x658"; }; - patches = [(fetchpatch { - name = "fix-qt53-build.diff"; - url = "http://anonscm.debian.org/cgit/pkg-phototools/luminance-hdr.git/" - + "plain/debian/patches/51_qt5_printsupport.diff?id=00c869a860062dac181303f2c03a3513c0e210bc"; - sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl"; - })]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ - qtbase qtdeclarative qttools qtwebkit + qtbase qtdeclarative qttools qtwebengine boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ab498ec7549..4f62b5bf5027 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15880,7 +15880,7 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; - luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; From 5f232de6cda58185c4a0a4f3d4a73b9e9f2856be Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 02:18:08 +0800 Subject: [PATCH 094/197] qgroundcontrol: 2.9.4 -> 3.2.7, unbreak build --- .../robotics/qgroundcontrol/default.nix | 56 +++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 98ec39eb2064..087969fe61a0 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake +{ stdenv, fetchgit, git, espeak, SDL2, udev, doxygen, cmake , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake , makeWrapper, lndir , gst_all_1, qt-gstreamer1, pkgconfig, glibc -, version ? "2.9.4" }: stdenv.mkDerivation rec { name = "qgroundcontrol-${version}"; + version = "3.2.7"; qtInputs = [ qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg @@ -19,72 +19,54 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs; + buildInputs = [ SDL2 udev doxygen git ] ++ gstInputs ++ qtInputs; nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; - patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; - postPatch = '' - sed '1i#include ' -i src/Vehicle/Vehicle.cc \ - -i src/comm/{QGCFlightGearLink,QGCJSBSimLink}.cc \ - -i src/{uas/UAS,ui/QGCDataPlot2D}.cc - ''; - preConfigure = '' mkdir build cd build ''; - qmakeFlags = [ "../qgroundcontrol.pro" ]; + qmakeFlags = [ + # Default install tries to copy Qt files into package + "CONFIG+=QGC_DISABLE_BUILD_SETUP" + "../qgroundcontrol.pro" + ]; installPhase = '' cd .. + mkdir -p $out/share/applications - cp -v qgroundcontrol.desktop $out/share/applications - + cp -v deploy/qgroundcontrol.desktop $out/share/applications + mkdir -p $out/bin - cp -v build/release/qgroundcontrol "$out/bin/" - + cp -v build/release/QGroundControl "$out/bin/" + mkdir -p $out/share/qgroundcontrol cp -rv resources/ $out/share/qgroundcontrol - + mkdir -p $out/share/pixmaps cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps - - # we need to link to our Qt deps in our own output if we want - # this package to work without being installed as a system pkg - mkdir -p $out/lib/qt-$qtCompatVersion $out/etc/xdg - for pkg in $qtInputs; do - if [[ -d $pkg/lib/qt-$qtCompatVersion ]]; then - for dir in lib/qt-$qtCompatVersion share etc/xdg; do - if [[ -d $pkg/$dir ]]; then - ${lndir}/bin/lndir "$pkg/$dir" "$out/$dir" - fi - done - fi - done ''; - postInstall = '' wrapProgram "$out/bin/qgroundcontrol" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; - # TODO: package mavlink so we can build from a normal source tarball src = fetchgit { url = "https://github.com/mavlink/qgroundcontrol.git"; rev = "refs/tags/v${version}"; - sha256 = "0isr0zamhvr853c94lblazkilil6zzmvf7afs3mxgn07jn9wrqz3"; + sha256 = "1sla3sgj2p3h87d7kcaj53f8z5xzyadvsqlqzgh4d2n1f7sikdc5"; fetchSubmodules = true; }; - meta = { + meta = with stdenv.lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = http://qgroundcontrol.org/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ pxc ]; - broken = true; # relies improperly on private Qt 5.5 headers + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pxc ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f62b5bf5027..71668f56bc46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16604,7 +16604,7 @@ with pkgs; qgis = callPackage ../applications/gis/qgis {}; - qgroundcontrol = libsForQt56.callPackage ../applications/science/robotics/qgroundcontrol { }; + qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; From 33ec57356a582f4fbfb4dfad45978653065a8ff3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jan 2018 18:38:23 +0800 Subject: [PATCH 095/197] vogl: Fix build with qt59 --- pkgs/development/tools/vogl/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index e351a75db4b2..9230d99efcc7 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -4,6 +4,7 @@ , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf , freeglut, mesa_glu +, fetchpatch }: mkDerivation rec { @@ -17,6 +18,14 @@ mkDerivation rec { sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n"; }; + patches = [ + (fetchpatch { + name = "fix-qt59.patch"; + url = "https://github.com/ValveSoftware/vogl/commit/be3d85f.patch"; + sha256 = "1yh4jd35mds337waqxdw3w22w7ghn05b5jm7fb4iihl39mhq6qyv"; + }) + ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71668f56bc46..08a542483b0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17485,7 +17485,7 @@ with pkgs; vnstat = callPackage ../applications/networking/vnstat { }; - vogl = qt56.callPackage ../development/tools/vogl { }; + vogl = libsForQt5.callPackage ../development/tools/vogl { }; volnoti = callPackage ../applications/misc/volnoti { }; From 07fbb158a8706c63634105d4c267aca03644bd00 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jan 2018 18:46:35 +0800 Subject: [PATCH 096/197] trojita: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08a542483b0c..7974bbc4a4e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17285,7 +17285,7 @@ with pkgs; tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; From a3832c0388d00bdeace6c34442cc42f950a880bc Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 12 Jan 2018 14:15:07 -0600 Subject: [PATCH 097/197] mblaze: 0.2 -> 0.3 --- pkgs/applications/networking/mailreaders/mblaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 0d73f161249d..30c392b55e48 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "0p97zfl35ilrnrx9ynj82igsb698m9klikfaicw5jhjpf6qp2n3y"; + sha256 = "1jrn81rvw6qanlfppc12dkvpbmidzrq1lx3rfhvcsna55k3gjyw9"; }; makeFlags = "PREFIX=$(out)"; From 9aa93dec6710966622b590391be2706d5b22f7b2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jan 2018 19:00:29 +0800 Subject: [PATCH 098/197] apitrace: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7974bbc4a4e5..de74b82edf74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -485,7 +485,7 @@ with pkgs; withGui = false; }; - apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; argus = callPackage ../tools/networking/argus {}; From 0281a20de0e38d15beb057e31f181fd28d0cb3c1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 17:39:49 +0800 Subject: [PATCH 099/197] hotspot: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de74b82edf74..31d20428175b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2715,7 +2715,7 @@ with pkgs; hotpatch = callPackage ../development/libraries/hotpatch { }; - hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; + hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { }; hping = callPackage ../tools/networking/hping { }; From 7335a9cc8fbc72a50109d6c4bec866c4fecbcafd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 17:46:30 +0800 Subject: [PATCH 100/197] ricochet: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d20428175b..ecdc91958efd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16762,7 +16762,7 @@ with pkgs; retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = retroshare; - ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; ripser = callPackage ../applications/science/math/ripser { }; From 9c03f4fad1f2499aa40077b3f43ba6f356b632f2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 18:11:53 +0800 Subject: [PATCH 101/197] rapcad: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecdc91958efd..bf10c58df296 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16725,7 +16725,7 @@ with pkgs; wxGTK = wxGTK30; }; - rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; From f40a9695eac38085f8db429dc4569f356b09cb8b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 12 Jan 2018 22:24:33 +0800 Subject: [PATCH 102/197] notepadqq: Build with qt59 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf10c58df296..60e874a265f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16305,7 +16305,7 @@ with pkgs; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; - notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3; From 0b0deb6f64d2e081a4b9e9779c47ffb1fb0c0d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 18:32:04 -0200 Subject: [PATCH 103/197] roboto: 2.136 -> 2.138 --- pkgs/data/fonts/roboto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 00c4bb7fb886..26697c523273 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "2.136"; + version = "2.138"; in fetchzip rec { name = "roboto-${version}"; @@ -9,10 +9,10 @@ in fetchzip rec { postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype ''; - sha256 = "02fanxx2hg0kvxl693rc0fkbrbr2i8b14qmpparkrwmv0j35wnd7"; + sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; meta = { homepage = https://github.com/google/roboto; From 4ba77b098b5eade26f4739e3a6d6ff70f94d61d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 18:39:00 -0200 Subject: [PATCH 104/197] jdupes: 1.8 -> 1.9 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 35d93a3d57cb..4410d1e3cd4e 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "17cgh3j6z4rl8ay06s8387a2c49awfv1w3b2a11z4hidwry37aiq"; + sha256 = "0z6hb4jva0pnk5fb1p59qwyglgrpxgpnz4djq3g00y5yxv3sj9z9"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. From 403ee9691adf76105096a8df4d4b3912ba11b5ce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 12 Jan 2018 23:29:26 +0100 Subject: [PATCH 105/197] android-studio-preview: 3.1.0.6 -> 3.1.0.7 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index acab0be4258f..b6ead3c8f527 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.6"; # "Android Studio 3.1 Canary 7" - build = "173.4524538"; - sha256Hash = "0rj7swychriznylrr09g0rnj12rymms925xbry85ba72hj1jjf6w"; + version = "3.1.0.7"; # "Android Studio 3.1 Canary 8" + build = "173.4529993"; + sha256Hash = "0mfkzdxbrdqlfqqx83dr9ibkpjwjf54kka9qra9j31zqcmy8rd53"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From 6887a0fc9a802331a2d77b499f9692548899c84c Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 8 Jan 2018 20:29:43 -0500 Subject: [PATCH 106/197] bitcoin: fix boost dependency Bitcoin 0.15.1 doesn't build with boost 1.66. I'm hesitant to apply untested patches to software like Bitcoin. Instead I'm forcing the boost dependency to version 1.64 (which is the version listed @ https://github.com/bitcoin/bitcoin/blob/45173fa6fca9537abb0a0554f731d14b9f89c456/doc/dependencies.md). Nothing in applications/altcoins/default.nix was using the boost162 parameter, so I've replaced it with the boost164 parameter. --- pkgs/applications/altcoins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 21c6b1341149..7d834be5da88 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,11 +1,11 @@ -{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, boost164, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { aeon = callPackage ./aeon { }; - bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + bitcoin = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; From dbf5d1d433f8f24937ea8377455cad9a3ab21861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Jan 2018 22:14:12 -0200 Subject: [PATCH 107/197] subtitleeditor: 0.53.0 -> 0.54.0 --- .../video/subtitleeditor/default.nix | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 88768b3cb8f6..536b4ba0fac4 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils, - enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx, - xdg_utils, isocodes, wrapGAppsHook +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, + desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, + libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: let - ver_maj = "0.53"; - ver_min = "0"; + version = "0.54.0"; in stdenv.mkDerivation rec { - name = "subtitle-editor-${ver_maj}.${ver_min}"; + name = "subtitleeditor-${version}"; - src = fetchurl { - url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz"; - sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g"; + src = fetchFromGitHub { + owner = "kitone"; + repo = "subtitleeditor"; + rev = version; + sha256 = "0vxcscc9m6gymgj173ahk2g9hlk9588z5fdaavmkpyriqdlhwm11"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch"; - sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c"; - }) - ]; - nativeBuildInputs = [ + autoreconfHook pkgconfig intltool file @@ -48,11 +43,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable check because currently making check in po fails - doCheck = false; - - hardeningDisable = [ "format" ]; - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; configureFlags = [ "--disable-debug" ]; @@ -65,9 +55,9 @@ stdenv.mkDerivation rec { and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices. ''; - homepage = http://home.gna.org/subtitleeditor; + homepage = http://kitone.github.io/subtitleeditor/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.plcplc ]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.plcplc ]; }; } From c1902ef000b4ac447dc89099494dbfe5459407f1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 11 Jan 2018 22:47:52 +0100 Subject: [PATCH 108/197] vapoursynth: R39 -> R40 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 6864db12f18d..24c4a50d874b 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R39"; + version = "R40"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy"; + sha256 = "1ycc3fdhhryp7hap80z3qmh89br31kcswzp8ai3wlc07zfvcrfck"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; From e5aae0f2d6d7f46e4ed3689790aa7a7541deae82 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 02:02:44 +0100 Subject: [PATCH 109/197] mpv: fix PYTHONPATH --- pkgs/applications/video/mpv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7aaa1b65fc45..dcbafd8594d3 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' - --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH" + --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" '' + '' cp TOOLS/umpv $out/bin From e76eb4ea88d75166bb26ea033c3da8a05cad5033 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 03:52:23 +0100 Subject: [PATCH 110/197] btfs: 2.17 -> 2.18 --- pkgs/os-specific/linux/btfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 6cc4dc6f6d51..83c442618b8e 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "btfs-${version}"; - version = "2.17"; + version = "2.18"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; rev = "v${version}"; - sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd"; + sha256 = "1cn21bxx43iqvac6scmwhkw0bql092sl48r6qfidbmhbw30xl5yf"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bittorrent filesystem based on FUSE"; - homepage = "https://github.com/johang/btfs"; + homepage = https://github.com/johang/btfs; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; From bc8ab45704093880fd71438eeb373b2be3995738 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 04:02:37 +0100 Subject: [PATCH 111/197] ddcutil: 0.8.4 -> 0.8.5 --- pkgs/tools/misc/ddcutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 3a243f9fdef0..ec9ca37c082e 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1w9bkrlxlgc58rpf03xfd2qbkj73rlbiqrhy8nhwxqqhsj1kkdb0"; + sha256 = "127a5v545gvfgxqqjxqafsg1p8i4qd5wnpdwccr38jbsphl6yzl4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From b863f23df13619cb6af02453ac0dc32f775c1a8e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 04:09:07 +0100 Subject: [PATCH 112/197] rewritefs: remove needless quotation --- pkgs/os-specific/linux/rewritefs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 5b16799a89c7..8c7b75a881f4 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A FUSE filesystem intended to be used like Apache mod_rewrite''; - homepage = "https://github.com/sloonz/rewritefs"; + homepage = https://github.com/sloonz/rewritefs; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; From 9560ff5e26b761f79241731b08c0f4bcfe437ac8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 04:24:25 +0100 Subject: [PATCH 113/197] bdf2psf 1.170 -> 1.175 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index b8b01a7c0fc7..7ea3b1fd279c 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.170"; + version = "1.175"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0xh743cr21qk8cmc6ijp59d61dqra4ggdlgbin9v991xqa0mqdxb"; + sha256 = "1bbj6wxdpjhy7n2614z0qx2310vhaxlvism6v6lxancb5bwwgdnf"; }; buildInputs = [ dpkg ]; From 0d800dc1941caf9455e35fcae032b2c09fe930f3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 12:23:01 +0800 Subject: [PATCH 114/197] firefox-beta-bin: 58.0b15 -> 58.0b16 --- .../browsers/firefox-bin/beta_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index deac6e272230..d2fd8976015f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b15"; + version = "58.0b16"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ach/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ach/firefox-58.0b16.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "5397865cdb1db5996ddc2e6b3d21380d56d8a6372b6b9733ede452e54fe5fec73b1cc12749e85c36bc7169a28ad6e4df278c4d8f9a3021f9c4622fb38fd36f12"; + sha512 = "08d5abe55791c1420286dcb3ed1a245a5f4b80a3edab869c27690e2f7cdc9ce497cecadd913fe5796e56ebea89c66bf8bdbb2137a584a3d9027db57c33172eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/af/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/af/firefox-58.0b16.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "cd18983a0b397435ace96b79645d3b8b994f25001b59aacb53ca20fe223e243151f3cdd4d0b1f8f68b8c87cdc747e98d0c1835ee37610d674f26c481764b531d"; + sha512 = "d98ef9d265e894121fc8c2aed631e6204576875a4da04c88d85a4c8e72002f55f0e3e117e295d0095621014281a63616b133bd50e70221f1cc25d5a5d302a391"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/an/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/an/firefox-58.0b16.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "80773287f69ec0c2012877887816ba0ff5cc447fe463aaa077c7753c7f50a66c8b23ff096a872eb3c9ce625cd2226ee11f11640f8ad0f1ab92f1137984355eca"; + sha512 = "759eacc00788759539a0c5bb8bed119653717d68bac6db8677829f63e8c97bb86214acd1ffe640139e443df9bea378faeaa478da300d06efb07c670e0b1f7a82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ar/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ar/firefox-58.0b16.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "9abe954a8cd68c57586d45759f1390ab24cb8371bf153053125f532e93a8646fcb5fd798009032ae6ec5852f0c524202a2140532276cd59d6580839c47fb3616"; + sha512 = "5492898a7c3cec6b06b254016584145ce1c0f5be092d0d86ed2acac5c6c0ffd0e8cdcfb379ead421b3cf9b400c4a5ad7b780f7d24d00b68172dd24b01963f6a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/as/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/as/firefox-58.0b16.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "f6bc470fda85afe00b175f2da26ba7fd63139f22fecda62a2e3bd8a7b327bbe73cba727dd6df4092295f2d819a219471e37135ba418d84db296d230561067084"; + sha512 = "4f6070a430f3b7d238c73ff6b3e4adb8755d00a67b4a88ccd8ff9cf635534dfef03c9b7c076210ae612d789c46cfb26b88b01323fcfb9a614ab53d7c1f771d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ast/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ast/firefox-58.0b16.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1c5245a594d909935a3e406fe8dfbd5e53b55fa08ad4973609bffe80a964554a69cc05f3d70f88ae55574535b5c2a367883298676995cddce99e4c5f0c2abb97"; + sha512 = "d82e6d1aff128bd3d311e26673c4de8924b970c08b77082aa143a75ff2bb9c200fb42f9273c9794175bc77708262ae333a123752f9c8b2a73fb71d33715f2d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/az/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/az/firefox-58.0b16.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4e9cdb529b4cd91a23a07d573d215f0f7ca47b7820cf1bc1f4fb0a05e963af674eda9ee61cfeeca18a8e6d20bb0bece1d6bd20a780e86330b1d3e9462c232744"; + sha512 = "5c2936fdc08c357e3a25e48e3703d75a77f2507bf1b4eb9d4a0e3a0ca835f944bfccb93771a6d42be2d2a44f6f8883f6200f58dc21b9d92ea03e3310adc8b206"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/be/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/be/firefox-58.0b16.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fbfef089f40514779051d60fa1ff1b245d4f91a31cf25f960cfdb7fa08ae78299d340191b2b71d472a3a97b228f8b53fd2afa116157952e415a4737573acef09"; + sha512 = "25eb2154fb2a07527228af116fc76b1c1ad1991f0767533e9596d417c37f4f2df94927aa0320d377fd32d6881d482f2e6c8359b43d61dbb137fdcf06c311221b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bg/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/bg/firefox-58.0b16.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "0a06d47b02792540627142bb029aa3f099dcfa4facaaa77a3982d1c5cfc3b58ff946cd94448bf6ca11dd1bff0fe3496a411aa7e3f241c02c1fa5b24d4a8b9d93"; + sha512 = "53f00bd48a92610dfb28d94c839ae21133c1597e5f0836716a5243dd716bd1e9ac16b224ab3f6d6459cc7629b471255c3046ef2c87c85cab76daf47b60aaa8da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bn-BD/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/bn-BD/firefox-58.0b16.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "cb78b30d32280b14c0ddfebcd02ca29d106173b3e3e590347b183a2e66fc03c607ccbace0754fc7713f7c7aadc431399e003229ac0b39d2b990d3cce85803ca6"; + sha512 = "fc111fd590a9854e2a34c450351041d527414819f9cd0b8715a584bebc39cce14b0eaa87deded683e457b40efcc70c70975a38840d7e4553996798d6f934a13c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bn-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/bn-IN/firefox-58.0b16.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "25e1dd45b294ff707b64966a3cd0262d253bcdfa0b8cc5c3fd4ccdb1bb457fb2699a2bc6a1ac1707ced941dbd1cf0dd0e3474604d897a776b2cefb71d8a4f8f6"; + sha512 = "dc7ee331572d306ee58584dc4a0b2d19abd724dc2852322c7527f47a48e57a654446e48b0d90e1a3587864df8ed81a2c0d8c63ebc8a656c5b7f69eba3c3f5240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/br/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/br/firefox-58.0b16.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "3f08b36c87414d380f5104acb3a296dd56d8c54073d34d3fbbb1df384c138c0e58187e948358df2d634026f01f38dafaa59c108dc0b9d81d9ef05b0c388e18ba"; + sha512 = "3893144e37fc0abd2d70d6c2ab9f4cd35d314e885b6134f9159a53dc33ed5abbf89a94ec9169c0d491d09d720f13ac2ee77a9ec2cfc0cfadae2caa2054bad728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/bs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/bs/firefox-58.0b16.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "6770f5016ed7cb162b8dd5cf76d9a076e3299eb8f67839e495bfc4057987b375f9eb15d536df6f92405eddaa00cab9c9970076e3b4774bac28593a4800d3187b"; + sha512 = "57171054d7b87644a24dad706c89979544d1ed3d1f91fd6c9eacbbbdbb6592e188d3e9ab5f652131fdd5f3bae78777024ddc14719cd73aa6eb714e3a109f38d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ca/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ca/firefox-58.0b16.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "69f2f14f5d15cbdb5a2dc5ff4035f783f5533315cc9bca67aae74e31691ce07f5e63e86f458cb7df28609fec547f5bbdaaddfa13ab776592d99136c175a16ecf"; + sha512 = "52241a785c2105e9bf4d2c9967bebd2aaf7de9ee855dfc330e3dfa4773b28862f7b93b1912e8137a6395f172f6adc146ee20572a3532351e96b40909df993a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cak/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/cak/firefox-58.0b16.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6c95305b1db952de2c23f887ac878f31c2b07a9f4daec30d1e59df54b05d730d6def93b679c61e84e647267863e0ac1457428220e7926c5b828a2ae963b6d75b"; + sha512 = "a726215207dee56846347e64a9a8c4d13782af7f4d9dbfc58c90b295933ce051b4c78906c2b6ba5b709b7835b343041cab34b8db26834b0b086778a8ea3378de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/cs/firefox-58.0b16.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "54e520b6bd4d15648ced14ac2700258c6338180a87d8493d314a4c843024e1fb062d4dc2e9f4f143063e037d375849e9c2c2c53e56c0b2c539a4254278a06a4e"; + sha512 = "fafd44f3a72316ec6111f0ee96c46763d0dad2c009f14fa45a57cc6d47780a23ad4ee0bab33c53d081f5ce815914e79efdcc778483a565523cace541510cc9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/cy/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/cy/firefox-58.0b16.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "569f6c5a554265ecbafb195d2f943d6bed7ef6eb5865e45474e3217e4d5ba13d5036bf86cc3d9fae6e5e2149caa26737c0d0b99c4ef8b244590ecfae612a0c2c"; + sha512 = "c847d82c3173d8969369d9ef18435c9c30ad5ebb28f4d38c3703b69922efc81b58600c7450df4e2d00d86ba7040f6cb0c5617a611d191c6a08eb3c5be8ecb265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/da/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/da/firefox-58.0b16.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "dc2b4e6d1bfe80984b99aec27ccd1274decd5397fb216b69b7ad3845f824c4c52956cd2f5766b11d28b9765f8355ab73973acdf029b76415575a20674e95f1ff"; + sha512 = "6101d553785c7882ed8f2a170db620763152c36efbb0a5838009d5d3639d0bdd43c71e7796f05868e6ec4d5b2577b850195e336629a674f283325b815d7fb04a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/de/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/de/firefox-58.0b16.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2f7508107dedc8afc517b420e2776186fcbda37c24273ca1f2602702bfbeeb59e7fbea8a160bd337430bccd96af7dcd22b2eb7b55e88c5b001d9c2fc0d9e0f9c"; + sha512 = "4cf459a3da43db545bf892701bfdd63c3330eef3092be757486b8ffe1d15df95e7ca5c9e48e3f4c04a364279ce5311e3e9ff9c8b42ee5fd9557951b84a1bb952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/dsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/dsb/firefox-58.0b16.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "a9fa820fef23f0eabe9e37ff8db3aa7e5908b31ec65dfe4d8fbfaede47258454b4f5d1b8571bd255c2d25f9b176f07d64f24ee69a7acde6a210a13a08dcb7be2"; + sha512 = "ef06d6c462de574fded8415597402b5e6794e07a2286fae12584d333cb303c43bf4491078e41dabd06044d6426254afeb3ffa812669946bd054e8e09ba96ba84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/el/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/el/firefox-58.0b16.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "16bd5066d01c117f16d88e080e046dc2c21bccbabcf9a3f598ab990cb4408e095e2d6fa3b649bf16bcca8f7e1c7067d6b9b7099509bc809942437eb1841200dc"; + sha512 = "cec8f68879ee288371b013ab52bf45ba026556822251a436c7925fe1d9b51621259c562ce4b79c126d064d38677db4166635ecea78fdddb69cc651283b5681aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-GB/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/en-GB/firefox-58.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "33d06b44192402fc9290f8ec8d9ae124f5ca195f499d145235355e1db928b0ddbd44933cb797968f6d683d05664dbe4b417a47d6e719ef8f4a42fc4aa5ea9a4f"; + sha512 = "d798af11de27c42c58b05a3e26ccc511ecb149e32767de42f40a7113ada4331707d0422327f449da46d35a24fa42368ee42a399d671e55635f7aceada2e3ac5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-US/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/en-US/firefox-58.0b16.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d5f198f4acf984b3d83b2eaa44811902a2d5965a665276b887990ed0ee49c1d6e1e0a8f82ac69a2aa7a17fc016e311a6ba9aefccfe1ed62f283be59476a82312"; + sha512 = "dc10aca03441c8cd8c17a6c584d585cba94a96bbab0ee1631a687bb584cbb309fed5f04a85410b33584ea21bb7af30310328552e4ee664b03244187725c4703e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/en-ZA/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/en-ZA/firefox-58.0b16.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "7e1a7fc8f875e5ab9f195bb8df413f454660c0c38897ae36973a4494b40c2a4e4c0360ee344f1cd3480eea2b98e5432df0e84ea710063815f62a2e690b1afd11"; + sha512 = "3ce0f81c59416cd5bba3610c9e263d3c859dd880080fbcd6cc0723d9cdf1716309227b67713f70a4fa48f7eeee28861cff15bd44bac4298a0094a880a53bb0ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/eo/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/eo/firefox-58.0b16.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "11d9f0b8ce3c6d8aa1e0c35ce1e6aa69ebbedef7c0e8e548f19556cf6c86c8af11763a2bda200d6f05ea91134c8b79bc8a29e99ee5209c0bd741f5bf996922d4"; + sha512 = "305ba3e85735e74edabfa2d1b5a39eb88af23b364268b2b681a178e1daaf6cd075f24eab6393a3660138bed31719ee3463d47402f2db848ec810fa5cda14e40e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-AR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/es-AR/firefox-58.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "316af39537f733d8524e91448b16efc38f180368905a461f38b2107836732ccc2d8496e6b43975ce07c75652bff97dfa26fce982abafef94996d7d5e0ea92dbe"; + sha512 = "87a48b92ddec3fb703320209513773b5969c8b05a1a9e984a1e7586c12545e8c8be85c27b9ab65ca34c1056e3370074c03db9cc9e2569e562cd1e27f7ffda0de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-CL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/es-CL/firefox-58.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "3ac1229c932f5a73c99129a63419aef394522d8dbbc419567ba1631aa49c7d1012fcc963c7d678ff284b00775ac125e97ac07a4421b869920e62e7897136142f"; + sha512 = "8388598b0720caf0f57bd61096adaad5766f028f9a1b0115887de55c99e3018b5813b5987f48df5cf26bc2f35405361dd436d353f95664d40d270c6df4baf9c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-ES/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/es-ES/firefox-58.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "21e16839bc530f174ed6325e643a9ee9fe8bbcf8718b785265039eb61a3bc5f0d03b75425b65cc815b261a4f759639df02095998e715f67ae4ff801659e2f651"; + sha512 = "e652a4c2a8ebf828c31dc254102cf227c8f24b4a05004319486daac9e58078bdcf35baca5c34cfcfdb3a0d0b153a77726ad89eb31c1e128f47f9bb2a6fe35ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/es-MX/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/es-MX/firefox-58.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "642247a3e96c4d6bf5fa865e3377852611057c72e0894b6bfca18fa9ae1d8a8e0ec27b28494b45a3cb093cf229ce9eb7bceebc640afd70380ed1f65ce5202ede"; + sha512 = "2ec2e9bbfb523a0836ea9a23b790852fbfa7153676898fa1cef5ab36607c659f2015d06fab715e13e0f873203afeb3278971e4f27447e3ab1f98f51e61300672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/et/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/et/firefox-58.0b16.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6c11847f25acf36ae76a2c47ac094bf5724dbecfbc7c8d9844caa3e2f86327eb2b01f64448875a3fee3d8c32fc16ecd16f8cd0a7e9aab6bba48012767d113665"; + sha512 = "d9c443854f2b0e4315eaa7a792cfff1b4ed9759a6a7e0fe4d44626d73ad23ffdda25531b369d034785a903e40c2e24b31f024d660284f37a3e5707b39c345376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/eu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/eu/firefox-58.0b16.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "08229454895d7eea9b0a1df103a443e29e488cfc25c0844075b7ffbdf221ac85ea2905fe37e61292b5c8abed4e4ea946ee2edb2030f7ece27eaf5680fccf4ed4"; + sha512 = "3c97e2d743e83c792dde3d2d050ebeb18aaec8369821c653ae141df694ac499f8bb6097c7ebc3293b17d3a9decb81bf41be021166682075e4d22d1b918becc13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fa/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/fa/firefox-58.0b16.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5dc0de2a76d1577a56162c5598b882bef03fdece5f7e0eb0d44501eed2f5bf52455499735c376b2a68e5b599406854cc4d0a27e6c74de3b62e8f50f0c084243b"; + sha512 = "95fb01686050b70c38f53f2e665376b052497fe2ea6f6b745660f87daa321c9fa940572d649304542abd33e5df2db211e58c56c31ddf61736f10d05c081b647e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ff/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ff/firefox-58.0b16.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9324770ddf0a62811acafeb0dbef37fae7a16fd10f8dfb5c75e450d674f8c0f8fc15429d753d24a68cdbded44a859d3e7fffa3933f623859de015575c91ac45a"; + sha512 = "25db20cf960e2e71a1633ddac6b2cfd585cbfc23cb79370717a4f003e2ee96317021d727820bd9a6d2e287eaacb35f720691b7163bcf1cebda346a7fae646eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/fi/firefox-58.0b16.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f9b1870be74aacc8757436b4b806a626a0fcbc6dac77f2eb5e37fb3000ae1c5e174ef27432b3974cca9f2917940e682819e2cf92a98d83de640913c30b2f0190"; + sha512 = "8c2a9c61e68f90605b9909e9149395dd3d991a74937393b66f3c762c704c01968c30e72eec0805e33c9074af219e27dff4a3ed828073ac8bd495002afb2ffefb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/fr/firefox-58.0b16.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b47de97c83c160faf799f0c9b33a9b2ac25e56a6ba58c0d987bd94be47979cbdfa9264cc18912b6c0f12e7919209e8dae05415dfe6a4d4cd510043479516dca2"; + sha512 = "8fcbebef3665208a668cd1f6f439384d953182a6d6eacd2dc3850184cff2bfa09f9c7351cf08d1c84fff5bdd4911b7e846bf4e0d95eaf8de240fb0830e8702a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/fy-NL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/fy-NL/firefox-58.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "387375313e5d7920bf05feeaf76591bbd30e1e5c6c84a455a2d76f1c32c4a28a0e6bf3a1a9143844b199977cacdc444bb44d62fbe18b3a7d94ec3362c51ee48e"; + sha512 = "de0dfb5238015a1856a1b4bc777c68258e96eb92b6f6a854188f5dfad0e063c796ed90781a70eb5ae65322d59ddc9cac1bd9f7fe43f04c3ba6005dac3249c397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ga-IE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ga-IE/firefox-58.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "5e0f9e33547acaedf6a27608fad1e9bc8e5444a04fc9267070dd327235a9e5a9faab6809b86d72243fdd5c6d3c0246b6129b7620e851fcea75d2914eef7db48e"; + sha512 = "3bb6a21436525896454c0cf3b8a9eb2da9e2c37db4d8610b3007db7ccc28e270e081cf9cc461c0c4da6506da5d783b943dea0952c41ab857e0d88911d7bcc043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gd/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/gd/firefox-58.0b16.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ed93968c6a6e4d231ff6d0ec9205248e4e8a755a5fdaefcf77a972bd4d37938293363395469bf7ac70fa3a7e8b7dfba65a5add59438e68e6d0f7cca48096dae9"; + sha512 = "dc3bba4f48c0dffc82454b898aa64baa72a96d89a73d977fa28c8e1cb245d9f9c761ccb291c2aab57d4a786f9aaa37089241a5faf3851a62f38eda97ea95c7b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/gl/firefox-58.0b16.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0273d8338fc36d759c2b87109891565dcdb409df7b42c4e31e1509cb1b517fd6930ea4b4ef8ee1281d5374c8b77aea6c50ea6db5866542d2bd11346ea165c797"; + sha512 = "b54ec7e851a3bfa55b67794c7176da64509e29cd45fda97c7cc53d01e3a4b20fdb04fffcb534e873e801a510916a304fd6e0899174682dd9204fdd7e0297ead8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/gn/firefox-58.0b16.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "78af73aa9ef4ddb183cccb9da3d080bff18db20f38fbc8e58e410765b350e1bcf51810994e3af26288e020ef8a1fb1b324a67b71a744a83a762d7dec3d5f3c88"; + sha512 = "6bc78af663a1c1f1d8fbb93b51b12fc21588eac4e0c7a482b786055db2a7a6cea2f9a1b19be93fe45d7989ebcaf0ce53916e9e27b6355a4d1c3cc085b4acfd18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/gu-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/gu-IN/firefox-58.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8c89b46da45861490a9c54a6cc65cb9e306be3d3d479a583f54f79d659824856c4dddc88c8631043457b3414a15eb80535d2c44ea2b5518eacc521db782e243d"; + sha512 = "764cde1ff02c7e85be1014b573148615e5261c684669167dfceb4ee1ca7641653b7cd8fad858978eed540c41e3de80e5ecff7c879a829ed3b67d7140c3d26fab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/he/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/he/firefox-58.0b16.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "6a857b7f4c4efecebf360fc065ee8d6a7754daa918efccfe54c09a8d04a8501ca25fa0909cfe10db2003d530cb7ffad68d996757d11d5706acb91bfb7793826d"; + sha512 = "2076784aba5d84ad98f88bd14cf2c26abfede11cff59a00c74632064be731f53378f5d45667d99a4f2818551646bd264aaaaf37c20696ee427f745a5d615b834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hi-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/hi-IN/firefox-58.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9c55430b0c1e7ec85da9cf8dc6e682284e8b1d1a815a40bf381cd2e07fde6690097d75bcf17461d9cf932280ec09671fce2156953e426f7de3a3d80cadf6f2cc"; + sha512 = "6296751205809075fe3ca6c9860360e9d381300bf7ec82bccf54a1fa4898c9da6695a442e1408e7de6d59ac96bf46681455a0e44f814793174af284449edf5ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/hr/firefox-58.0b16.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "360dd1fbe26fee13295fc24b8b30dc32f5d06b8a43529aca19b2df03073e8a9fd56afbb687179b5d96c558a8a6b75b770dba0c26d1e19adc31d7780d7113ad18"; + sha512 = "de3cd2212c21f9717767bd506149ff9dcee3e64e25fd23e92439a29aca6724503b3697184d39ddc3c2748f507df69f12d0d0b1447ec91ac2d13282eccf3c5432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/hsb/firefox-58.0b16.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "0db06e66a0d73b669dfedf3202d142ee5eedc75bf30b0852a1a14b410cc0a4090d8a05db956607fd65d09136806f864b0b1e7f444aad589e63b8679deff6fad9"; + sha512 = "1442493233f475538180ec213adba3a7963c0032f2ebc441d92ba53b19c4b61a9df41f826440b427ecc825536efda4399fdbbe2308cb6829c00c200ce2e18e69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/hu/firefox-58.0b16.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3c5433ce133318afb9634f23bb42912cf49a063fbcc7c4a16747314cf3b3569c30ca38148755c8e3a0f11fdd923c4e6fd5a67f5a32b8ba9ca78b168f1d666c5d"; + sha512 = "96783e598b8d639b980382a21758574893cd50aaea98775b7161fab2732c18f4a281db545655dba428ff3e5ce415d398994981ad3011116a468c5ee9dfe276ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/hy-AM/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/hy-AM/firefox-58.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "76254c7c907f9b9c767af642fc70a0393b077a07fcd458031938c8961a0e00329be6082052f367e4ee5f652a527711cf7e6e0f9ac10c6c076d29f5a44468415d"; + sha512 = "cede19be60d2ec4b75cb05039b9eb6aaee91fc9248d08051d4986f5b4789f3103a8155dffe91e91f454d86f007b76e40864289465f5d90fbc2cde09812dbaf2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/id/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/id/firefox-58.0b16.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "269fc012fdcd2509da13b30fe5f7e2f6774ce7aa6bc43ab8001d584e68d389f5a058f74419d095fb90db426de03eaaeb75ce87b92b09e30dd6f2d7ad6ac895f6"; + sha512 = "0068a3fa706a70953c7b0253e4c7d99d5216c701114de4c02407a97aa7071e81a1fed9523ed2919447b1e1ea03e0a0dc9cee493bb6b6a2e1d7c23764633b26b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/is/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/is/firefox-58.0b16.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "bcbf0ec6331ba7f4de5c80612e90fbfa9c13b31e450e95081501a4178d1067baed01f2fbf746e14b8705846aab78ff851c101525e065501c769c7bfb1ae3426a"; + sha512 = "e093ee9157611581a16d69f9da785a2d991defe6c23e35e8d6e3f784bcfa323f1d9236f405e7f60c89e3f172c698491d30378ea69f93793d5dd045ba684ccf41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/it/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/it/firefox-58.0b16.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2fd518dce248a6127fd10204d9477fa698a7c3277674e034b89f7490123a3f2bd12ba5823e8a87065b238b0d480e2c772e915a802a893cf398b72ec84d01f87b"; + sha512 = "ba1963872495ecaa6815c6764f2627184e7d61c2be2af035fcaf6d1ade8b7d4a8191d0cfb06fd6a36aadb86d91f69b8a2fcf82b664520293b215111834e931a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ja/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ja/firefox-58.0b16.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8bcb7686bd8d64f338d3ac7ae11dc70a062842c079b8cbbdd65ee53dd5a216f343a1aa8b83124ded57839248ccec384006bc513d1478601cb5ebd048add336b8"; + sha512 = "7b55e8f0a5b02a4632d91164ee04a3e11d545e39a563166fbe1525a45edde1c809a98545ecc5234805eb931b3054080ed96c06bed75034067ca25fcc3c3cc6fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ka/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ka/firefox-58.0b16.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "63a1ab4ee92b26a9a730b6772be54ce6edd64c5d42ec420bbcb4867d1247021781c983b382ab6346d99019f8c430fd12208a199c0b90507043195b3522891c81"; + sha512 = "fd55209a8184b20a8ec4821e80a4a6e7102249f02cc820c7d49453b10942b5e6a2f8e1d84327d98a289d7ed9052376997d877f923ae17ed9e3990343ca148d65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kab/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/kab/firefox-58.0b16.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "93016e490d87de09dc18434fa1488069649cce5218dfe4f75bd3ee09807a8ecef9e1f0875fda2e8fa28e887a42fbf289ba1d73503a7f0e879e58c07212743899"; + sha512 = "808e08ef8b8612e2568a7809d4e20eb11329e6509e41e3ebe875f1842560bfb870a087b3933e925abc7164aa32f6632f2ebfb430f98245b726d2da372872dd52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/kk/firefox-58.0b16.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2ec047b1300ba3af57516c861e294c47641d394d507e20769037536280538837dff96bbaa65873789134a59e3af4d97b42b8ff125630b4d82fe887af591b0793"; + sha512 = "8806b5ba8b0a787abb0f56f019e73422767807a0de24931d7fc64000d104af4bb06ac7b313f4ac31bc716063bb25459cbdad875d9aca3e9b0edea1681d255820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/km/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/km/firefox-58.0b16.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "34b96630d2f67cf8d8893bddafac6a72e400e8df2324337384a45a76eae97245a0c4f122c47be7814395f03dce163fcd6f355f0431fb2b8aa7092e1c064008b8"; + sha512 = "5494863ba500037490fba12b435905819dfc526694300393c59b4dde85199094792649ecfbe09b1114d0b64b0434dc974ed3b6ef28fd84df10e9c7683522eb5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/kn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/kn/firefox-58.0b16.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8074b6d8c9a5673c3247d6d294e1f85afef4ba31d8cbe7ec3b456387c2692319a515d4cbba7336efc58e064cba2b2847ed4378b62e389a80c76f2e0efd9d8347"; + sha512 = "7577b45dac2dd8182eafaeb6e3fa5562ecc0e6ec4b492a3c6562eaf4c880969eb2ea1c43ead93362fed21ad97cb91f545b9c0cd3b32e3c95aafdf6ca1eec5b24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ko/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ko/firefox-58.0b16.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "cf55fb2eb1f1699890f5eeab0570303c2a87d433ad07747a4987b496fe18edf82995eb1856ab16295f4683c90889378cf7ad1a32394ca45dc0245958ed57d2c0"; + sha512 = "80157f9b78abf2b80512fd4e3d68374f384d1bb68444dc3aed35bdb938232e8a5629e30343e958b84fac123d4c66fd787b9a5c5c86941377f81ae36b5432c1d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lij/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/lij/firefox-58.0b16.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e0db3342bad86b5244c474be5299b47965a75ac981ce78bfecde8880141b4f02ba61a8bd7d43489d847d2f3dc4f74ad68861af97cea70e414422c66449a9f12e"; + sha512 = "c800c615437ba7ae40a43cc07368f68265a40b99f0f47d7b7683d532ab734c494827cdc4ab0e76efeb2481196eb15b3b8359a1e05bdadb68b1e172baafb04bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lt/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/lt/firefox-58.0b16.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "facd732a0b87714e8ef310aa55038ba2c3e1aa497b107d210915bb7ca648171508b5a245baa7551dfbaa7e22e4481d7413cf17591067e373667e8b35f4cd7265"; + sha512 = "f6427da7e63b042dfaa704d22bf03843804964887170a97edabf402a0995c25d10c21b000098abffb8358bc0f5a762c31e3503604d907e40dbda46b070431217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/lv/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/lv/firefox-58.0b16.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a9b0f10f534f673cd0aa8823c139f713f724762be2f7575e0ed89323c814b894ad0c550dbf2cdf311ae1d3cd87d8e5905ebb953ede9031974cf8c306ee1184da"; + sha512 = "3d432402189ac2ce2c4374cc2a6704264ddc125a8c694e1a2ea625115b13c72dec229d26f1f12d18579801bed9538660eb1a8f32e31c47ea75764767a3f3e49c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mai/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/mai/firefox-58.0b16.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "28a9553559b6297a8b6a5bd04eeb02a125bcbae55e8a230e3a540d4abf93f9ca1d699eabbcf193838810a69348bd4250f948f6b55393ab4e69d21ecf976d52f1"; + sha512 = "a6fa84106f62b953f92f5d35a37445218c5a64f9dc1b01eb742736385f73bdf568392689424b1099d0b5fbb9aa64de7b662b4e6e154698369792644cde482a88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/mk/firefox-58.0b16.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "44b1b419700c2ee0c81f2962866dc2f6f4ae694d600f2ca2373110508c24bc65ebd2128cb305a2a8c854f791e69c5db38ff862f9c12e15753fe4880139f911d4"; + sha512 = "c0e2c5a1d62b28de72baf8ffd2242217c3d53066a96ad9e2488021b8828bf279b546c4641b0bb62b035963d3ea2a8494337b3e4e139e2a077577a706b352a71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ml/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ml/firefox-58.0b16.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "fa63d35f37b95884b08022405376f2e1c2d0fb50b4297c6238ee5f0fe77925caef6c8353943515079ab9fa4e5c9de095a1d4aa4cf6dc35f4038cc1de04739c3a"; + sha512 = "86dcf95f11268e3961f9a6c23261045e9f567856545c983e4b869a8dd9b0b7f9b3ff5a4069920311bc3744833ff4617d9a84e57b6cedd292413eef9695669c60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/mr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/mr/firefox-58.0b16.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "81a2bad8f1ee56746fc4ecf2bdc526dfbd151536f9bece02fe40a4e6b88b4c2cad7f9b56b2e346339b1574a7f5efbd6d57f968dba1d6b3b2b771537884f95170"; + sha512 = "6b4cd5c5e6147a1763c391c18baf5cfa9dd92d53575fd14f93b2220842584be3ca76845d0ff7ae5be8dc47729d0ea8adc3f234b903137e739d5942e92dbefb17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ms/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ms/firefox-58.0b16.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a4515567ed399774c2c1cd8bf746533431c098bfda720afbf49c33119b156802cb3125536832a0867481522a4b5d0dc109323e9540838fcb41be7f3411f57d7c"; + sha512 = "2359d73ba41106d052333f9b74d2c45f8fc59add080e38047218d6eb63c986d8c7ffa017b14e79e9364530627dbcdcba9235e08a42ef01e69957609febea699c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/my/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/my/firefox-58.0b16.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a7eafb22eac502c7eca0b2d8ac1374f4ba7d644d06853f403560114d5d5d72f9682777315f76cf573453603383f37626a68ba5cf726a8f836220db13d57c2172"; + sha512 = "973ed584aabbab85b4845b7612165c89e1efa7828e2af8fc7fe8021472a98f3a95a36dabc966cfae121dfa57cb5cc2630cf393fec6c5b92159511f53973ec500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nb-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/nb-NO/firefox-58.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "aa77822565e69f1852fe097d19a5fc3370e2876643f076020e07fd66b034418f1e012e167a8ecf87267268424788b1dc81264c748832a9529a4a879ffb90f23a"; + sha512 = "25255d7e7f211f829c9c0ed8bc22be9459101b432bd5a40c645b96853090f417aeee4330e326cb2293c08cecf47512afb127061853e3acf72d6adc19744932d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ne-NP/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ne-NP/firefox-58.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "1972a57e7c81d1f1de662178c07365b6b6c35fe6678a2841f1eff24a83a6f8d4ef1517b47434225f892231d754561890444117ed2c2be420b812b5ad166d8597"; + sha512 = "989cbca6df14d431152e4e55aa7cb45899f0e294ab67ac97effe5643e8ef9b6d95770cb46d7cd8a88b21f4e8dfae9a8ee0fdd8c391b75e9e5d87a39d905a6c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/nl/firefox-58.0b16.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "4f25f0319b35384062dda85314c40f1328d553e752478ee9a053900dfa6140e0d8d4e5aae2989cf76b9dcf5d3ecc6304cab3250752c778c6c5f64d901ffb5f2f"; + sha512 = "8a4afc8d63245a19498efdc90f8ac216571bb9a1e61e88fbc7670b12885842b2c102433563f2d09cde0ccb8ab0226026c8cbdb55a68389d4eabbac00cdfa521a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/nn-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/nn-NO/firefox-58.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3f3c214ff210b1d8c27c4cac0de5b674d24a730ea9a10a269f974cb63b8e29880f9711b8d316f9eee35a64ea6e9b500587e4acd895c9a33e87ca539b65688b84"; + sha512 = "a3a52f60b8d8f7ac3013d34c87e3d766599a304b2a9162e0514aebd63765ee546af58a6520d6789ac303980e6a192b23a08c2e2a679e6286900a7ba005a510e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/or/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/or/firefox-58.0b16.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "9736e52bd129be199ba6867dd0a8b3a9d0313384fe9a7b77b21c96dbcb3080c3e98e8f74c3981262a045575d194d4d6968690da6b2056984e32b3a333142fc19"; + sha512 = "1741f784ec2256a34e3e72059b0de799303f47353eea9dbe314f3fe4494d2d16e8ade1a1773205f1e482ce157d4a4843ed3cec4f9ccccfbe4bb2551762800c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pa-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/pa-IN/firefox-58.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "4806337d20414df52afaf27d452f141016fb32693a278f25488e7e92c781b4c1048c51d80c62a372f351fe83270d5cc9f9429d603a5165ff59d040beac9d53fc"; + sha512 = "271aa05a7cbc46a6370fbd8c100cbdb88a16b53703f1491f5108faf22db8816fb7695adc1b8b8528e4068c0b0e212eeb966108ddd82f20c0537e311abfcc3f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/pl/firefox-58.0b16.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e4b7e3cc62f53c2ab97d60d45f9b5a45ca141b64493fb72068dd0f1253c0c5663d7218a01e37b28e69112d0ea998b2388f8cdc74c8051c25e478cdb2c2247907"; + sha512 = "9b86babc6e956d7447894eddbf95ce47917e04109cc3635739aad0950254416b09783b329504fe27b9dfa3456bf8ecb106eaeadf99dc93fc8ad609ca8caa538d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pt-BR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/pt-BR/firefox-58.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d4a66667175f7616c8e3f9c422eafc4022b8070f4c11c40c589f7e19b20b9cbd1770f8068a2eca79066085368b29027c860b8b06f086795bdf0a0cd164cf79f9"; + sha512 = "f35bdaa5502152660d804c83ac494ca1bd8c04b5b47ca18f83d82b8b747ca8d287fcc4fd265c3844510a0d89ee8b9f9883356c20d0fc5967d6dda71ea403b1d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/pt-PT/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/pt-PT/firefox-58.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ba2118d9060a7c8f85e4a59c37a850de0c82cf6e5ac7bb057efb86791596c8423a3a27912d9f2839934009cb962ebeb8c3c5b1aa63daf115c48dd2431c0cc8bc"; + sha512 = "5e72ef46d949e99c0ee9e40562c380000a98de07954845a55be88bfc64e0ef5a553026ee640eb2728b86d11be993a20066fb77ac2e6ef072e26c908af725416b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/rm/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/rm/firefox-58.0b16.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "9952f5c19f6c96d87a9a73ac72717b1906a2389cd92e3f2644d5f93f3c81b408d61ede7a68928ee7e6d740ac9166a02018d7eae490dd8e22bdb1e9321bc6343a"; + sha512 = "5d11db1e7807324f5655706df4615a56d1357c1fbf52fea243ab9cc496e730c359dc555a5d6c0e131debc7de864dbfd19143620317768b9421e1b3302be3b0b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ro/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ro/firefox-58.0b16.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "62ecc8abdb3f2e9ef7f10a0763b2fc8dc59d5b3c55bd45633d07c03a3ffd969b57e649c3509b1e2a1fb8dfca0b4060f6dabf85d124d485f879e5debff9e6624c"; + sha512 = "a673a7e42b88d8cf19964ffd98883e651e637eff16979e3ff84b24ee71092efa17d9d52efbb841d885cedd277c6b59e9f7975063bff2f05c1ae9a9045704f85e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ru/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ru/firefox-58.0b16.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "50b693b131504e10541261ebc97d1e22aba10a357d3653eb6803d9c5b57bbd89d948847876e36ffed17c435241dd56b1308ca52a08737fb97c1800f278f5230b"; + sha512 = "711d5527fc989280d1b2400d4e30a1bd4375904327327a7729206a73adbf0d18bf09d59ba91910041e93caf0b67aaba37e9bdd1f6117fab5a9e931551aafc03c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/si/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/si/firefox-58.0b16.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "65d702e4ba5f0763042dd37abfd70c330c5d96eb6fc73e5a747809ba0fabe692691293784f17e60628217cf70747d98eea4fb790c5bc062c017949f4861585a0"; + sha512 = "c04c6d41ef4c90d1209be26e8d6b23fc33841fc84169c50beb0feab447fcb768d1908bbc6ca4e1b622949f3f529928c5ddbef5fec776f8f2c009594650f3d2ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/sk/firefox-58.0b16.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b0dfa69307262f464d95d4713f165bf89d6f8afb482642f0b2b7838d3201a0fc141ef8fe6efaae25d398e7ad36e60c0a36fcb3fe364f1bbe4ad641a88fca1d9f"; + sha512 = "ead3badd7ccfc915d33e1158df4f21090b853b46b74d85e4654224ff12404bc405f9295fe89fca7493a2cfaa4594e28f3fe7b82a6aa99fa5380f8855064a5602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/sl/firefox-58.0b16.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b02f4d80c4c54da5c2f22609687acd3e6b9b2c0691071ea374f873c9619d68274bd6556265d4c2ba3ff4df5d54be61629faa512e6fc5d1f7f1892cc0fbe29867"; + sha512 = "f3e56822a6ef2dec52921af7e0c1425a558f10d21ae91474dd2d57498ef417e6a189577700a4d819b71c50422afb5c428544db3b36cfb9bd586f51e281cb44d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/son/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/son/firefox-58.0b16.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "4d18ea890da9dd8b55254eb397aed5a369450fd2a287adfe6519d2199b89b6d4250491fd816fb8593e1e707636c91bf1e44319eb93c0b0839dad647b8aaea327"; + sha512 = "2217433b2fede25270831968ad2a60b2c88ba1f4cf6f92da3de275783f5c99667f725ce359b72d61a51fe2771ced073bf83501ab75624bf2efacded1bded8221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sq/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/sq/firefox-58.0b16.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "05ddd15040570d4ff5ee3734d967c3857084cf8dbee6dc450dc7b17adcbb1aab3487802944269c12e6b3c1467a68be7fe50efbdb3eadcaf16566eccec10c9336"; + sha512 = "a17a6c05925dbb2911711a09baa2d27048cfaa265be40cb0e258d094ae3e450e49dbbed283e083ce805dde6ef80eb4fdf02033b7871b4caa7dd090a10b5ae9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/sr/firefox-58.0b16.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4f431f3600ae21015a86251cce00ec8732cc1ba4c7d7ca474f45d8dc5b4c2d9723ee43b160258fc488e472681dcc52784c2b78a82b622df47c1e30f4d1385d06"; + sha512 = "3d7da1e4f6121e3acce5ae2c434d842017430a4c317b6914e9df87d85ad7cf95205ac4bb74224e0045fafa17e26ccfc7f611f13261a3f201389aecacc7a44c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/sv-SE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/sv-SE/firefox-58.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "e7536a9d8ff4296d5de9202a3978bcc8c93c6c1d3c38c8517ef1c54522b9dc7bf7ca5e472b17173fa2243f1a279481ee8dbd2bd4433e5aaf7fe3d2b537386175"; + sha512 = "bc562f32d3ce5be25ce518f9cbe999f9a8ac6cd8224ff8a24239285002bbf13c5ce86a81402065b6738b84522482b566e4514d43274770149bb673dcce7b6cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ta/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ta/firefox-58.0b16.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a25cf590f7d69c292db0dc2833448fa4aa60625a2aabe6c0da4feba4ec3f6e47c5efb10283cbe94e9e0961d77d8703c2c66c2f06974dcc6bfdab4b756d70d92a"; + sha512 = "c0a3bf5eb5087767fd509b043392f1647503ab826cd647e3ee7d8bbe4683396aa77b628553c66fc8f8e8f5e4998cfa47a0bd1aa8e28eebd189958b632202f5ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/te/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/te/firefox-58.0b16.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "9f112b1236f4b83d5d127d7ed64c238d2a71ab9285157663c8465846e4002bc301cb2e907cdaeb1f724a12bceb8e9d452835c33db75171cee0cc145f10e8cf4e"; + sha512 = "97f2f377c78aad1fef959b07af08c15f8925ab0d8b26442e53abba62593d17bcd9663252de8ce53fa000c31ede1c447c8fe3ab7d18c0e6855a537541fe5ca148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/th/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/th/firefox-58.0b16.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "52e25c19f93bbfa2a0690ebf855c428ced8b4511342e1befaeb234b3da788f7d9931e68ed8677fc824d3310aacdfb1f22e0af92d6638f6273e4acc0872df32f9"; + sha512 = "e65beac4e716b71554727cdf44cad47f064d1e83c8d8b6101cb92c544121cf82d8775788fe7699d1fbff2ca6567f03bb51ed80d4c71f3b275184503a332ea2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/tr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/tr/firefox-58.0b16.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "aea1383de1813fe8b2ad42e9613479954207f828fb3f7a10d7fe524c4b3fbf27ed6c1e2c710cbdf6526e1c869b44bb42e3319d15eb7ceb38a937eb9bc828ed3e"; + sha512 = "8719e88f125b47b5ef0240faa674edd79dee2c2a2b086a5e48291af75979150380ef14e1be589d564e56e3b49f74b7107fa2b6827c6e94e144ea991ad30283c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/uk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/uk/firefox-58.0b16.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "21de13497599337af0c3bd0c507922400eb55282bcb9a6e517863c708a7147f5222f85dc9b47a6483fd4919c0b4aa0099b9f3da6fe048dd70e16d595893a177f"; + sha512 = "1a19ec531f967227c21e8ee55c6527011aff695ee17079344cb4ba5a3dcf8797b542dae9f0e001dba667bc8589db7712139a743bf96c1748b69ad2be4e8da2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/ur/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/ur/firefox-58.0b16.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "fc0dee731ad7e17c8eca3c4bd1e38dc5d6226fbac74a3c5892434a74d3ce42648231963dd02ddd2f8661e9d6f46087ef351d91897f7c6eed9bfdfc51a7f09dcb"; + sha512 = "43bb38cfc56288667142ab0e85b3577272870ef4671513cb60fd0e4378e72d41734afb7d1c03d615205cdf2991f5a31a9f40afad5673d6605049b2f07ece268f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/uz/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/uz/firefox-58.0b16.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "52553dfaadc88f0e19275a093109e05064f166a66f390f11840c8cbb7b8c5bd933f4caecd895a21353d8186f6f9a45b26fda831455809da48fd3e8da650e0de2"; + sha512 = "070f5501a215dab805a8b6a8bc647e52d2b566c784faff72c9dc09049214d03f8fed0fca3b8789c84a54290361bfa7f4c73ad3fb4429ed35f079194a07f21f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/vi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/vi/firefox-58.0b16.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f944fe926faa407aeb0322f937b0e665aca61e5776f2c01c786be0b0c285095f8c17d1d4fcdb432ae3e984483afcd197a79450327dd8755906a778e3d8787094"; + sha512 = "f680076107a66fd983e4608b1793fd2dfff7e9cd2a92708bd85f5a05ca8b7fcc74987499dfa61ced4630fe0a2f2f8190abcaceb6682157546cc82a6f02082bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/xh/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/xh/firefox-58.0b16.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "42a4eacdf7c9429de2048a538e32af26b1ab41ad7452f52749ebb76d66cd7cbaf6504d2abd638b1ffa3e63744e6926cb00d7f0f44d63e75710ac67e2280e106d"; + sha512 = "2b649389c75d4868f3daca017963a6c23788a7664b5015d40a88e7e653cc02f870c0611f846eac8b524d8055d191dd51aecee4490d053d5d8c4c02895bc84d77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/zh-CN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/zh-CN/firefox-58.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8c0a1aaec3f1636fba572c61a7d94d334dd061e09c72a802953ef32c01c8ca16a9d61b04f46798e39f0d4aebf92c57860cb0572d41376513fd16c6b9429788cb"; + sha512 = "b81442a1449e8f054d4ef6c554bf563e1dec1773053f1bf5501e30d86fd15548f40a84065dc0b50685e30ef0c27141aa12b17d148978d0c41d7dc1bdca406b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-x86_64/zh-TW/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-x86_64/zh-TW/firefox-58.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "1647cddfe766af88e11fba9811c91c821390e849698aaae122c4ed9ae3d285d0e4af784333d7a0ff061c333cadb63ab3a250fbfa6ed4da07959e2261f4d518d2"; + sha512 = "60104dd6541d38a704cc4419b98f3e1857df389b734b8c80ffea677498ea9c729b91b2b4295aaa426097d621597a0ea831d27d2cbedaa53f1d3ae5ded45a3c2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ach/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ach/firefox-58.0b16.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "217583245d5ea137c8ffb8768cc964903da67cdaa9d1e923a73a954bb1ab8d748fb78cadbfc209e83eacd06e0de7bee8f6fb11d7c8fdc7a361c98a978d7f03c3"; + sha512 = "d38deb93d88dd0ce3e3d9f365d3980f2448f3dc8a0187b5d965364e17bf0b89fac5d5aaf1b86fb8fde77bf55450d4283a82cac687c8105a8ade6ce32fa8a0439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/af/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/af/firefox-58.0b16.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "e30d3903433b84bd7bc47ee61a2a06353193a6c8a6bfe9b23cf11231bec7fa7643d55126ad045d8f17606cd336cbcf59651ebccf1c9da115d85d6516a169b85c"; + sha512 = "47fb62091e6467a5152e8ceea68b3f5cffda33b34fbb61e570c4ff02cfab75b80291ecbc6c34c734b5c82b0e51e9c857464320d9aca223e43e6420ddffc602f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/an/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/an/firefox-58.0b16.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "232bcd3756981493f26ae1cdab7f2ee2a315963f135e73a8d810acec495d934e5b5ce8d7692a6aff3e6893fd02f67364d4ffbb580f05e113642ae82f1406013f"; + sha512 = "da70c287e686af692d64d72a3892138013bdc6357a9545bebbb8853298e98466c57da1b0c86f87b4e98aaa108a3a7d6fa5bbe205f84d3f5a67cce088ae48f30d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ar/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ar/firefox-58.0b16.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "088a81bf11b6bd12e22a6121762d7084a0da829456736ebc4a45953740219329e347492851b5103a7599ec265becf9ab217b67f652b84381f0aea03224b67bf9"; + sha512 = "afe05c793adb6e7e89f82fe4895f88f0afee75a80cba4115cb1e3eaca9329604249b506e321920630310250415a3d151fc415ff1c5025d1b3ebc2d7b121d0dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/as/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/as/firefox-58.0b16.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b009fcf6e470b0b9bb3c95841834491d303a9f8cb1059a91256c969db7da0f5a7e8b38196d3735481e77442904135be636b43576cf73bc2dc218867db3213f96"; + sha512 = "35551b4c3389e744c443a5ee03f7610b9a851524faef114307d1abe3dfd4e5411b926883bded4574570ab1d1e0e004b4a5be22ad01ad569f33fe9ec4409bf6f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ast/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ast/firefox-58.0b16.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1a461da268478b31a16a8995c7b1974367750c214b6cdade6810a6fceaca5ca20ef5f886d1fc634605e00022121fd0eb6350cf19f12a6016b2f1e45c00236d73"; + sha512 = "e5cffcbd2f096bfb75f2b049961b4362b63eb49609f4e083852dcd167a6994a8929d27846d6f2c82404b51ee739839ee2ec5a63e81a3b4c8d892308e5c7a8431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/az/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/az/firefox-58.0b16.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "58fade178475698e43757c9cf47e4d72ed86e35bc67e017369786a79dd5656b8731749fb1afe17b90613ac4ce53c60a32458e3fcdc86cf638c2f30dd9d108f83"; + sha512 = "f7687c2907184022e09df69e4a36b173e57a1c39b138aed65bc966ef9e9215c2cd61020fccc00d02eadb80c0f9a023de085fda86b118c7960bb86ae5b30f33e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/be/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/be/firefox-58.0b16.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ecb6cf9917f3c6790ce0137a7fc9e4ae9f2f6c1a24a9a4d91d6ea6c3c6c541f8d40f95e38132213a31cc83c87f5798dcbc95c72e9deebed6deb73dadedc50ec1"; + sha512 = "7ce08f845fa60f4aa6f619d75a32ba96e2401f04feb94891fe1d217abe8bec132961e9c0bbd800a8615453b1d6d60404467334ed9b7bfa0caef023184ec953ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bg/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/bg/firefox-58.0b16.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d2258b93e05ffcdf7a9012458537addb378819abaeabd2026d12cfa4b34dd3faed388d5eb8dfaf32761b2406c6f72279b0970c2e35bfd74a373e9f7db53a0578"; + sha512 = "332b57407288b61a121e8e1d7829b8998075104cb5a18784ecbc113ed079bc12f7bd24d8dcc27a060dd8469961c6c31bfe4fec02ea6a96aef1b442744bd27b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bn-BD/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/bn-BD/firefox-58.0b16.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8f3ec4491225c56659143ba787703c54ca869128d4cac331573506d4707b28fa200d0a6d560c90184d881a61d98f40d8919a6d30d6ce4b5ee42dcd77b7124864"; + sha512 = "a441ec94477abf6e75af59d7554a94cefc682450ead85b72e9c1b1035c81fbc6b3def8d03e7cde935077598fa66ebe09cf73530256e87a5fb2ad6d9162dda772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bn-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/bn-IN/firefox-58.0b16.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "c6bb046180d5e3ed0e4198cb293eaa049c27bce27a3f6780a97b8c90fe95ea7ec69cb23427dd53ab6d736ee0862a3054f0b66333544e80fa9e027731c95f54e1"; + sha512 = "e43e8b8dad4493c6870de714f750a7412846c6fe2883faa1f57106480cec8f6a3c4770a1206ae0582ca61d7638d8b5b1187585c6c2c8204b2e3e0f80e22867fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/br/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/br/firefox-58.0b16.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "a7f3d646b7a3e77cfe1817ec4751e324fcf94397e5327610c9153df45808033fa2a55062a0cebe52fe9b9e4f86db55317e974247d6fe7820774334cd9652bc60"; + sha512 = "7c19cdbad58ff138fad2949f12045abbb3f96f3fa1309c333b268787c4837466c01bce2e57117dd43880fa8d3bcb579695450ad368801e139539ae9deae4ec17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/bs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/bs/firefox-58.0b16.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e5a92e807c272e16f10018e2ab46896e8b152942418396983527caab01a00d0aa4b666ce0841a08504ab8094abcee28125bb90f35c6b323cd5f90af57f25bf7a"; + sha512 = "d3fa2d09e7438e72160fcaf4fa1e4b6f61f3edf8e6c213e068f1bdf606f439f8173628563f389c6323ef9e2ec80573340deb3b4e3fcf8dffd95e1a9f7e8979f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ca/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ca/firefox-58.0b16.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3bb8573e229d6aab4fa03da2cfcf9ed52603706cfd5255885e60af53ad56e2981b50163de284647f64afc1ee499517dcf97f67532487d028ee6d654fa5d52088"; + sha512 = "b1e90c6883d799631fefdc08bdb104c620a666f357dbc7b2106d625f47121130484ddd875f3bf7a973286763472297124861d06a2ee470aeb1951248145664c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cak/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/cak/firefox-58.0b16.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "cc67e759368964bcea2ca87a2330c1ba5f54b24756c5a9ea371428679cf856b475e404bb509c673b4b7f603023850319ae62bee46fe32bdc27d862c4a94e189f"; + sha512 = "bfd01fa4325f3344844772b28fd21bc3ce35d4fb41f26e9261355e8d6acff92816bb7b2876f9024a10b6d326576d5587fb153dbeefbfa765da6dafd5916bf91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/cs/firefox-58.0b16.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "329c4d5ef00c3176d49cd5db0ba810c68cb4ebfec1748232f76ec016cf3a96d4aa964024a5469f40693b7347f64feaccb94e1a5d971bec96cd5cdd202328505d"; + sha512 = "2cb501c5786b4baa5d9f3cc8214fa4a3558a8ac5506dd6dafcc2bf8f5328ae4e7705a4f689bec7fca5a21aaaa4447738024038fb765477d8067fa8ebe508fb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/cy/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/cy/firefox-58.0b16.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "67ccbe48b9764391a592d7cfe8862b3bbe8c51b34af79506470d05a8c92098dc067dbcd5fff0f2f0bdcb1b8019f178ddaaef4b164465e4c5b22d40d078aafe6d"; + sha512 = "7f173d7520a1475e81da3a32369ba296c74b83ea40bb29181d780a38cf9953e02a021de4eac3e1b1bfd4346672ac04a6c5aa7ee8c211009908f5952265cee0e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/da/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/da/firefox-58.0b16.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0bb1b55c94a7c227631c2fa55fc0ec94aaf0b5efc173d8c23b32a592760732839b4f7d19d64a8ad92e7bd327cff129936aa5142a48fd3a7e19e5b87a006fd75c"; + sha512 = "4b61fe707dd027fa64949bf01d013af63fba522715586b3000171cf57ea533538822b99fdea3e8a84ce63af1fc74de3af10fba936aa8ea81110e23c2affcbf25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/de/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/de/firefox-58.0b16.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7371cb1a4990eb13efb649a25594da67fb46c29b8cf2e0e69c3621bce7c18ae84978a8d39e2d3fe8d2cff1d48e2ad00d38354ddca32f0e2dcd5b4a2f88c59059"; + sha512 = "e50d091075039dc1625e07aa178b46cc2692cd13e5179c2d8dfe8a7ba11906914b399f9de894388026ecb1c9c4da4698775d2d1eb966429d5c8f37094b557046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/dsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/dsb/firefox-58.0b16.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "7eb9a2d00d5417287af53ed3ad3ee472fac42b4c338e78e7c8deb2cb11abd2b8373deb569d1ce2fe84ba328ec0b6273eec5be20654ddd65a1eb14fa9da4a5f23"; + sha512 = "c67be48ea674109bcc8eedefcd68b8bdcf1d67adfaf53bbc1e23737269d1211c1a0cc3ddd1eeec979bdd991717a650ee605be9b432557ee7bc7736932471688c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/el/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/el/firefox-58.0b16.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "2ab0e13eef9cf4de5057a04b275c948006a1c328bc4bf65f224c3d9176350a0bf963e152619aca784d9867d359d8c622e3865bc6419fcba7ce48bc294488dd4e"; + sha512 = "6f050f606d70bdd5479f48d7ff8da1373496bc6b55a71523fe0c3de01c01123800389e01b16ee542b0e02ea8e09f448526647bcfd9fd7749f46fe320f69c55dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-GB/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/en-GB/firefox-58.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "191b5f4db9ef476701045cf660607f4be4acf1823e5b765a355324565b928572e4ea7aacc822405e7b9edc1e4ab33a56e7b4f2cbc231b20a559eb89fea171f7d"; + sha512 = "71fd5a93a75fa088f1fab534cc37ae39633133e628c1e63dc12712db7bc81150b449a3a31e1c505b2a19a100c33b3ff2721fd6c8f6a3294f8f4ba5c8b91e6438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-US/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/en-US/firefox-58.0b16.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0599ff0b37fb79b378b01368834d22e76139d67e54cf3655d829aec75c1ac095744f6f171e7559c3b409ad2faa1c8b47b81ef6a9ff90bf9b1dc4122abc382d7c"; + sha512 = "8d8cac6705fa12cc170cd6083c1cc593089647a02124cb25bd4ae6b26e33f3c27dbfb0356a7f01614a4d2e472c357ef27165c142611304e060a4abc54c837610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/en-ZA/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/en-ZA/firefox-58.0b16.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "e6d927b28adf2ec1978a50f4d6e9986b28006df165ab4f4901c8d5916541f0b51ada03e82403687e73e5e6dcc0b9f517cd33879d91f363dcc0f1cd799ec9cb6c"; + sha512 = "f50bb2f931b3d545e731ea46abf91f5b106135d093d7125ea97c17d8f02f1d0026e9ddad685d883c458bc27646bb703003afcbdfa5a43a81313348181d710b66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/eo/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/eo/firefox-58.0b16.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1f6c6618ef2c108e5fef0a288eb70e519ff8456cf12d348a167eb208842fd4cf2523d72e44b778f9210218a2853aad1fe305f332dacdc498e0cbc2f4b7fd50d2"; + sha512 = "f2978a9f3ae954bae8c5048b7f4350ce1b5e7f07d356e8820bc3e3fe108b1653eec40fc7a9c47c7c213782062b5f8a755d70260fa2fa31e2bc80b9c20a494b94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-AR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/es-AR/firefox-58.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "60c2d315fc692bcfd682990ea3be4933e5bb185174b0c2260e56d4e7a437dc5405e3141bfcde3f177006c858c240934cd71834a0ec5403f33c7a0bc195592088"; + sha512 = "8a3e14b0ba7c990e803924437fff84b438b7a352e30ce61718450a6f5840d1dd20ede78451efaeeabfae36ddc8d3998b33eb45cd8c8fd3e64750b2770d6d60c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-CL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/es-CL/firefox-58.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b3b65a0e58096393750e71445188b32962a3c31770be40f6fbeb63ba42823153243eca9e303592dc93f568f8fdb88caa274ecabb037ed3421bb0429f94c3ee1a"; + sha512 = "6857e17e05bb9df3c7a73a5d022926051e8dee1b355619fa8889e42dd9d5c02afec0dc81d9c6ae23bb695b2226200a00dca8fb9243e735ccef2c5cfd4159245c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-ES/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/es-ES/firefox-58.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a4d8c6f01d0f51fc247df700aed8d19b3472e775feff089d06c320c96a2bc1a13a033ca839aa7e5f4fa4c2705a7fb6d70d189b9f0add202ab5157483d22148ae"; + sha512 = "765327ce2710c78a0e789a08d0ee98cd5345ec85faa099c925cd8ec117fc6730f0d1c6377571cceb997c3a1917b54115286ccb163742d6d298b065dc7479f73c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/es-MX/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/es-MX/firefox-58.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d6fa67f36d1c80224cacba3d95536a82c690b6cc09b6caa8791d4f0500bac4b77d74e8c6461d1e626d4f7c81e2284b270a5fcd734ccfd6e4011ba1a69c69f8be"; + sha512 = "799674d3546ed41bc457b0cc4c7e13877229f10b8d55b8571fd607fdc331b826683d124579b217fd4b970c01f7447a0f9d4291f64b9a32e16b6874f50b289bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/et/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/et/firefox-58.0b16.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "56df0cb1be0d862f0b3c5f2a5c7d00eef39bdd86cc7c4c2ef6f91ac5814d07f9a03d0218a8304056b5d5457ef248a4c2c7b211cacb70bef6c4c5e9c25294ed75"; + sha512 = "96adf7cc1e639927d094dd78991de215570dfb5cd332b60ffdca9b22607f0417ed2965d9792f01e06e64f6257c471c92a690e1656cd0b60755f9149bbdd18098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/eu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/eu/firefox-58.0b16.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "844ba990bf98b4650e44b386d4d620ead2e049d954b9f74ed3f8d2b6544c304b2afbff794865db0a41aa5749ab6d6e69c3907a000dd46e2582a00527091d0c7f"; + sha512 = "f6d9573e906e141905e2c6c7b1f4f54f7d1ca9b441800fc6689ae7688b2cd3ee210742cc5a9db40b030966abf7f6de1722cc93e5913d9551fb047ad295bc3607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fa/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/fa/firefox-58.0b16.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "3925f349e9b67233b034888f6c2d37e4830ca4bf3fd9810fc7585f6af6318c4f743a1e6691bac44559ce53bef599eb22e54d8c36f10bafa7a21e57325b25ad36"; + sha512 = "b5e0483c360b015ba0225ab1ddb66e1271e52c9f5909f157815d59fe8e2d8292bc91342e0e0015b6df3093f8e04cabffe42c20aed1e496a795c144a65a5dc924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ff/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ff/firefox-58.0b16.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e31047b7420650a30136310587cd4d66089b99dbfa6291ac15f03377d37abaa3ccbbbd9f5fc1937fe70e4cbc38dbec24f1358ec2da2db54b5ce1af4871d32ac8"; + sha512 = "67536679f0c79d497b87f270593610ff54d88699db683360c78e9fb197b0c58f646017c46e42956632f2fd3bc1ba50ba903a90f72b8bee4ac8520e1faa21de7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/fi/firefox-58.0b16.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "287f2e50c912aadb35238a6a1f5a32851b5cac1c3061c6f641022baa8dcc03e7b0f738df9bcbc9b82c9f89fd67828f3b0bc949eef2e25be8920065d402e9a45d"; + sha512 = "54ee1c20bf026005d5d22f3688676da09d848780c7275906cf191755eea04e414cc75ddc77d77d76aa88c2ae1b8d37d3e7d064e416f08e4f3256eaf39efe4c7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/fr/firefox-58.0b16.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "2b21101b761ec0a8974e3782e9210983612126a2ed42e2020e256b2a4352406ea310dc62f54ec1069bf5b66853207bab024f1fd3ec06ea205336100766626014"; + sha512 = "0a230b1e5203032dcb5174f52a4b293503667111057b929935ea4dec72a711f0d8689dbacd967427bddaacbbc39cd6615808030ba4a8e7bcf3658b0d10a26b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/fy-NL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/fy-NL/firefox-58.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3e25c7b274235adc0d59106bd662d9c8710863c7e95738b6afa2973df999d7c8c01eb2c465473b26cdc2869cf2f9f4a05deaf88aecd125e2338a77a3602bd042"; + sha512 = "0ce7ff09bc1e24e1126f20b16ea6f514693dd108e0feba1d493c0d5d64e298eab4696a3159bfb89dfe95f1233ea55d268927bdb08aa409d13d81fbe345c0f7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ga-IE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ga-IE/firefox-58.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c301e3e3facaf2dba4ca4ed17318a7f21350a9d190235ca99bbcdefd4460e53d984d3c91a05564fba56f4cc76795742659b0882ae116de166a46ef6e6b0dd2c1"; + sha512 = "73026666e86038a1aff7226afb44d31b9e4c734f5a4c576abaff83f6d8b2cef2dc6a95bbd1b55f54361dc2f385f31b651dde14cb0a9ef93600cd160195a3a86c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gd/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/gd/firefox-58.0b16.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "6252be06dcc137835059318dcc32af9bec179e57378b9f8e03eba8284f8f48cf79b40f3eb76bf6b0f46e78a5cafd765763985f4f375024b189818f5bd85c67b9"; + sha512 = "78b812d39355d2fb1f9724a4955eb99f69f8e8438b409e8a2a1e0ef54dc65463b19d8463bb34d2c9a8204a783d5e47e92a0883b3cf1ebd61a8ab78d82b6351c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/gl/firefox-58.0b16.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b1640a8ed2a8d2452affdbd33eeed8160ee0b76d7fb99bd7258e38c17f1e22b63210f167c266db00fea65ae0b2233d49f057065d1fdfeb023e479804f1dc670e"; + sha512 = "2826e9be83344d03b967265a51f19fcf81856624fa3902291ea57ed5d480b2d52a03cb94b0d47859c786563b9b36fc9dccd3fd9a7e18a1f942ae9d501854f586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/gn/firefox-58.0b16.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6cc98743312f1b92a66f4e514ebab0851eacc7c19cec7581116c01f4450194d9f1c81b822f4dcd5841c68e9bb786e93dc7f00aceffa4888e42329bfdec951776"; + sha512 = "4971241c3c47cb4a164c36ea25ef32be63ac58b9c9d7e1e24c2d0a99543518f282bfaff9949eb19d1b4d1378dcc6674c13972f75b3c404047a4f10f87a0059ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/gu-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/gu-IN/firefox-58.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "be4beccf01a95245eb2dd6d587f2cd70e6eb0050f5dd65eb24c723f3a4979ba1de1d8e87aaad44b67aa216f69f7f3785391f279f9e657eb10d808891e182033f"; + sha512 = "8981b097b4162d2eb9de3439ff4b8bdf6b650c05fab15d1bf51210244d7862c1fbe306c2f71e66f2784749bab1f327c8aa576470778b0479bce9138e97d81a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/he/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/he/firefox-58.0b16.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "fadbce135e17f62edc2ce5004ef12ffae5a4a18d7c80b785f85d49da9640a874ac41eb1fb15423257dbd7fda9fb14d19e5740e6b1796b15cfae62e13c471046f"; + sha512 = "30e59d23cffccd313d143c4b73535acbf93bc0ab97dacb6a0dc155f693fc11361b41a8c3ea58efd4f04c9773e26b040361eff74108bf7a27b3a2410b5e06626e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hi-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/hi-IN/firefox-58.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f00f0ad1d2b2c1d1451167b8877db6c0fef26d00fa7673ca462cc673a34e6e5f6134912f1e655b39d8fd657faed41e627db0c6d713aecb374b2680d6fd6f3669"; + sha512 = "a225dab1619d26c2adf77ec81e934a0d4e53dc53a6adcbc639fdae2defccb815bf762948c5d110695af53743f5178ed465dd0f69c28323c6f1170eb085cbc047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/hr/firefox-58.0b16.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "014ef528395616b30dafc7e1527c7465a6d6eb2764830d06e62fcb2c9e0a72b9f9707718d92205cfb8e0d917516fbee3d01e27d33a59fc2b90ed45cb940c384e"; + sha512 = "211f72f372752cc18e68283ccfe756f4dd5aa3b546adeaf7c979e5ac7ce7dd1a05fc51209ea2760d7e7f3241995de8929c4c8157cc644f15c86b7ddd5c6d1672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/hsb/firefox-58.0b16.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "82aca0cfe0ba91391190a51183ad7cf9301079cd0ec4dfb86d952cc919967b7cad7e63c2b09931e94c52984b9a2547ee206ff86ecbaae064806a22125c0efb51"; + sha512 = "d877366900076ec94bbf1868ae8a404daf4de62a5ae3aa0e4e06a90fbcdc2f7917d5b9a7d8c2c6c4671686e031c21208fe09fe4c7cc6afe9442b8a7b802ff1d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/hu/firefox-58.0b16.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0df88ca565fbc1826c757371ba8fb902d1c383b11e56fc28043764e0e6d6a10b99ac024066b0b194326e2dcc0ca174b80fec4a9116652c11ed7dbb1761baad5d"; + sha512 = "001e92d12c9823145eeed83d221212ada951ba74ed59989d2bd5c5cdc1a523f1e3b2d7cf0a6f502eae77b655ce0e3b2988fcc64fa3bbf4ed57e6a15b9c29cd9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/hy-AM/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/hy-AM/firefox-58.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "59532269538fcac690dc26f3292986516284f7a2eb2094f8148eae16d4b4c98fbf5131d6a839b9fe1d5d432426811bf3352846c447c0f03c61cdbb414e5a5c91"; + sha512 = "fcc82106ec954f9cf71c7d11bdb31c0fa9cb700eeff301663fecabc12c3b3d7007790c6eab772faa8b17a8dc08d79ca17c0f30611c05a3421569aa02f9cd2bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/id/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/id/firefox-58.0b16.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0b528982ee68c523ab641c379cad911cbe4f7e3e3938cf4851ef53d087fa4f2c80bb1973214044d887bc27cd93cbf824a36d5a1107b7a421b0b4588095c1c981"; + sha512 = "f0c2cd6192d218c68f12f2ee3cba1da80a6f13c0d133ab8efc63409d2d81dcdf4f997f62d005bd8481e9d4c2614cfb81eef203299124c5e28c14c64e7a30581f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/is/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/is/firefox-58.0b16.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7b1ab16b5aeb9377bedec101447f7693a5c84ed1d4cc8a9e866ccc52274576ccfd74e74fc675c46f44f6651f82905161124d261e17fc05ad2ce223a1a953f439"; + sha512 = "9ce64ef56b5f0d5fc42fc72226e50d2f9497407c2bc60f50b4fa9050b80a356063de73749029502548cb6fc7a77a3caf87be444f5f16e85e1b2564ee2c83f09d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/it/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/it/firefox-58.0b16.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d266d71c691c8574d4031f81b9e4dda0c2dc1e411a434450c899377857ab571fa3c4ce32cae3bd025eeaf326ac937c9c5e7df79f4c0d7a31bf0f464e15d7a2bb"; + sha512 = "8bea2c016abf5c7fbab15affb4a0e45db66ec9b425152e57bd7a67d7a99b658c1b58f563deb9e0b67314565e9bff4ccb4ebf2ac881cc19f0fddd6b164e1f9241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ja/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ja/firefox-58.0b16.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2100b5ed142f0f2b755c00573f2a5347cfff7cd17c1547058dc590627d07538ddcee8a8a0ca1e1afd0ec875a9ca11d44828b3f7aac54f03d9f24c7112bbe3936"; + sha512 = "5d952a5cb6fe885ca0d5013210596226efbbf85bb1a21e4a72b2ce998f468f5a8079be5fcc8cfe8210232dbf9e529262daaf41bae14834f1fda6a9517fac2ec3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ka/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ka/firefox-58.0b16.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9b2b5662ce1ec38d4c580aa2df99516333508b7b54cc15ca26f4ca9ddc21ffdff724d5cd952fe560bf89778b8a07d7b71233cb88a58007fe770bd6d060425d19"; + sha512 = "bb3a71b9291cdb0278aa86b05dfe03b7c42bf0c1018fa6177f9bd5f4a0d6b969365d114fb37e1a52b3d75bd6f704bf577c391c336a0a8fd68767822a8c3eec2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kab/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/kab/firefox-58.0b16.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "4e4661c562037675177850f4da6192f7e15d08e0afd7c5302f9cf122f0b23db3c8cd33815d589202075b5b43abc1f4c161fb7b0b4155cb56cdf8e7666306350f"; + sha512 = "8bd5b265d95685ddd336782e2b7a7813794c8ce5b4ec2f901be69c7e09ce4ba8e4cefa5b132f517255c2c2e2b74521733ecb915f00edb824add5ded1be992644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/kk/firefox-58.0b16.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f3e08a21642564a25e7e2ebe8c8cd46da095898e86c85ec2b0fcb434af57e66f51d2eb9c0b2018bed0e80ad79da244f77eb48307f12bfe23464e0959d846d8dc"; + sha512 = "1af1ffb451118c713d9388ebd1d1d9e120849717606f7ec00fb2b057ba3f3c0b2913b790e2cf8413742b1134c2b3bcd8f72a1772b191a4dc6518d2c461d57342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/km/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/km/firefox-58.0b16.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "34771be4fdfd50a22d8cc9211e5240704bd8481b96af3bb8a2035d7acbc8c0b6fd16f54a76586469105b5bd35149936563a7a99ba394f09eb3e1ee80fe02b0c0"; + sha512 = "d14e9370219fbd06df00e269d1f59806a5aad4018f136cf0d20dcddd10500dadd4019fc2a1735480e97f1c29f779225f543905ecd9e59256066b2e6605c8333d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/kn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/kn/firefox-58.0b16.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "4d6847ac04a6dbdaee05add22341837f9b2a6feadf1df8c4287804d8a4ec4d06016920fad35a7c3b8da2a1ba5c6e32ee0e3eb0086ff8606a420cdc6fa763f860"; + sha512 = "acf0c0c84f417ce1d64076c8a6b4b1dda800ffbe97d87f66d6f23063217b82e54189311633887af1f421f6330d4ff19ef0222eb9dceb3fea65c69b1d0ae3afbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ko/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ko/firefox-58.0b16.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7a8ed93baeb9d1927a8cac124a8ed70c4c47075e5b35f06116ef975504a11b4054c580f12ad34f14f76adf7ff70094f3b39fbf2b48f5dfc0c1e94f383746fc4f"; + sha512 = "d1194a39fbfa93ea6b04b724e42084f36f618dad3f178e1651029b1a86e79ce59c89f29d124912281a60089499d7b790f3d68c2a391edcd114f764935e8f7f6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lij/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/lij/firefox-58.0b16.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "37c4fe4de38926120f77bc7b926dacd31de5ac490177498dc6cf6eba59150cf67a29adbb224837cb17091c5539325507644c5ebe352d2da2c42c75a62b0302a2"; + sha512 = "6a6c0b20a0aa3876569899595a11f18b284520a23c10c7969fc8f415bd560399c0a411292ab46b090bd8fc9f239c59c1ebf3986821ae2628e09fea70ea87007d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lt/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/lt/firefox-58.0b16.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "033735df43d8c8bf84bad8e32a71852462c4d305f9e768b845a2d9ca917692b2bba48a0ed416c19132f89e7044f166577f85737f07ef65699cfea7b6e6b2207f"; + sha512 = "eef33ab758a0d3e185475e6fc80bab525e8224933952c915121434e36e2095248f49328216c6d7a9149644772e6be63d612122beee999d7411e3d77ab95c54d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/lv/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/lv/firefox-58.0b16.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c91e2303c67d87cb9d15a789321e55d29f232f1c165c8852ed3650edb466ec7fffa10a19ac260c9a95a76f40beb575228c6ca9eae50aec3d62653c33a7b6b1fc"; + sha512 = "f2eb59ad7ca8988755846513a400076548c1bebb9204ecceb2d4528099eb03b45f7dee4245d17b9dabb97e00f009bc22a6ce658058f85797fa49b9167c21e586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mai/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/mai/firefox-58.0b16.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5fbc1bef91b528b8cfc2660a79ab17dc9c1ac97aec061508caff5e7fef1e976b3cacc3490f3d9600a9990f24bd5b0334f6745cd4c2a4ed1c9b3ccaa9764c6090"; + sha512 = "3e3650eb061a78503d6c7991707dbeec655033ae76b659f83319d53da79158da7dd2750f8cff9747d720a02c4c562fe6301caefdc714e78360382f4db3a17e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/mk/firefox-58.0b16.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "582cafa6ffe662ea12bb12d08b6491a837643f63569ff50bddaade14fc544843d482b08541a1dc349647ca82ad3a8f185984108ba6876c0aa9b7bce791aa8b7f"; + sha512 = "88eac74804488bf310626e68ced7f563136edadbbc22af4c19fa77f2a7e25e484a0dfd46b31aaec4cb8bc2300444c2a763e4741150b4ef22bd59af45ca9d73c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ml/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ml/firefox-58.0b16.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4cf3e39bb4ba34a32799ec5a229fb16b8b0a7d8cac77a0a93004569d7cb0f662b8a9ea9903d0aab07784272324e25ccc6c246a3e873a7a422c00451ed1cc8e8b"; + sha512 = "39629c66a483bd9bc87f6dcd10ddfd94e723d000873226c7f989dda56e60a6c43ecfcadc31c346ef5f0681104617822080e30e14b9986364f2afcc2aa78f7365"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/mr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/mr/firefox-58.0b16.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d5e95e2d0aaf5a9a91a68f2fa219bdbcaf77ea4d9770032db5f6a890b4c936354392b41dc9f9a04754e67c9fe124d06d1ed2085562d3d5c6f37d8709f01a7e3c"; + sha512 = "985a340a6e89e88c9eb4e4a863f7049a58c0fa4aa0d3a0ddd6cb7828693ae650686804f84d61f282997c4a0f2bee30fd0807c7f090b7821c4018f386ad6a7c7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ms/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ms/firefox-58.0b16.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5ff77e3680ffe601af02b1a8f58d6676d1bb4870ca51d928eb9cf5f3cb3ea6ee483812b9af3603f3ed13ba22a50cd8b22991afa57c5979b9265a98861f261a89"; + sha512 = "50f9106e0d0a0176613c3500257ca9260c6e4d3f9a4cefed1df4c50acf21d4ccad2bef498c5d602389bfe86f874bf314642afe2299e1d9fdd33cf9a576d74c53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/my/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/my/firefox-58.0b16.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0ea1bc7848c0c3264db529441431ebaa8e2009f9f0ea42682e35999b9ab972a8ed5526b84ac23104ab9fc5e4940a62d34522c2eae7d7321cffffadc966121c90"; + sha512 = "44e3037baeb7aca11283845953b6e71758e67eb38aa11b99ed68865aba47aef5adb4be9cd52621960a954437390ce280d31da1734183bd1cbe5497b1b8665e94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nb-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/nb-NO/firefox-58.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0d53378a740955f7ef2edc8cb9c48a394b447d8909e6cb4d1dc13ebf9985df99a95347021d1060e8df44884d6b96cb41dd08be0d204ab5ddce31b12eed7b65ca"; + sha512 = "df2a5be883f46e3f6cec167cd8aac344dc69354abae30349a1d2bfe8a6047040cf11355e0f198ede447a71eec362ca28b3332e048fc1740cce4c79ff9e4b72e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ne-NP/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ne-NP/firefox-58.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "9003e5b525f50a1f5f6838f63f8e8be25aba8f80c02af4d32ed125416ac81ad79605c7d15c42e809485be5f490a2363d9ba7cb8ded31e2862c4fabf526cbf870"; + sha512 = "9ac55420646198a90680f09a81f8aaf8ff979e972bd4b4ba14711b7390a1916f146e42e295fc2b0988bef542ef140f7a11bf4d3344c3c685e388db9eb1ee81d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/nl/firefox-58.0b16.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "126600e3b1f8689f426c8f50a40a8ce4e81d37d4715a9a52628c14c8b9163eecf7f8dc87bec09d876a2cd73438aa0ef8e2d049d10a8e58a09d509f6d0daae3f1"; + sha512 = "3405266b9efa56956575a080e1c02d80fc381f9417a129f65a6b7c75ecbec33c1f20d55ffdd9072098328e06a6a0c339f150d6663ad2d188e125cc20d487b5dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/nn-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/nn-NO/firefox-58.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "9890964178203055ce3db56d2b6b3b271b951f29598bb97a86e88ec58d1e0b9f6d71c20e6e129e5294a1023b5fd0ca54b669b8e8684d888687bfdecf1f729ece"; + sha512 = "3fbe2fc4b40fd0491464f478084a09e349a9c19bd1d8f8439345ccfb19f0c737103ab2d1b355330f757eb2f439f1cb08ed5397fa407acfdef8a9d8e4dec147c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/or/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/or/firefox-58.0b16.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "5fae0bfd002c36f260bcd1ee868b10d422c55afd59012389897b9bcfb573c97669af838c43985cf4013448ce3db17ac9f8289a152edabcbaf4de48ab05dce8bf"; + sha512 = "fd8763f78ad1038cbb8c51915b1fbc0545eadaa46acab9acadec4c367795e023e7851e6b7952db339731c81b5030755c54fe1862a04d32363df5d30d42827d21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pa-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/pa-IN/firefox-58.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "10dbea6ae21ea10dae7846f16ed5530466bb30bd8bc864e6a81e2dd9d2918dc589138989938c4781a31983a14fb3fa23460c3555fe35deec36f20c73eb1bbc5b"; + sha512 = "a73db75bacd003286d080076650e079107b8dfeeb889b868c86c32db0e3a5a1a0c5b4b9f6da340dced677d13f895c12651bea2a08b24bee78f33cea6d6bf81b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/pl/firefox-58.0b16.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "39c25f849d01942c3c457e3da71f201abbd7f0d6de44dd6526e63ac4e27d1dc58833363b9cb1f2160abdee3856653baf6dcf35853923742d0ed90d4e8ec673f9"; + sha512 = "ef17c2be21b5487e471b5a6a0a46c366ba8c5b7da85d4a8ef8dfc8c7523bbbcd520d796c4bb7cb7905d8ddb1850675190105165d7443fa435187f2bffe928e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pt-BR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/pt-BR/firefox-58.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "5cd3c37463cdafc8b56bebaf0d4ca1a592af9f366d9a418b5f2ab6dbdbe59427474b3e8fb489706444fca07a13ab27a10d9781ec30278e4d87193ae9fec12a31"; + sha512 = "2aa66c9e63f1d0d783c23091994e1df08e977a10d42484ad6265ad78c6fdf4408d096c189b8012bc9e49d91467777ca91b54c4d3df84ead2437d8f18567056fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/pt-PT/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/pt-PT/firefox-58.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d9ed06e17293216dfc23b064524d64fc7c6776843d3be89278b4edcb979c11cfd517daf82021fa31bf69b1c9678b1b41be5c535eaa46e3f29c02fcf2c392757f"; + sha512 = "f9df65dc74bb7e9da8a015e562191930e9af721cb47241b7edabff56f5d5def8206f91892c2c8f1e1bdbb75bf182c5957eb555db7233aa14fc09c61089a103ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/rm/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/rm/firefox-58.0b16.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "8f2680d27eba876f2075e471c9b5b4625833f58829ce5ff3e61e9ab9bc269d7350dc95b6725f85e17b02ac36afe435fd4882c42ecce42b23089c645c1ca28262"; + sha512 = "afb165e1ef43486041ff3b41ee81dfad2dddbebd1dc2d20595d924a998a8e8464e459b0c146f93af7c8641b2ac38e9ac4e1c0090903a96ed886e7ed895649035"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ro/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ro/firefox-58.0b16.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e37b53786083c851c7996e6b936be908a03c26716e8697699c9980ea5da96c242d10b1d1da23df43e77c417f32bcd302b645ac0cb146389908dea8aa51d007c4"; + sha512 = "22b64726f265d1036a0a2c4aa37fb5b2c456915f012218d01226d47577740ac0d9b7e788871e829ec89a58e585366157b63170bdb29617ee4c87ac2ce4b97f83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ru/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ru/firefox-58.0b16.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "66c7933ea20f122159faea020959d016e75b1c3a5be1de406fe14a6ff285218f1ddaafe4ae8348e4fe3bbdb918e13564480f9f5ef5661f26667e2f7908931c62"; + sha512 = "c76012a4c9369eb3fb35ecf1be38351571297e91db0453934169d38ff8e6c6074d6c27e6ad86c14ffd70ef9d95f7cb6db09c88ceb971888f36843f2d650f880c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/si/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/si/firefox-58.0b16.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2f468691aadd1d324eb83130cfa7d5853907aa5bfd0a00b628257ff5fd91c18b80328b546419746fed8726976430ded774de6fb37e02b1fa9f954eb65f20f94f"; + sha512 = "b5477aa01e70da839f5ca3459b310eafeac11c1d6c34934b9aa319d7926b363537cc7053d92dd8bb3a34673eb2fb721e5b1934c709a2ca433a33d0bfb140ec06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/sk/firefox-58.0b16.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "85914a2ea3d5c6a432665503454f70943c2aee893a9d4f62a45e3a3141c23e5aee9d5e04bbb7b2588921cd649b5e55b88df693689cf97144bf806b017718c809"; + sha512 = "3cc9235d5c3ca065133403eafa1a135dfa4edcf05bf3e8ccbc8b102464abb47982dcc4283b45699abdb7080ae82f459204a9514624ca95f84939ecc9d553208b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/sl/firefox-58.0b16.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "63c749783d06259127dcd29f95e404fe7b59810ee0ec6a4d53385197aca8c2b58425e3a74791f9ee3b2d157e25d5a0063a11c8be716584c4c1989d31bc3dc0fe"; + sha512 = "b442a8d0b7ccf9a6b8252b87bf782f1ce6a85c65eab5f7ea0314c20913e69ffd81bfdce4d965dd28328cc37f4db4e5fe44021e8b1c9cee616caebef0757ffc11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/son/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/son/firefox-58.0b16.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e7eed20a0b10d7e6a6d6f29262781f1228d5212581270ffcbda601c7f2ecbdda89c983347d5674aba7a0f4ba6edbb401bdab870ca80438ec9064042c693d3282"; + sha512 = "088b4e5b68002ba3e44e243935c3ce2e724f5f6b88fea87e0e1ae222fe5d2bea223232aef2c1be8d6bd8fd31a7c57548ab1ff4b34e92df24a9bebf596ae97fd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sq/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/sq/firefox-58.0b16.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "4957b51cf2cf3cb889674137e7b5482fac02889a5982a9d26c7dc422317a47f3e973ddbe09f9973ee2fa6cbc0f4468d937d57ea2238f36a339fee3826d13d723"; + sha512 = "757715b9781fd0ebca1febbffe04b731d2155dfe36c643fac2850dc182cd939ac57a03061b24aa09011ddaf81ab7849b11ba8e0411345ca7758c5a50d9697f6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/sr/firefox-58.0b16.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5e38cdcde20b5ffa32f546d122eb68e704ab83c8e631bbc332a049f18c7713c12e87a077038e1f8d4f1c9b393d4765e3052eb5a2932832ff11ad5d0c59e7476f"; + sha512 = "507a8096158b1542b938687064a55aab34bb099c6125970a6da98d99c27b5d84af8f9712e0e54eceff379782f40355149ac1bd129f8bd663a6b9238c7bb0e956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/sv-SE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/sv-SE/firefox-58.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "aa938c6e3fde146d2daaf54a73cdd71b9ab3c2a0bd5ec93af0dc5f5dd2d6f21dbe1ee2081df32922509d043801cf81164e58f10aea5bf1dfc440a656828213d9"; + sha512 = "7de38694a129f4415add651adf1f298bc4647304ddf23d73f3c6c61e478d99683a1ea8b39e0c5f40ac6d8fc31740094dd4ce055af74e863279c430dd6d2011d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ta/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ta/firefox-58.0b16.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fe67d505b86d4baf8cb7ecd7fedbdd76b04838854c163f0f85fb61f3d48e8f43fc0b8e30595aef6094cf399c6b9450f056ee52dcc6af1a967befcf291cd24cd5"; + sha512 = "3181be9589f5f0b5ee1466b64334a696305f4e857c9f9ce70bc0819d89d6283603439febad3bd307d19c1b62a82aa60c08a267c4b513c3f5ea27fae3c8482a70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/te/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/te/firefox-58.0b16.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ab5618e77cb8d81f01cf18d1aaa4a5cc56f7ef5b0311631dbf7fc3d65bfd191d692f6bf163ba55cbae495a14cc4472a66fca6a21c839b80cb295f87730de0256"; + sha512 = "66aac40d162acfb6083117d94b9f75a685d842b9a1946beca9237255ce120e08387534964ebcc3f24d5445c302d5e6196436bdeee08bef02badd856f06b45c90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/th/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/th/firefox-58.0b16.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "e4af930d960eb69edff3e00b8e1d38b358dc5881f5a41b1216098c13b64524cd8dde62fd30f8b8dcb52a71a6c245a2b02e253e79675c09b1525501ec105ab370"; + sha512 = "d73463bc9fe37f9467fb8401188576c95e294e7a6161d76091e4ab3c0e032d872ea579f84cfa96142e30af8dbe108575656dd245efea4c4f00c5998372d73f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/tr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/tr/firefox-58.0b16.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "882b5a340a31f936243dcc4c995f87c4f9a0b232c693b52b4e18a39adc0665788161520880a51c521941bdcd7356b15bf12bc32bb60301e40f160130cb56bc13"; + sha512 = "3d0d3e6a3a0701ed630befff5b1ea98034e76415a1e9a46e2df1dfc473d1e7a044081560bedcd4d50cab468d260c3980b0272a007f0ec0a3c6dad62da8b8f8a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/uk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/uk/firefox-58.0b16.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7273f65835638020452ebe07bf6ad0b6582cc1b6e9abbc48a0a6848e388b374ba466b7632e7f2ab127cbb6bddd0dd016c585bc9847b48fcc75c05f500f6ba400"; + sha512 = "6d34921e196d1c4ed2602187292cbb2395f5e6c2a387b546881b1410d55511da73d1f0e8bc7d085a77fe4e9449d0fdb3979b8b27299044004c846f2099eaea02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/ur/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/ur/firefox-58.0b16.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "cdb12e5f42880c360bc727642e9ef1e4a874d93a67ffdb804cddcf77500f0d448bff8e8da4647ca649f4a568fc54f6fef1a462ed423f4f8f58eef36b2aab1916"; + sha512 = "a626bf0704382669e767ac4b359338cae910bca5565a555d5159b32550f9953b0a500a6e3a6df27ce5fe42e16b745c5235aaabced98f8d407e6f8c1d1ef9ba5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/uz/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/uz/firefox-58.0b16.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "db698d0a807f8e42b45325ef2c8ce91752e223de967b69fdc03bd681a92b2fb4aaffe83ced210a2bd9486d025d5bac5982c9018a7ecb85bd7fe1c1f98aeb2317"; + sha512 = "a0f83a3afd7635d6b59c74424724a31d0f2e622f53a22f17d6f63e66c14ba4188e97e0a399c5d6a24ceb907a82b8715b3112e031064183b49a8a05cf39f2c64c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/vi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/vi/firefox-58.0b16.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c33667f93a1bb20844d1ab4e94328356a2187881dcb66084ff52d2c284c5ab6cddf7fe1ad281ff03a5fec45dc8defe77710985add796d879e7a3d66c180d5cec"; + sha512 = "3f39a24d08541adfff333392c8ff31e7f9471dede6725e452720d8043a67c406d5db563c4700dd0cac96df438b1985cd0b892d8dd3fc86cfaac9b1f773d6085a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/xh/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/xh/firefox-58.0b16.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "ba5f855be2cc56385cf821ceabee45eafbb528e1f7900ba24719fb68ed0bcb82a1b54566b82df6af05cfac6886e999588ddfaf2d952527eb092af685273cea2f"; + sha512 = "16edae1e8791c137cb1af5b3896dcb697698f4358923564d2a17c9784ba12c90720378099a359ad6b0366155e964e3c764ddb2107d49c26448d0704558be5b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/zh-CN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/zh-CN/firefox-58.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b4a5984c8043f1c2156f241bea5fabf20a878cc3b437b4c42fe7cd8f220526569a8d13a0d69ed8d4bff77b13037080264a6684118c462cdf4af756accdbc5e55"; + sha512 = "d1cf1edeecb97f11eb3021750e09f1238cb6ee3dbf598b16a3d6f57da9f2d51d70e3e9165b3eb4e1dfd8a437063ddbea0b9643498cdd3dbdb3ee46f733621ca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b15/linux-i686/zh-TW/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b16/linux-i686/zh-TW/firefox-58.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "62cb4b3e2d80387a01d3ce380f0c11e60058180a8d31b462612bd3c0a254a4cc7a54b0c3aa1f2cbcf6082421a142cc3ac7d224853aa763dfe592f790ada4e4fa"; + sha512 = "23f4e1d0fea76ae01b526e37a396c24ef57382518078170527e34c40d95af656f32ba617ab37c523ae95e1aac964bd488b432ba73a3b23d620df5f653935bccf"; } ]; } From 66bc1ad0af63dea9490fe1e45ab213e9b314fe6b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 13 Jan 2018 12:23:16 +0800 Subject: [PATCH 115/197] firefox-devedition-bin: 58.0b15 -> 58.0b16 --- .../firefox-bin/devedition_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 6188997f7c53..7a48acef9bdd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b15"; + version = "58.0b16"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ach/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ach/firefox-58.0b16.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "5f45451e3c6bda0a244fba3165336e63356d8d1328a111caeaf87fee565d6f4349e6dee4a6f12e10f350a351adc16d5b7c02807528cd2a1d700bc12fa82f5f94"; + sha512 = "71f56d98eb5cbe5fe1ac0fe070bc6e430df0f661cb90c9cfe5eeafff4a852e7f69fb4684130259867ba887ec7788ccdebdc184d169521d2f930b030d51b1cc10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/af/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/af/firefox-58.0b16.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "0766f3ebd914c2c9090bdb4308034919b73d448b63bf3af6ff0758c0fdc8727ff0894fbfd5aa90bd6179fa07fe6483eabda1a23a8b480aec06bc016e30ac5004"; + sha512 = "ab90d6b0cb96752396174ea4e1b71f78739834e47b048b4f1593c3ccf8187939e54ec3e7e7de9e1433d2238c79feefe524635975f89ce05638b75d14dda971ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/an/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/an/firefox-58.0b16.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "cb0b48aceb07f6963ff2c3cef2488c7fc3c13db9b142da555ffe7e7535e3d4bebad102eee515968163db72238d6ae182ead1cf06d023070f3d7e758256ea317a"; + sha512 = "56f3d95ffc07c4ff3ddd39e5528ec300b4a5ec52317c23e5d21dc5b752493af35f4dfbea088ab2fdd9c54b57e647b0d1bcc441d359465eae9f32e1edc433e4ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ar/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ar/firefox-58.0b16.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1728cc93196e1d3bc1f6894faacf522c84ec5c6a1b6ee92e1d3b2216344c7e8e836a43b224267676999b8953d7c947b181688f7edbb093626978ad64e120ec8a"; + sha512 = "740fde4321043e1d307aea3b528701b50118fbe05cd06fa6c71dd7e27f4e4923f62e7cca181017764a851d87467f614bda97304c98f6104ab2fa8f59732ecac7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/as/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/as/firefox-58.0b16.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "31f649a7aa494c6503129c5cf84917d6cf5bcab3aca7258d654b1ca451144fe77962e85f96515dfb6640b53db02b39bede04f9554b53beb82ba7c8876b2fac11"; + sha512 = "9600cbebe4bc1af9c476abd3b1a4e1cf8259c426020534b6acae9433afb782ef2aef4d8c9eab8023d18362933319e79557fd1d644d12f30108319ec21a8739b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ast/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ast/firefox-58.0b16.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8dec2578c4fa48dd54d3348aa0141434335e2b3723c107d38f52f77a9f6ed9f591753a3db133d2e806c9c5ae1e26560cd8fce3adea253af21950aff0d70faaf6"; + sha512 = "7201fe87dd2f07720dfcc3f9e76e4c617e461b1167fa1422053f7fdc7016b9ddaf012a46d87a25c147cf4755a339ce1a288065af15c43e24857e009364fa24db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/az/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/az/firefox-58.0b16.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "857a83e79b80509012554577c84fbefd471929ced8328938246bfc8521c2064fa806d1dad500012e9d4a5827ebf19ecf7d4b525fcb12468779a8dbb98fd2a64a"; + sha512 = "2695fd7b77eff2506595e7bb2bf1ce91317d548d3392cbb744f7a00b303c6f62e2f54fb0020778399f4a233b21a4d83ed2892e95f1c89bf2ecbacd0ff2c01a7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/be/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/be/firefox-58.0b16.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "bb156950372b518c92c6c46e8c99eecdbdf0639780a9f73985a3070562cd1f9690b278fa5acbd710330f5de47b799a38eaea45e9f99d2801bc3f156852b7ff9f"; + sha512 = "44be675e893b02c256a3a4de13b7316b0aae2f39c71222253cdfe161dc96e763b541b375ef9624981a3ecbf18a56a179951d19ecdf72137308407c633365f6e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bg/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/bg/firefox-58.0b16.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "1b25f238754ea4c4798b1270874a7a8d33c35adc011a55187e82f8b77d290e3fc5bf97430622aba8ea155faccab83c99d4d2c66b49f4f2304293260604879aa3"; + sha512 = "feada9ee171f382667e78c97f34f753bde2c7021d8df4d30d3b973273f697badbcdc4b92ff64980338fc9bdb4c16865d7044f68b000c6cbd1a2763aa743a94e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bn-BD/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/bn-BD/firefox-58.0b16.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "372978404f4c60dee651d31d7ed62d08629d9c71f774f52845af62ccea4c53ef9b6346acd59e0b2dda0e874378324c87de1f298e3c83318c73710bb9015f2588"; + sha512 = "dea480bb19f04ddb3ca74d405e3460d7e75d5cf26f70509f3c9c71a145eb7283b0590d2fdf5a7e1bcacecb610c19b706c6972b911cf766ae1f01c3ca214a461b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bn-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/bn-IN/firefox-58.0b16.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "b49a4e86e59a425e02e02f916285fa8004e6bca3badfa269a4ebe25b4548c053ec32b195c59eac6cff2b9d34c966e46df0d51d79f0a95e2366991c10e02f4a38"; + sha512 = "3250536c89b6ca6577617bb6b41e6e93dbdc0f26e83fe47d887cdbf0d8272cf1516f393f8b6b9aebc9e62659d71111163fa4579c2ef569b17f31dd35b0dd53ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/br/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/br/firefox-58.0b16.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "151120faf5408a4e6ac7d4513ad4094e3e816d8b2ccbf71880cc5381f0ed5db2442a5e915809121a37663a726ffc7cd7d708138ad064ee34a01e8b4dcd46a2d5"; + sha512 = "05fa5ea71839062afd4daaaf7ed3a1267519900fe7262543b4e34c1b95b092ca97a537c919d25416e47bb337aae6f490c108d950c62d8ec4a6823f2a7df02fb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/bs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/bs/firefox-58.0b16.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "efecbe8eb985fb8dc670f495928bba2bd14fe90f3961f2ceaccc7ccc0f95428c7895422433392c0197907918db8a47525d3978716ee98d9e28c905c86611cc9b"; + sha512 = "73130be2e649ebad3f770f6e59568b7977962d4fbc41afb5230870b17f385240ec10ba2b509d44db48f2cf12fd6f0c556f69315a5b8e363f935428381a9893b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ca/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ca/firefox-58.0b16.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8344243260a556097b39151c7a30ca9a3995464a7714c59a29f6e4c8d403747c1c42b3599e2119a0d95beee57b16ecf5d5b0617ed9c01ac4c1d9a3ca99cbbabe"; + sha512 = "e2f05cb0c648696f7647f8d7f25cd949189c3706b4d7035e0519f61a3caaa6d95bf60f3df5d3ab4612484fa05aa8f309b5aa88be3e024bbf0dbd8afd72d3398f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cak/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/cak/firefox-58.0b16.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "59410e166e2bc7e6b33cd7dfb4874afb10c1370b5111c8eddc2a1b8f850a758b5069c96a9f8a9ef2b3a8542f5f2bee1e9317f9de348d9cef71d7b3afbeec7f64"; + sha512 = "b923453429e40c1e387fac4873c01ba5199d9384ca136b71b434274c99d6b951c86eabbf06136c30f83352932f97ea26e3553f76602c3170edc82245f85ec14e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/cs/firefox-58.0b16.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "36ae810e289df49c7f7510c53e0bfb271b9db8911f3bb035d5c6f3c6a05b3086311267987a0ff1b26f65df8f712c3088225cd8da403ede3872b160b20dc7d8f6"; + sha512 = "2d807ecdeda7dfd78276182f8e7619374db2e3140b17c741239bb1035ae70a726e488db00b9e9b5a0b2e69431003a0255b2e81616dc86092d067cbb6b13d9802"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/cy/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/cy/firefox-58.0b16.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "3c0bafbdf540788fcb6853b983fb1f333288364565ea4a521439e011687c4eaede93433fa11e156592b3bc665ba30987e74a99792af642a08a526d3364112f47"; + sha512 = "356d88087aace001fdd5b7dc8cc1d0d887382c921d2703f02525075cb74aa89068028760759e815d4944eba4ad4344d08b868a746fdc21f170c16e82dc344e5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/da/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/da/firefox-58.0b16.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "9881bb8fe03243c876b12e84561d92b9b44455b4a533eae382101d052a76012be5ffedcf978bb26f5bc1fd16bd51dba8d7d8e2fb63577824fe654e3010b0f600"; + sha512 = "21ac7e3e34b63cacccd903df6acd4027b0e740988a92ba31cb769f80b40a612eda52bdd25b80e41d5a60cd4928cb5a458ffd5c652088aeb97f71c25abdf67ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/de/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/de/firefox-58.0b16.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ca0d7bec2d061d7d199394f4a91671eae4a39242b839045dbe2423943b5b5547c1f71145aee4b4661bacd58df30e7128ef54a4ccfd3262de81b4e7b28e747cef"; + sha512 = "63510a84997558507fc1fd995dea93a1568c54c9660352e23e792f76024a1f26af85147b3ddbcff01b244d6c2734bed82ddc606642055d318cc4f4a3528a9749"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/dsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/dsb/firefox-58.0b16.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8e94787316bfe887def6a6147b2eabd2840d3908eb24b6fdbc5d3d18432fc331144b895dafb2152a20bde11f45c3ed961bf57143a7ff0d65bf205fee5a0d882f"; + sha512 = "d0c64d8d57382b7b5a3f4265329e5fcb2962e3ea444023f73c5f6f1dd08530ee86e4ddd73b5acd56b932f3c5616ba08f8ba361c12d01f7d4be19a4e1e4e1ce19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/el/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/el/firefox-58.0b16.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d216e8c19e805bf7bc3bed1a0e2be4677c6ac1bcf478ac9ed483555fb930775f2e75fa5a24ddb7298ae0f0ce3387bbab65d9ed18c6422a574d688c48801c31e2"; + sha512 = "fa094ce51495a7652d686210fcdef6820f1d52e50a36f0858da3958489f7a47d255974ec855ce59ffcaef2d3e86c3e5e6046d678aad2088691ca27bb941ee13a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-GB/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/en-GB/firefox-58.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "db5eba83f1e360f4a328cc44932589efdead7bb9dac03d3e24244ee5134456b149d879510bbbd762d5a64dbe2a965a39a7e2e10d8517a9276ad6f0e430101387"; + sha512 = "48af2aa437f3bc10bfa70f2ae52a4beefd4820366934b82d3efd328eeefc69e379cecf2993d72f20900e488425724ca0381dd5c1afc725cafecaebb8d314830d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-US/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/en-US/firefox-58.0b16.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "92c7745f480aa31141d47fdea7efaa67488add079b406f9f8f8b9f5a6cb066763dad197fc9bac4f31fe395c0d8c4870cd82b3f3fbd67dfadb811cf16ec6cae6b"; + sha512 = "ee41eb0bb92558c95a4e46a47784a80bb18c8ab64f29728ebc5d85f1aae21af2083751ccc4f990bc1497fefe437c2731db2cf6a5cf7cdf19c4c2e20bf1c6c466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/en-ZA/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/en-ZA/firefox-58.0b16.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "74ed9e4e0f19818a909b60b1d9ac6e4339c55e4be2d1ff69c68e9efe35619e775fd8fe9675df3b7d32b2fceaac4e4b7828c3e0c219284da712c50e097d6e6ce6"; + sha512 = "b01006cb7724a3186ae95613eeb9cd0ac7f9c4fcb2db71a09c657b23482768598b01ee16e23426b04f6d823f935acdedeac52029a35ea198c982884861e25fe4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/eo/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/eo/firefox-58.0b16.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "24f181bd168cffcfbd100f1e8e0a653e87f6558b2bb86740acbc1cb572899b23c96d36d05297420cb7fe691180eb2eb5ce27f44a7d7566c43da499a81f294d59"; + sha512 = "75d49a2195b88e0dfdf226b37091598b350faa3f73531e969ceab4b6920767471cb98ef77b7673da5976f9706e408c182b2e428fc200babcb5ced0e3fe456d1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-AR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/es-AR/firefox-58.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ae9a27c1bd1029881b8c671621573a3567524d90ad908ed41bec01fdf20633c779a4d5d7071d6adb46ad9dfeeffda24fe1fec68043d61325af4b54ae69a4c7ef"; + sha512 = "91682ebf1a64eae312ce701a5bb79ef6e46e086d4a5b70d87c9e22cdfefe067f8f26726cfdcad485f251070e956d4d8038b116e2eca7f96b0a6f96a0129a141e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-CL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/es-CL/firefox-58.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "1b83ea05e646fc9cce6680f6213d7fda11bb215cbfcffb3a658b86400d532f87ff2634ef9ce41800f9c2e52f996d043db24568eec2e1bd600e3269a1a594f3e0"; + sha512 = "9df404c019d380777b8b91a60004799096a4b9deb0ddcb8ee5c0ae246268a22de543c844588570db533dd961ca04d83750ce7d78f0a4c8bb7ebe4f22b687d8f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-ES/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/es-ES/firefox-58.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fb71902fd787c132a796928235e5c5d9f2a5321c1d0d39796560df7ec5de4c4b9afd2b8fb8fc110231ba48b90ceaa2435d27b9e0a4901b7ec0fe311637bd667b"; + sha512 = "0a80fd47fd23e03f7718bdd64181a4409a134412693d56fc81775ce248b153a63f297fab93d22720017490bf11d997aa9fd1ecade9c65ebac3611c1f8b8d2201"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/es-MX/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/es-MX/firefox-58.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "bf2fa28f6236fe3d0412184281dbeafee1312c73c7e4e8198dea6826bb02104f6612de2cee58dd06892b97545ed21806222cb3dd1c6376cbc84c0614617ba062"; + sha512 = "50349c449959a5c8438b90b23baef0cebf212c2de0233ebf0752c73a5db9311c66b878b2f6b758f7c5e2cd23669f26ad9820a1e397a1a574662e5c54a2605eda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/et/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/et/firefox-58.0b16.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "42de2023547ffcb44b523da8dd6b03882508a4afdc2958cd652895517679d2b87e153120de501dfc9898f7ddebf99e9807ddbf74c874c0182d3c0b0de3c9bf2f"; + sha512 = "486ac5a97ff2fe7506a8039f6f5229ec1b48d3fa342e6056b5caf7d5ec9ca5d9cb8b0dfacee5ee527f80d7abba7ebd1746cbf8f55445f811d281eb34b4a367db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/eu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/eu/firefox-58.0b16.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5920709355e1873c8c809ecabac2a5435050fb4449d1bd6efb565f0a3b0f54b80792e31ee4edccb5c280fa19a673ce0ab5f54ee7267856b19ecc1e6df0b48b97"; + sha512 = "b06b8c79698c00a908979f91de27040f744f5281ee9cd40d6968f8a6caa636d7b9cbc417377c984a861af423edf21d3a0bfe76f1c218fd45fab2308273333149"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fa/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/fa/firefox-58.0b16.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "70ca3fa3345c551bb64f1d5dc8aa536d8879eb3bdfc089ed58603401550fefa479d13451c134a797f779cecb63d8d2e2e8e5c5d32115284c5f715e933a9a9a6d"; + sha512 = "5d20beca23c5ffcd8eff48eab4d5a5300c4b9a9314d8e32b5a964333f2a9fee9bd4e5e0e94c25c9082a66b0fdf337297ad610bbad98ff8996c1833a3364d0cb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ff/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ff/firefox-58.0b16.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7edd5c4a088d9d546a070385d2fc06231792150e3079722c24d3936b84899ca15b548bf47528a7e5795470447716ca4e7457c252f0338e87f93180d1fdf055b6"; + sha512 = "5948697a0636043abfb54af82f4e577920ab5a74dcad4546a886b0569bc8bdcedface878a433d90051b8a7e44aabb3721fb1f9ac29c798264220715deb9acff9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/fi/firefox-58.0b16.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "01e080b851846efe29583f5e5feef0474d24b44072007cb7336a639b0b590388e80aa7213db3a2ddec2a019722c606d26398711c4516f97bff5af4b33ecf72bd"; + sha512 = "7c609c2db26201ef731b8497aaa5719d9a7d213e25d35275e90c1f96741e7ce055af960fa480b5ff28337398b7e8f2da043634952a9815485e7967319f9058e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/fr/firefox-58.0b16.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "8cd3b3f21bc16dd125d74073a83095111972d963bce5f0c46e53dbb82124ae27b13d18f75269a8e689e0ddb95bae8042e412ef5ffe85257cd46f098cde811ba5"; + sha512 = "0938a8203052996640883e9a3af111a4ea3013f152290ceb6d69408c081948b5d9e00fffbcd03fb3332cbd1df4ab4a78560063bcfaae71b200a770164de0eea3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/fy-NL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/fy-NL/firefox-58.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b55dcc12e3b7d8c7227fa490a87375de279df2053847c9609dc168a89a1012aff268373011fac397c655fff39f2bd47d0634f0086adc2d1f6a26ce4b2aa45a59"; + sha512 = "86c83c85515c41c09ffd7eb52ca0781d524baa871f75e42ce6f81a9343bddc5d674c9d9d77816a95b7fccb6dc28e6371f41ce5a5c6e08f419e78dab30aebc785"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ga-IE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ga-IE/firefox-58.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8563b91045395bbf2b267b7c1821b5a413802d1b738f769a10cb1d962c6b7e43ef8d3119fa17aae69d2833403d027bdda09f1766757717575f74d89b72106b42"; + sha512 = "9cbee1a59230ac61ce4c169b7863bea87a3ca2e432f944e5e3ad060f495fca664f5db87afaeab03c443694635c97b61d69c2e62e4a713d4555ab9381feda3027"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gd/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/gd/firefox-58.0b16.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "da416b1433044d32e3d935ba20fda52b10eccd3074f1015e17e7f3acd68d1993e8bcab39dabbb4d5dd820aca9838f2646b669ab027a75f6cb4cad1d442889ff4"; + sha512 = "54cc6d7fa37b854a5041b4688e06708631829030bf9159ac5b7d06a183351e061aa046efeb2f5b2063a206ef2e5174ee55885fde9183da1efdf37cf4178549eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/gl/firefox-58.0b16.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ea61a7d5e2b5ca4f6dc84aaccf9121aad5809eedac424d6c960724ba742708e17805ead7b567b3522ad4c8517c7632e05afe0afd39de61a4344ec3dc415d03f2"; + sha512 = "3902724a66b2c32da875da37770ceea45e942919ddbe27bcb9067a8181eb7128716ab603046e62af3aa71090925b880aa294e1f429b8d7885290b3b1866371b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/gn/firefox-58.0b16.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5cf347e0ea276634114dcd35bf49b47c57d86fc8bfe3f1a87b2eef93fddf272f35113e76a65340f61f03b525f01782aef42e2539d9db9a3fc55d6a3582127892"; + sha512 = "37991f2cbb1c003316a69959ea871c4566a3490e273164e5d99e9d824339024191579577b8e9c509024b29708322471e3a37c114880792199e5a3486e8951081"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/gu-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/gu-IN/firefox-58.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "7d54b897c513a1ab865cf663dff5a1722b0b73715c4c195e41102c0165bc55e4fe1ea0c5f5438d719a2c6fc334876c055201b01c04e4072d5df5e2ea65e5de0c"; + sha512 = "ef217016d8391f614fcc00dc6e1bbe80773067b567484e652392546266564b9467a0bec247633e5676fb1f1dda1e46bd28c7677844f6d7c0e8dfb17b743d5584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/he/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/he/firefox-58.0b16.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1963638a0d39db6b60cfe7d8a9e0556ca4923307469c1ff75c6603ae8a528fb57efe74d239ab730b8602d4e974b91d9af5cbab9fac06b6fd6d7fe7b0646f5cd2"; + sha512 = "ef22fe099558da13e25a179eb608d6d9d141484386492068947ae63cf748d6eb2cc1d5e6b10aa55e6ff19b243d9b645fd38cdea1cdbf2652fd64f6e0b80f9ea3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hi-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/hi-IN/firefox-58.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "e3f8d5de30533e2c4054d7716b6742906f648059b5718e2efc7d4f1c7b78c6a68eefe9ed96326c5580a2faa499349f3a96e3abde0a0a841d39c13488ede701e8"; + sha512 = "3be9e5d5dd513c330ee02bf7be7ee78c2eaa291c28b8e22ce45b642d18ff2b3f906d165872eb7b51243f789224f3ac0be293b5b96c5e6bcfcd94d773f9ab0210"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/hr/firefox-58.0b16.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f2018fb0b5ba5001c63ecd0ef6074e8a1b7016425c1f1bb03e2ecc394e6c2c5e8961b5a53810ed1ea6e1a1e2329653a2d810bc996f786084d1b1381114e94eff"; + sha512 = "d3808761e024f4be6d46c6be9ee0d07afe04b3b7117f56e5e2cff3f138c035cb249617c5e5af1decb6ee502ca04264c3d54c6ab024d63c23d57fb2c084c2ae88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/hsb/firefox-58.0b16.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "5e87e5fcaf378d5e25421e05315d6e20482670c1c6d659acced5a5db26078ae36f8de8c1a5c5efae35a5658ff7137930292506daa56fc6511ff592be621ede0f"; + sha512 = "d8f25de029249af4d084e61e3e9aaae63911ad314f98f85887d1ad5fdff06d45ca46e3496c4652c7ae412945615441f2fd0d763e5be80094cf4f12d8bf937f16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/hu/firefox-58.0b16.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b1bd4af70370b4af4a43b383805d492699746cdb07501e56f078800e4913eff2df641c775b850b1e3bebb8338eb91b5d6306f9ac1dc16965c139a1aa4a379f72"; + sha512 = "fb626a3cd9108da1b2e0d8b1eb3fe4d0ef602c3384578414dd448ebf41f7786c57e7b677080b8a9dbbdf6d0b96a393ad8c91c08a260ed09843b37ba1b8800028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/hy-AM/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/hy-AM/firefox-58.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b2d563bb7814db8bd0b6191832d5fa525b32821bfdc28a759c7245999fc7df70484bb22013dc1f40e467c24dac752c6a6bc8616af0c226c9983f24877ceffc40"; + sha512 = "00d17355bf106c3d0ef0b7e03317a3f1ec5d45662c931917b749372f26c278bbec7d2adb84bcf295ad110cb6f581300f3a292e17e3cb3f8814ec800fc06a9763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/id/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/id/firefox-58.0b16.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5b62d1040b77ce3c2e0a5fee2a4216a0272c4cefd7ab2b8377133375a633b87ab29c06a481294acb0cd0976bf8d61382aa183c078f3b762137a6750eee9fddf9"; + sha512 = "029458a9e4b0508ed204ff3485e0b70f26701a339a5328fe210c07a64801655520cc747fd255be9289cdc33bef5e697119b582d31a12ce10acb70778925e010d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/is/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/is/firefox-58.0b16.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5d30ef6381800fc14e71d101f612be404fd3ea4696ec19a62fa7fbfe3ea3b729169120cfb625bc3ca49f698238aea37131e2bc8a056942b79d026cbcacce5525"; + sha512 = "d90f5d8e4f8639f635de3174b825bfbbe43f04f9a81dfb5045907b4ff9bc21f2e67ecc9dd070114b7a6e5fbbcf1b7f72e2d8f4603e2f0377b2a6e1335a4d2f77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/it/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/it/firefox-58.0b16.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ee435c2c9bc9c5eb69077832ee2119792db3c3845d37fbe3df47f3c93cd7772eebc65439286c55f76b9820fe97184218cb2370a436c9f2873698ff6e53491fe3"; + sha512 = "125e06d82df9e87d0d1bcae91a448349a5b9b63205924188a7e8becef2ee98c32c24ae0762d225ade12c3cc0825243d8582e958d1afbeee0a329e6d149b6a704"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ja/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ja/firefox-58.0b16.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "44681aa65715dca2a05aace26bcc3b05e8152b07f44017314caf11cf0bef9c017f4522880b85c1c859a684d92b6f653e0c822358635344949ed9964add31e4f8"; + sha512 = "12a28ef90e708e87b7828e9969af45518f445c55a15a31cb6a43f34a6921a457aa086cbe59fa4ce11ba9b9ee4571326d19b1e1b5a1efc7c90b7f4adea830e009"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ka/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ka/firefox-58.0b16.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e2f9069563f433c6b8c96158821336090c513121d117705e07511b27565a159bef17eca62c82394c0fbda40e6e1d330fb976492b96b7160c4ba797ed5162e435"; + sha512 = "9ab9b6398502e245d3fc92b3b6cce5571895bf251eec0f9d23464aa49348452a8cc0ea694bc1f2ab4c65d161b2c54c618b91e1c2b01ce17286c44263969197bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kab/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/kab/firefox-58.0b16.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "7447556d7e0b24a693bcbd2deacda7acd55bc2b8d3e1ae50eba1b099fc9371438ff177629cac10fda9a071d0c4cfb3d5a9247a9a26e9983287a004cfd9759538"; + sha512 = "cabd14b04afeee4f942613427cf941325fdb455d6e8b668db61c332561408b6964a4cf6980569c818a305f7d53e9240dbf19d28f0dabab9030b1ec5889b010ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/kk/firefox-58.0b16.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "0d51d10675e1e4bdfbb0d950e01765c4444ca321de8b4d4b9de5e491b092ff6228da38c104bd7aeb1313ef869b4e7f44e624ee5aadbda0181df17fb5fed7821e"; + sha512 = "ef9418981b176d27569d6fa8b39bcb2f23c1a206b80af0f01b708df5714dbb4c102e229cbb54960f2a8029213bf65781103812d43951ca7adfd4daff9787e0b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/km/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/km/firefox-58.0b16.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "39c765359fa3682e24e4274c8d57cbbf85757e46de0752a3fa245f25083d4696bd04bf0a3c77a909513223e71f98034706b8a430f1421f79bc8c5c45e9ee2c54"; + sha512 = "3fabcaac7350041d698dc873c957f006babb2ef5efcf62a602b64d1847f4815756bc3e6558a4437a18aac4d9ce7cd4ca08807311a133a0bf19071da6a00eb5bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/kn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/kn/firefox-58.0b16.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4978c88d069114919049f6912d7992daee1c6d6c1e4c8badff395102a70a3b7bd287be952f1d13a17a338ed84fa2ce60c8c0c6af90d9f20717b0a13c4d982ae1"; + sha512 = "b3173618fd5abf28a9f9359de9206733a79f0931842c756ae483e77a80ab059ad091f43947e97de900c9c66478ceec11344a59c63170a6f3cd0aa617d20979a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ko/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ko/firefox-58.0b16.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "abbb991b9794b8b3ddd6f5ad6fee318917c3eaf983bee9314b57077e10843867f9ec51011af0a6f60698bd89a48a412c99480f5e8220e1f9290c5a894025a46b"; + sha512 = "9965554bcac44574edb864a9d3e3f1d8ce49aaf7ba35b4a2c4a432912ad21a4863724a0fbd9834389d42435ef14426ac5278bffb1e63c9ce7a00fb4d9eadce80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lij/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/lij/firefox-58.0b16.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "56d4003a4a3cea35040caba319a12c8d651c8d3c2f78828e61da734d5b2c219283285b80d4a05ffd3879cc1082c91e8182ee8b02af5d278c23dbd930dbd19643"; + sha512 = "f1d7fd19d55ce155140e5d736483afcb12704cfcc9d96ece88b24ba96aeef898b2d1ae8cbed0915aa5925dc44e62ab5ea636dd30cda871edd9856b6d007002b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lt/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/lt/firefox-58.0b16.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4b05b042c880e0ec84891545c8610c0dbb9a6b68a7f711226fbbc32f07dad8f6a2b58d74cac35fc70d8ba797771bb0d8de54f2b7fca6cf94efe2aa78d409a609"; + sha512 = "4bd34dc2ca55f2835923e13df1b557cc14c7b4faec0586e9cee00ee8f4dadf4610082ea8f8de0b13fa66d23b9c5b79f249900ca8eca7d71a7f2ff22668d1008b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/lv/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/lv/firefox-58.0b16.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "ed21534a306ee94b831c126be09d66a4716f03548af68db292bfc6d05620cbb08fc428f4c09b098b3544d7ac80275ad74302067064052b3e4873b3d96e9f2acd"; + sha512 = "b5ff1a50d8a737bfb3ed150bb2aca37f61dc9aeca5e490b162b3cd530b54356c6b3a7f794d23ad70a9cc68bbd101fab539cd518a1d329c8424400d65f9217635"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mai/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/mai/firefox-58.0b16.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "2c6869b152e7cf381e1dfe97e3b279eeec8aeb6e4270e0658ffdef8c4753620c92eeeb75892698f55c438191e4da6c0c34db82ae8f1148ff7ff3a3c3a35823bf"; + sha512 = "5453774c192d63cf28befe13350c8f205e24dd88e25638c85a13d85648df04590bbb9e029c9897d8532227e52b63f2ae920cb175f5baee7b8f4c5c8ac10c35bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/mk/firefox-58.0b16.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a1f6342e77952dc98165ba6ddc5ecec0136010df94e4c8b56cba2c84ac98d9d3f2808a4aa22f62cfb6b82568b1079409e4a3a38f723238dd063a2c78c542f564"; + sha512 = "6eed8ebf2c9ca88fb13e7fe7158d7cc1ca007c2c9b48ac6bb7e07677bba23d1f5036c1e5548762520426f9837bbd157202b31df8accbdb25a358f29e5dd9942e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ml/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ml/firefox-58.0b16.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "627e4d2e377b49aba9914ac0b9770e177b2d7f9cba2e31a69b4abe3cc0bd994a8f3c13ee1bce79dec41be933efcc80976356a92069559a3a17bc47060c23a3f0"; + sha512 = "5892520775d50f09583b9f8a27d33b4b7e225c0a631c342340ae526bb692c6a51ffe0cb25d5277814756bef4a45dd038927e9083c5e5f88cc222d8607c82485a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/mr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/mr/firefox-58.0b16.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "a3228719d54631e88cd7896c4dae4b224c151215130a406930792e65829ccff6370168c26b1cb1064a4904127518d7a6396e9f62a293d7599712cb0ef643e1ad"; + sha512 = "1dcb583d6cf5fbc387a85a2932ec6b861cbf273ccfaaea8380efc56f77c44ea18a2e9ac6a7919f30ff5999c695d5acddab739c6ce248a4334446b76437982b7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ms/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ms/firefox-58.0b16.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "113e85e78f3bb8f276aff510d4cd8940493d6933cd5c4ee1bfb3cfe9824a877185fcd6e2f21d916b29889387c01888a8d552868686ca5fc6290860fc14397e8b"; + sha512 = "4d58ba31da41b8f97222f88f47a5b7d657490505cdffbd33c9987f3e9be2d097e1af669d5bbffeaf6cbfade7c570ee1d79c3a5cd6ea449e0d2f0a13dde235e6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/my/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/my/firefox-58.0b16.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "40e5686a312ff47d88668d1143fa579d44eca31003b08936b11560f4b399c859c569a461e45a537059ecef17409a5a161cc1b7ef0181f988b1ece49bfeccee0d"; + sha512 = "6e20979cf674a665a05f8f2f60b688ee0045dd2beadc111fa7f705cf9f89140824d237c89df05ce44638b9de63e5d193e2fc515262dd2cb5e3d94511f93adb0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nb-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/nb-NO/firefox-58.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "5cfe30e510299240023027864fc54e5ae0c6ea227feae118b2e68573b0a47b1f823057ecdddf887b0a9544972f7430b467e117d9dbcf75a712c6f704960d6f34"; + sha512 = "430182aff822d8ff31f78db862e0d01ef63aa76a91e37e4990dd70a4fb3d2f509c26f6dae8dc4abe06561ac27f27e19f476b0197409f9e4311ac3cdf5d109bd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ne-NP/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ne-NP/firefox-58.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b5dcf09607b1307418df90868d1ef9ddec2a9a3f212caa9e10a1a0cadd16fc00591b275e7449a33c6cc527639d4d3244effc551d4dcdb8458a05c9544002ebdd"; + sha512 = "17c80c2925bd6886cd05f8ee0057c9d2fbf3b7c382ea33a54493f76499fa11c2db26f5f5ae2b3297dc7254d2e441df988608bd7d0568fba532dd8259bf052c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/nl/firefox-58.0b16.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "5a7f2ed01833cab7c842c1ff769ca200579d02b24140e409203b039b3079d75a26faac85e6ed3d8b836808e2c0b78242657cc1d08d1a8837a26a3de599ffb5fc"; + sha512 = "7017ae213ecf858698a658e8e37fd4f0cb27ea060baadc9c475384fee51a3ba0268695a204e3e6cb8e8748d5a3377ddf8d50409028229f49f300e746f85a25d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/nn-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/nn-NO/firefox-58.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9f9a1047c106c3a94693b62a953d3467592373776dfb65f2edd8d21e9ddc880ed1e653755f7cc3d7e828e77ade67399d6cd91eea21f216a69ffe1f7275f217cf"; + sha512 = "794c44f12a97b6361ee4aa2e4dcf163a6e7c56d2b12a8f2ebd5f1871328f6906da20a87d34cbc8e5b865beaf5595bd377506f234360195ca0bd2684fae8468a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/or/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/or/firefox-58.0b16.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "d2ff687eb536faa2c04c9c2329609ca2b8149fbba69104660fef1f2c983819da206d6f3976592175ea6a2f0debbf7c6f52dabd0f7d5ec4a0c4c79a34b99e56d1"; + sha512 = "3220db110cd52c373087f064ed9be0531ca9b11a38ea340349cd8e4563ef81e6f3dcabc0addd0fedb3142e81199e27f5605414b632ce781b0f3447c8ed31fecc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pa-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/pa-IN/firefox-58.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2e1823126cb95ba1e397430c5cac4fedab93fa340c3c1b759bed8198abca37076dbe40ce5bc8e5901a307c4377cd9d6356984ed6e058f22048efbafb833fb76a"; + sha512 = "e7404f4fb11d0ddd4aeb35eb0c6e73bb67073ad46997745e6943b873bc0dba63057b4495b45281a5061a6ac99ae6b213c48894c06ca016e7fb06abf4ffb13185"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/pl/firefox-58.0b16.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e6fa41fb0780acd1531f025b31fab48440b6e5b4b4aa2220a77a2ac2aa40e26adf6454b495f61dbb4fa19c30904533ec4beeb5e87bfd03fee5fb048c8a0632b1"; + sha512 = "76eaadb7f21eaf7ccc195a56bf4138b9e3a49930ab4f593bb117bb237322cd7a978815b2ed078c403dcfb7b58f38c0c35c5d9850ac12a116b6ae624bcf3b4c52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pt-BR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/pt-BR/firefox-58.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "355dd4ebdd0c1e1e6af018607473869183a892d638e0e86124f5463fd2d25170b9edc3cd7bfcef672cdaaa74cef5700dd1c3868b6cd9019761a4a0d1065ac3a6"; + sha512 = "cba5f42b4b1e4d01f1bde90a8f4a1edf20688fe9eccc1625e86d8a6b96574ef1696b150b68d7cd21bd6df4d0370bbe63bc72e60a5dcf5568112ecad5316415b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/pt-PT/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/pt-PT/firefox-58.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "afe2e095fc5bdce1a5637907523f9ac097695392aaf496f34d77438974262853273b9b122518d27d67e30330f5abd54b02cbad19afe4f254d6928f235cd77cb2"; + sha512 = "6d942d0f982e0b75d42e3db618bf035164114b7dc37317a0de55b635d5f340bcaa0bd8cb60570dfb2e2a1368ddd6713c64e5f72eb168122d4078170a4b83efc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/rm/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/rm/firefox-58.0b16.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "666e3ff130699c8ed50d06a43c82fc7c1afcd5336bc29738272914acdc5a9d3750977d45570c37ea58a6b117b772d7c2de1997272ad37630c8eaddcaf3a94492"; + sha512 = "df790c5956dd79b6063b481107811cfd70816941df4e2c7338bfe142d51047be969aaf2b93045101f8cd4641e124ba2782e217c616c6556737431fdb225aa650"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ro/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ro/firefox-58.0b16.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bdafd6443acf92fb17295a140c3fe1ecf7c792d8d592745c271c710c1a7118185b4c0d40c8630a0f363e60acecba942448a7e07e018a869ab5381ded6c2abe3a"; + sha512 = "b14f4c8dac3ac15f6b8e507b0156fd8ae118fc173cbf1d627136ee6cd2c006ef6fb8165a6d41482975fae74105c766bcc356fc04999c0526dbf9053751ff69e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ru/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ru/firefox-58.0b16.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "c11352e47be8b8492876c57535392e2cf5f9c3dd0ef0ab9792afcaf31cb5cc33fef38911c495369c1ab47b6ad331aa9df876401b57c010e6eb7f0fd3fc972930"; + sha512 = "f69a573123f1cb92139e9893cac2923ecefcff8af5f33704155b8563e5acfb27b27ea397ae6df19b8a57dc9bc5bd6891a24e875fa40e1d0908641467dd9ca60a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/si/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/si/firefox-58.0b16.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b84c48da9c61e5770fb231a632cc135aadae4e8631f13d93f46715633c510c75e9584de9892b02683471b40bbc33642da296242ad5560a708ef9e83258a5c9df"; + sha512 = "c5fb462d645f576cafc08aa4aef7f24a2f8f06a158e3916d4d22abdab9ca2ce080cf08512b1342690e70750df732e0b4f47a2454caa0ab2ecb878e6841848ebf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/sk/firefox-58.0b16.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5d5a6d4b95e44838d58178cc1854c2195bed7b1243b355b568d53d8ef9e88e8173e5e56bf68af1f9a050ea0a0f4b6396cacc158e86b3dbf60d3cb092ab9dcc97"; + sha512 = "daddfc298957ab8bd74cb448647ca91dcc6c2e2c5f920e5ef9682975b1ccba22e9822d2a117f93f9d14feddb16f57a5726e71f5f6b49fd6ae4f06bcd9002e4ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/sl/firefox-58.0b16.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6c5132b3afde69ac5583ea8e36f513c718b2e79a7c0fe28d39a3cf44ba94ad5851088983806977f9035a26c2f56e1388f6d3ecc505abb023d1ecd82c027154bf"; + sha512 = "594603a5670fd3cc3303c4414edd38632eaa179f62dd769983872c960e930e4b38aa04f995ef31d9a6e53279641eebef465aa959ebaf65893548c342d88507f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/son/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/son/firefox-58.0b16.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7b6945574a142c73d2cedddc207d1ef9c2e49816f0bd9ebe278ef52e4340627fa17d317c70020872ff01f475ff641196f8c2c1a34b6438866e84eb6c5b1407d6"; + sha512 = "2580542164799cd8c39a9d24c54b7848d120cf2fa712b338afcc4d4f2eda7024ce64df5b027c100fd104a5369f710cd394e1b8fdc649fae3efb51650930efb49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sq/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/sq/firefox-58.0b16.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c738c5d3fe217e21ec8ee42c79b7dde9c12e948efd70298df75e720b2af380da301520f1aeb433270efc81dbcd61a38371601f0a30ad91bec04e4ac2c7c8700e"; + sha512 = "ce7cd371a46e2de59be2f269e91443dcec2609a651c6cdd1fc8e348a1f83f6dfdea6854e6730e5a3434fb3d0a56609a3e73a6b02159180dcf1e0e513bd8ef428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/sr/firefox-58.0b16.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "09c3b2e3a46d69dff83f95babc31204af6bfa2360d6e970e2398ec22c6754fa6bbd4431ece822004a120c23b8a38c354e665dbad6b313c90013d36b216ccfb9a"; + sha512 = "5360228c1217b6b1388cdfd928d6d056807655c43352457c7292325a535b74116ab4d196f3121ccfded7ae9b4fbe46aa85d7b24ce09a67665ebf5149bcabfd2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/sv-SE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/sv-SE/firefox-58.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7e10ccf0ee053128d81560549a9ae4a08fa4a02a79c233cbc1e3ab520cfe1f1ac75eec0535754dc43e4390ab32d889427004ea9edc78b9bfba14a66818372c48"; + sha512 = "c1f5ddcf08fd5c3637c01920418847751731c6b243d78034f82263b6ae34cb06456b8546d566446f3a987acde19df673ab7fe908cd8c9b37fcf3c291718d5c79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ta/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ta/firefox-58.0b16.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "3ba269ced4f8ada49cf88ab06a574f36da86c3c144b8fa9a4f687807688b7abc1e684016e34eb95cf31965fc6b427905bd717354e9d3ccd3349ce15f9f692f76"; + sha512 = "6ecceaddfa53ddc0d1f293f6eee719a8b06d1e497fef516ddbbb8a24d720363e9662d6f1f642c71e94d14b79d8c2e91224e09a97f0ac60d535074cd4ae2be31c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/te/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/te/firefox-58.0b16.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "9330e1c258b53a9ef9767e2b3a5874ef48815890a69d40c879dece79ac08e2d8f22a5fa2335329408520119b4c76c7642cadbf8378cf3c7bbc6f179da9c02228"; + sha512 = "8aa7109777c82a520a184b46e79cf467b626f691e346578002b6a9685c2beb77d9255d5acb832c301fb2b8a51f31957b7ebe063d657438cd567c9096f13d1737"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/th/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/th/firefox-58.0b16.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "541a504d4f672a25465d626059bd50423eaae443bdee0727e4d5c074f2d94adbe07d6dfa0997c3fde904ed136ed0db24be34d00c94ca50d23caf9414b8fd1c75"; + sha512 = "34df71fe82cac2c4294077262d85d2efbc441228cce781677c1bf140b4ade724fc508f4d20b2327f71e93be23f61f657e42679b058df27e7770c1300e8a27d5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/tr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/tr/firefox-58.0b16.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bfb1a3096a12a28e6303c97d4d970e67eb5695faf5bc63f48edc89343106d1f6c7edb8f2b8e47ef50c0762de43767a6c1a2773a5a9eb749834eee064c1530d78"; + sha512 = "51c0dbb1b4aea6e503eea66502a966021cbdaf6569d2d9a1345a0eaab78fdceace959cf2b7adcdd293f0be454a3d9d957da41ebe693b02f4873ead804fe20294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/uk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/uk/firefox-58.0b16.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e9c0257bdd73d4b7316cd2af2fef0619de7ebc35b7e296a6dbc3bba5a6f9083e1fd4746b54ff6b52e8327934de04f1afc29f0a2eaae2832602f0beea3c838b65"; + sha512 = "11a074d1584654d5968afc4f14ab991f9d316fcfe73d4fb7aea523b6afcee2f503c0434d8d1cdf68d95d1dc4d8b962e568909acd0821a7d58d7b92b367c06fff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/ur/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/ur/firefox-58.0b16.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "218703e174c4e7a7ae9a2df094dfafc062b1b34408383f96ff57ae6098c9135a280e480884b17fdaf93194a55f9c830083f06e1741bf9db494e69455ad237d53"; + sha512 = "51a5df7c247fa9dabbcf7c6c6f4dbd55f1f5a836789a1c1f66729d346f4fee1ef8d6133d151752334e771626cdc6c82fbf4625927b7d3de1e34af19dfe384590"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/uz/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/uz/firefox-58.0b16.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dbe9ffce9a7ea307d087ba914fc83cee5ba624b97cb68f5079f2951e7cedd42dddda2d0d139448506b9760e21ad0052993dd045072acb921277747e276a1ff0b"; + sha512 = "29b90e10e21c30724f92ec73735ad949f17c1a0618c3124a31fb36f6616329be9956dd881bb86c52257fd4fa00f21a7af977f9a1f2abb7a4e56d17eaa5685f44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/vi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/vi/firefox-58.0b16.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3e44d51a2b071ad7103046af3d7d0fd4c17f7e57a67ce1e5547d8a817026d41360fbba5e9de8d2e234a9ce8a8c02fe5e868f14aa36ecc0ce6f2b42bc5137062a"; + sha512 = "6c0c3f70e3de2118511e1f7eb3c643ba446d7d19b21da596f6795b7b2b8c089c0c257e961310a39f6ddb257205b2dae4deed172050e96c717de3603f3d7b99fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/xh/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/xh/firefox-58.0b16.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "5eb838d48f16fb16d08abe3eed4b17c24bdb2b8aa5d9e21c0f055f0353e0e567af4aec840291e7e882ed0b29bfd7c17a0cd20858a06bbd850a8b2e2c2f92feb2"; + sha512 = "08a898ffc8b170e2d1d5271492ff1775744a064e5c460bb0f3f00f8d6b36aeb8af40d0aa925619a6de1cde070a255775d7f6f93597c2ec4560e33ba33c6d6ea2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/zh-CN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/zh-CN/firefox-58.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "9c5769eee60e5506cd26278323541a4d12b6bc5cf1df43379ada8a6e3f6fd724c2acdb0fc157906ec8e5c25f7f8e8aea4757c9a0f4c4b3b39abdd583f3881d3a"; + sha512 = "16c4b78fde34ecc45c1babb26d45a3db4cd0b87a2c9cf929c17c11021959f34b048f9fc83e62e0efdda5817769ad34bc6fe9c864e047487484ad8426fcf67b6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-x86_64/zh-TW/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-x86_64/zh-TW/firefox-58.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4fa81789df000057f25fc57bbc0aa5a9222a7e6727fd9b2226686b95072cb1f0e381e9dec0741b11199cf29c180e40e53bb405aad57a445e3f311a1d98ba7f8d"; + sha512 = "10b3bb67c453eaf60df9e8073fa1444bb5ee2959cadf38eb51222abf4027e4265ed7560a21a80b8abb3612404b8d8ee93bc6199cb5031efd54f7eea698056fec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ach/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ach/firefox-58.0b16.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "d0080a29b07af0ac0f97fa74a5baf5095050c9647181dc11cd2e11dc9dd11f21d4a70b3ed3cce97adca6ff33e541694c95373bb257957e447f269007edfb349b"; + sha512 = "b2f49db270d6cfc31c0c52dad7bc165fa7583dad0367bfdae0bc5d30994f87fb2bfbc7bc5142ecafaf1fe7e6e48ec5925197d6fed2e479d62e62e136f954ab61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/af/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/af/firefox-58.0b16.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "7b717d6c776aa85ccadbde1c97197c6390319a9e52cc773500f1b2d9aeb4d87f8fb24cb40ec8a1cf03e07f37bb6c353991acceee8658ef6bde2727ca89797e18"; + sha512 = "464477882d24899eb9f1a44156e753224f58611ec21ecb34c2e2facb05e8c33cc29e7c93a47e04350796f16ca38b4409d20a17e296f7c1584b2d84d327c8de82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/an/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/an/firefox-58.0b16.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "182f472da76add125a45efa28aef4da9f8c0bde22eb8aeb1aa23d7e22f9beca7b8f013862fa6da61cdffda3764b57ef57262dff3d6ac7a8be97cf5a60a1d7fc5"; + sha512 = "b3652bcb1d691c637745fc0822715a4a5288eecf60992d91f5887f0f774c60dec3b35f8f86c3264437c8c575db9d144b4ae049b341984fc12abf1dd58cc4291b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ar/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ar/firefox-58.0b16.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "0363f67250087481702b535f4e6ba475fdbe87ea13bc8f3dbd324a5fec6fa0c3513902160f8a71fb7be8d7798bd37319827261de7f1199bda849b735a429cd7c"; + sha512 = "5ae0270ce92c57cdf002b14358aa1fb11533dd8a72e7623f0d962ea644da6945a4d596db7772a8a0fc47e08d94e82dbc1fc189206740df1f238b3517cc3eb81e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/as/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/as/firefox-58.0b16.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "19bac3ed7fb19378104bfcd8367beadad65a0e274bb631317114f8399119d8570cf8499ed28aec089438aa82a7fbbf868f9fbc4dac2594f83452923e898a4a04"; + sha512 = "a952c3a4b4271f668d2dd39cc3f3e77d5c1dfa2f3a560eedbf08d58cba98b0693de60135ca0ac15cc3a8d18c8179c72adc782f7e42a3f9487fe799de4e26b1fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ast/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ast/firefox-58.0b16.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b8cd86f8a698c1555181344babf8622dfc2581113abc83a793c76805141495a62f52ebba758fbd6f2026732e9234b3c677f59b9950a009d040353e24ab56f51d"; + sha512 = "cd130039b5ee2d4b7ab5b41624d03d50317d44ab45b56c704bfc8a8846f6c18180ac0ea90602e3836596b2d57646c2929e94d0265dc9cf6464795e9fa076a149"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/az/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/az/firefox-58.0b16.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "f4f0d456680ba0978e0bde5547af4dc74747b7cd42a1b9276d68f6bf56ffdc66c6bdba7508f7b410493e47c71dfdd4ff2b87497575a388beac2dc0798ed8b3b2"; + sha512 = "24cf4d348cce02bd1b1cc686f5a32b903ce96e06ba669ec5b3470194f5eb26b2f63577de2e533388dda484b69348478d294024d29b993fbdca65f66c3341f793"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/be/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/be/firefox-58.0b16.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "31b117154f8304a98261a2103b1387b36c47badec3f4a0836d2d808bed6dc9ed39b956bed1b540918371d583d7ddaf0005e34f0a2d43d8dc548d5a68c19c5957"; + sha512 = "a11c6e6d216b365217879516455e64deea77f9a1983efd396e92a421bf5f24b1201be839a76f2af276201acf75c6fd79a6d18cdf648afac9ef357d9591c398a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bg/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/bg/firefox-58.0b16.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fbceeb960575eb0592c56f2dcf534e70f3a78a0a34efc004a982f642ce48491649fb267a3155e833b9a17d760e74035b8175c73beaa9b2b2440bd59b623e96c8"; + sha512 = "0b5b9ef50c4608da78288c3bdbf9b69a9b584bae49989c5b57bf51bd2c9fddc29d691a28707cd75b4b9dbafb806ac949425ee60b1aecd982a903272b40840193"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bn-BD/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/bn-BD/firefox-58.0b16.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "97da1cd550613370123ee4cf348b458b93c13d5fb5b53568bc0a85fe9c7894492755380b519bf43bb6f4125d4029274b6b960f369c13e277f797fbb8e6836cc8"; + sha512 = "3fcc9411bd1cc7dcd2e427c7e19608819da18ccbc34a644dd4d7082e46d7de25e22ecc7d96c839577fe7bf452ec15646965496e110db6d6c58dcd996f88bac5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bn-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/bn-IN/firefox-58.0b16.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "fccf32b2d1bc54cf638a1c52a03efd3ba407277f704667906fae70d3a429ceca8307e576ab13c084bcfa11cab372ccb765c342128d9c9caf015757cc32632215"; + sha512 = "f927ab9d0c52de13fac91558128002dd5a4222091d17f4f323055fa3e29db25059e39dbdb4ef700e2f7245023ce654bf82a011022747dc581bf093ff6d985ce0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/br/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/br/firefox-58.0b16.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "1cdbf2df7bf071a66bf4e3e9c7986fd38200d26106b7d8258fd434af477cd62e950243bf211d7fd613ec5aac20137a13a4e46e9ee38c38e427fa173dc2f8a02d"; + sha512 = "8e9dbc88d3d1dae684cb5419203865b5c899128e204ffd165e99836740e4f4daf910cbebe907a7293cbacc851d15ed4eeb996392f6bcc15700aafabaafb398d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/bs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/bs/firefox-58.0b16.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4f2476835f57a96f069623b983b3a09ee48f043047c9778290d6756cedd4b87d6e9f95176a5a3910b69062ddfe4b37ec122d35c27cb612a70cc8093bff191821"; + sha512 = "4a887adc2450e86ca342981de56f997ceb9655a6e5d824995fc361983ad71aa0df389672ea522137e72982bed695bc17df3e738b9e55ef5305478d431bc0c4a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ca/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ca/firefox-58.0b16.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "c95813a496f6693e721d51834ba73a8153bb123639645bc2fd21921850774973c3eeda187fa5893802b38630f2f8f3c8a839c468a87a92ca2584f176f9962ab9"; + sha512 = "d1c36d8f1d3ccb912c9cb973d4b97f588e5b6bb0d6ae4e081cddcbfd9239f4196e68464ac847996ce1f4418ab55d020d152e548ad769a23e5cbc7d7169faca85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cak/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/cak/firefox-58.0b16.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c3f20e2d74d032c9b2c8d90e4988730ce8eace5e8adf9c5643541ca23a1bf9500e28edb18b1b2a14d219edf5b6561701c17bb38f98e3ef778a78b4d3e52846c5"; + sha512 = "24aa52da12f1a5b4731aace64dfee42a6fa30aec74fb18eeae6daa63d2b53eb062500b42910ce841cf4ab10839065b16f652914746633c12cafb365767b8f5cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cs/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/cs/firefox-58.0b16.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a2624eff32c09ea55a46951422df4a42a12c3f81db8c14c4661b76c4dbd353bcb68b42b8ded349b32b99b04fce4d0143ccdff7c58972cec098ed46d3c334c5f0"; + sha512 = "01ec9cc2ed12da1ce2ac0a3085bc10b2ded9402d66c73c5e1ebfe007ff07bd7c2384f7949bc0cb2d6f7dbd2ac24c7273a073b61e1aaaff1e8d7bb630d3ffc59d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/cy/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/cy/firefox-58.0b16.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f8890e21bb3c771cd635dca89789abd2315cad1dfa9459c46694e59acc09e274195aa0f9c267450ac09fafab5f6d7a30fbca7b2430c717206f8cddb0203f89c2"; + sha512 = "755ed1271cbbffc4f62add75c0d0cb370d32e5da992eefa079011cf7eaee6e9d221659e7b96c43ce5edc08c3178e4b7a5b2b798c335b384a5ab130d670229043"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/da/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/da/firefox-58.0b16.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "752567ce90e3b832bd33a990f743d92995856bee9edfe0de92f7bacf2188f1714bbfb13c88a2eed03b9ab928f5923c33065933b5a71a14da113f179abe8a64f8"; + sha512 = "1ccbe539b63a83e82f92636c35c9a88ed51a3f183c1f9bf2f7843e4d2117eb40aa4bc32d96bb1a4bb4aa6e93dd0c1a67de20b7506bc8b6ca31886d164fb43bb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/de/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/de/firefox-58.0b16.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5704fe4279251a58434ddcf43d3a4e84d2b773adf82c865dc553df9e13a3f645aa5ede0290eaaba4c5f86d55fda0b8ae92ce52f9af7a3777a3adf1d997314fe5"; + sha512 = "02cfdf55e8d3638af5d6d6f57c7fb9892ca0923b11da8c58c7fc045aa28db4f0da6fda3dca73f1b3cad532c7a3b2865aa8e6f1e84c05131d447173a8c89fdb8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/dsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/dsb/firefox-58.0b16.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a3a540ee34cd22ea0bba8091ba65ce635799404e88ed1adee9d89e0aa632edc70688fc28307b538b61cb32bd376137f129007f932aed32d4a4967d145d39572c"; + sha512 = "6db36705f80a7add9c8922c2563b6929096ebcd1e67f1ad9e492e727db3dadb0cc3995be9be6855677098bf8d4783393bb9b093b925fd249d705e31eec00d3bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/el/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/el/firefox-58.0b16.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a23afba5a1400bb877dd98631912ed005e8006805c0c0d10fca1bd8f47c704a398f4cba7b52bd2f6815246c067fc89d18213ec6ff2e353e71db8af22646cbb94"; + sha512 = "c80333c9820697ae92450458447a0fd6d5279491f288568809e1723b144bdaa9540fc2929bd333703243d00633b37c49bd42ca9542fea7772466626f1dd6038c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-GB/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/en-GB/firefox-58.0b16.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ad1a216d2f05ec9c5d69b335f3c9cc2f0c36cb1a5882ca344e74d5cfaf80c5a0fe4e020b957a3623d5430913859a6301f602b3104f2b91dc11b1783cb7c33c3e"; + sha512 = "46e2a0a9f46de87e55921e05fac7f20858bbe3f723bcebe1dbcff98e59f7ce04b9992933e8d8bc97fd82578ee94ba417eaf9c19a4ceaf1ad09cad93e0e81af85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-US/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/en-US/firefox-58.0b16.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "942f87d29a4c599ac7fb68bf5ba558f8dfc220f766c0103becf319dee1465b40f81d47833390fa004e38c57bff7a2202aae40c787c7a59072c4423b9ae33aa15"; + sha512 = "6aee6d05fb20c1c1135d0965e51f673c85e38d45deba21cc8e37bc0654b76867b2c900a1166c6752cc4efc6776439e7a121951d482f551b3c6390b17b32206bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/en-ZA/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/en-ZA/firefox-58.0b16.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4526bdcadfb31701d82145c96edf8bced38ebe4248fb952c3482e30f1e9e673f300a9c3c2f8f4c21ce32b16f9ed471ce6e63d67483c1c9c5e52a27c421e6267b"; + sha512 = "b805ce81736fff148343aae8a5a25f4164bca5a8a3a8d21ecf331661a578d10e522fd162d4854936deff0dd8e8a499879929fe69912be8a92f70051eb0c8e4fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/eo/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/eo/firefox-58.0b16.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b75e5a1dadeee3104de6467806196f6eba4dca12eacdbc3bd1de9c6aecc922a89fba081a931a6655ff24f0087945397a8c0ff89e82bc4ce1359ed9d124be8163"; + sha512 = "64a0d4351b7c3942fdfb3d7e853c3424372080b6c67e462a75f52524e2ddaaadc05506607ef34125c98797e2feb96a683b4ad6ccbe7e5e0fcd84bc74fd4b0ac7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-AR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/es-AR/firefox-58.0b16.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a4b11acea9dc2105cb9e14d8714f9a66cabcd6e0a34684f74b27e004b42dea33a549e4d6ba427a7e65a5119c722ede3616d04d08660ae5b8eff4aa8b8a4d5b6c"; + sha512 = "1407531534de2a0f3322f6a58a03be7528b939377b554fc98a88e7a3758277e25140bfbd491463c0cfddcebb08e8efa1c47ce1abd8218f8ec858bdc527c7b8ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-CL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/es-CL/firefox-58.0b16.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "4f493a379dfbb53bf46e9724da396ce03460ed803eb12752453b11f7149d11aa5873efbc9f3ef22fa17f026dbf591861af8374de349bef91dbc1777468157f26"; + sha512 = "54c6ad9086a4d278b8291cd581fa6dedfba3a219ccbfdf0a6ef817370e2b65d60dc275b5c8fbb564757b5096863a38bf3142777c5f94c355db04e86cd056b11a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-ES/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/es-ES/firefox-58.0b16.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f76995efaca241ada26d2e5e87f45a86197e0230baa15e26271fcfedb05bceef94e4bb2980a3911b877b1bdef8de4aa060df1758729b31fcb3b80767b65cbd9b"; + sha512 = "46dbc7bd7385f833ee8f3481ff5e813979067b53bbd43d74f47d57dc1749d249a9ea578e0e66848b5675cffe038ff6589a3a759f0d664f0f5e8ac705f086c0f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/es-MX/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/es-MX/firefox-58.0b16.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a9d2e7187746ea3a970987caf2e31b949080a9a66f3baf472ce75f3bd81979a7f936ffc43915fad9bcd4914853adc6b0bd509d23413814ee32be31f254ff27d4"; + sha512 = "9fa25ea209e3bce03ef4dfa095e2523519ce84b03c955e28b6999969022e2139dacfb0facffcdbe4bcf98099876973c0292e62095c53542104f347aee0c22bde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/et/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/et/firefox-58.0b16.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7dfced36d543e99fb027caa1df40fcc0859be2c0e48759d25b9d66fe0729242acc8d5df15e21fa6c55ae7b1d7bcdf6a57ef0698ba1c83bc44cc6502d6c1e7b27"; + sha512 = "181bec09c74012a30629643953d73a82caf93614e5a08173c48d0a4a30137a8c57202dd726bd6ce8896816f8ef7309b10c8759268af7f693c36b75d9b55b8ebb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/eu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/eu/firefox-58.0b16.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "0b9de898cfaaf162ccbb0c4563df00243d11888d4143726d2b68aa53c5bbd32916958ba0f712ab02007d476bc466791cd257769a18d7106c958b6cadeddc5eca"; + sha512 = "1662af94ca97b6fa2355298e0eb98ff46bdd2e203dc4ad71497f61a9df73f31b6c5fed92e024155639730c4bd9f06feb63bb8fa7e113244735977bbc3f74ec78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fa/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/fa/firefox-58.0b16.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "629e52dc8f1470cb7613b679465ea5db5152bc35fbe4fcdd054dde862ddcc2c65434d99d53416ae348c4f00e0404636cbbc557842267060e4b4a2b3b6b3d26f6"; + sha512 = "4aab0ee263d657f3569ed7be10477f30dadc6d830ed813f71bf8d34f1776469caecb74c1804052c2162dee7dbd62f5305e3f7853d8f695d0b1d41eba6d5bc50f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ff/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ff/firefox-58.0b16.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c370338497641010b7cfcd59518c87726bd74252837c1bd28d978a56fc65c411ee243d620e010e3b5331242943eb4e7b0d5b620123685d469380d897e9fb5604"; + sha512 = "d9a41b6ae3c80c52f8862db8b2bd2ae4ca19fd8915e014ecff7c48b5a7a52b434621925358100a6b1df28d9a4bb5e9cdd6368de1d2d321f4d4fdc1bc889c27b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/fi/firefox-58.0b16.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "602ce02a962083eb1d8b67b3e271febfd16e3a01bac50a037a44a79223836b70f66cbec9329a31eda7c8fe72dc5b6ed582166ee1bb910a1eac7fc638185896fb"; + sha512 = "ed9a27eba73a3f112dae6b60735ef765c7b211c8f27ce6db4e7f6b6ee354b2f99f699f6a043282a259cf3f3efbc28ccad5f9ce7fe2c36e9b6c58033963e9acfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/fr/firefox-58.0b16.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "81211cce231f674d2fc01c4b6a775892abea8fc5285ec6f7b50cde63d0448a1e7e60ac6526c9e51ce0decff5b4708b6cbbf3e31b495396a4a6b87611b903711f"; + sha512 = "449b9d38734ce8689b4a3eb63de317fe3159e07466acf92e28f5595307291ca9c86cb9ff791e0381a8525995f88cef29e6d42aa0b8acfba9073aa7d673441199"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/fy-NL/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/fy-NL/firefox-58.0b16.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8c7d8347177e8d57a6c93be6fca4d98e62ed0edbffd48bbd8c1b2bb688f6cd5d861990942359b8ddd4841cfff78c14c783252f55a2c9d9c70fa7e6f7806f6a4e"; + sha512 = "790c4dc8868b24ead76c57ef5ed44111c36a8444f38ab179ddc3563dee9a47638504086d192014ec54d18a14ede42d13fbfbdd05c47ac9b9b05bcb0df74d411b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ga-IE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ga-IE/firefox-58.0b16.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "85661d0aea3cf181a27e07269242752d712ae73b5e172fc762f9bf7a75aaabb767450bf6da05304810048d3f4604f1a62372f73f59ac41b7cd6f6a377de8d7b4"; + sha512 = "a2d216789ea5c0c40ec4d5654e8cfbd7820b4293010fef45a8172f00c7656554ffffd2a37453ac11944472d5923edba12b206f4a0c228b1431173bc8de919a00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gd/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/gd/firefox-58.0b16.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ce5fc8a2532a3a7648e4029dec08be5cdca5d5c7b1b146b1c1ebe89a7f4b5737cc103ae37dda9a39f41099e33cdd5bb02b98dbf342bf7504a7cfb7f07b371881"; + sha512 = "d0e6fb0758e31f0a5180df549edb25e8332a81180e384a80b53d6cc919c8898b733689c9397702d1e387ceb2d046045adc4ada6f38c0aaef1782bbd9629f445b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/gl/firefox-58.0b16.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e0b578e746409cf5615578bdd12187b2835276d385bbc8f6616d9acea3e170c606f590c83380e22436df10cc8ee750e26844e19117ee5287492530725bb03083"; + sha512 = "caf60ca23d077ee89ff0058762d891bab081c86c1f10a824e1795f05f5db2c88f76ad84d1c0e9ed1bdf1fc06178c6da6e3fe6e6063bcb78241cd1b8307aee65c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/gn/firefox-58.0b16.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4caa21cf4abc8377b900f4a860afb634affe5af96492a71c820bf6cdc47362d729626f4d3e61999dc479bae6aac2262820e89a0c6347bc9a1bc42c3c3b90ee54"; + sha512 = "5996357131c82d45f2b11df350781971ad58d29e35a8be6c26cb3fa9ab139d8fc948da0db6340289fe028cafeb29cd386b9bc6dd3fd67ed255ed7ba47ebbd7fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/gu-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/gu-IN/firefox-58.0b16.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "c8d0a2538e0e7fe0a89d2fbf78bb8d7c238d3cb0205a014a5ffd86b193a08f8aeea69d326af75421968770a02bc7c42e2cc9eb45c2d864ff75296976c2579639"; + sha512 = "60dbf631d0a8ff7d6bc340af9fa977fad6f5a793f2bc6e553d62c3bb2b70d224abd37b4547c38ee0294e56e67b725751429c711a9011e6b36e18fe3df6af81e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/he/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/he/firefox-58.0b16.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2935084bc4325774aa0c2019c905920c265b569c75eab883e5bb22765deffe1d5bd1ca5affd92fc8c2375f32b969072c247f821e6675911d6df3b9f6ca46dbc2"; + sha512 = "8d3f35a8e935ba4f53a5dd56ddd2c9e40499308c8cd768e380ab5ac55423980a3dcae5e9d378f2402a76af55725e52e73e4e4f57adaedabeabb46dca97864d73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hi-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/hi-IN/firefox-58.0b16.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "6b86451451357a03b1f317266f7ea9e31850e3dabe4d9b163098837fd02bb8ea3259b9d8455880bc5277e79657f6d803aa001abac5840c1f2f476b27088477cd"; + sha512 = "f12bb03b12521539afc27341fe61ea0e13394fa180273a03ce74620cce1076a7e69cde60ec2911307a9b4e750e7dfc13ff2db3b1d685efa1d8198c36a88674be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/hr/firefox-58.0b16.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a2339794b3ec17a9f77ce4fc51cee56508ce0b3002ffe1e9f2dba5e9f0c154b75e2f9b0728d2fc1775e031ab364f754f225eea018f22bc5ef002214a4dc80e1a"; + sha512 = "50f79e812354edefa7707a2d1411323c4b3bad47ef1abd24ddb0f81f9c0f3171382535aae6c96e6289cc38e90a1955c7786aca0f789d79896ab6b0df6705b813"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hsb/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/hsb/firefox-58.0b16.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "dad69a26aa1a9976bd436c2964250d0e6ef2cea32a4880324ac44079c9884b2d7128ca7e9efc87e8f031621e19f76bb244f669e6de29be8df2e7e20c5f5cd4d8"; + sha512 = "c87072bcfc4855c21114b8eef6b28543308f1834737aff0f6971691d0e7927a0ebd9e1e1d357a31eed59fe8b8a32fcd3ce5a7a944c5cfd7505f508c67444925b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hu/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/hu/firefox-58.0b16.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6e12ba7ba5fbd54e523162722b7000e00bba63ec9c905067dd4a2812fa1d480d78f8d6fa5624f08c94819c597a7757c43ca88736160c3e62a19e0c36b7144e3a"; + sha512 = "8e3f47ae73f0cdba673995d40414fe6034119fff30b73b4d7686c6a955ed9db222e88ee3214a55bc796beddd1586540328847a28dd5b6ea0ecb3fac3fd8ed746"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/hy-AM/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/hy-AM/firefox-58.0b16.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "8b94251356906404aeb35b317f43153b4474bbe0f53e7c2e4441fc9a2dc2234fb8c6997dc39420017a25f18ee2d8ac3d28c9106753f72e8082e3a40af0f717c5"; + sha512 = "7bbddde249002c31baa3b8decd6fbf0d59a40dbca5a62353ea694d126ab18e52e0dca1a29c9002fce6c93d9ea9e200e5a09be9fd66af4f6124b7bd0525e21b10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/id/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/id/firefox-58.0b16.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a88ecdafdb7fb61d0b477deca2e608df16dfc1fb52a0ae34d0571ae4195e9c2b633db19c78e7aa254cd48e9184706844c02a22c553f9d721a5ebc48392335535"; + sha512 = "2b9ad49722ff982650c1b24cdd96b329b5133e0b2e4cdfe8e6edd6a4a9bcdd6ec8cd25ec3d202c97c40909c8deebbab71829be651c52382d839c44dfb0c2a279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/is/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/is/firefox-58.0b16.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0f91699f4c94b17a8ab855b5b0c1723305d4c397bb17394235d916ad80911db6bced2c6acc62634accdba913621cab4b99dbf87bc8e0f0249015b2d3a5eab495"; + sha512 = "19f666bdc6c56f7e26d97af6c701725e559623ef82a58db952a3243b24ea4ad7ed3d3e5c8a6ec4a3e8297a6e2d2b45709cfd12643d617749e3cda7152924db94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/it/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/it/firefox-58.0b16.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "696ef6f4e71e72a79fa9472d32c33fc71d021bc25812829b53a4e67f61b833046e637af263c6177ba356aac9218a7375ef01f75a87a9f040ec7c5b15c3aa7b07"; + sha512 = "7b25135e2d94cb4b76fa348095846d1a2bc417aadf461fb8815b05d90ddf6e0294ce8c915d0740145f922553986480bff5fe4cfbfeea6138fbc39c2f8f200f60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ja/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ja/firefox-58.0b16.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "bbf682c758c8e900c8fbf566933537d3b893b56d2948302f44531a9929738d3308bf9ca99bf40d02b2b2e3a53b460694ff36d81abb29a652c7bb4e5314daf462"; + sha512 = "cba33a2a158ae3e5021d5466c465ace0e4c250388fa163db4663c7a26a44cf0043913c6599b3bbc7ebd71cddfb6fa1f969827e14f8f05fd7e99e694f93cdc402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ka/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ka/firefox-58.0b16.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6d55eee1b9e297a062e5eda6cc9a6c420b1539138001a01458cebe6b650c18bbe52f5eeef7397b90ead2ddeed045d9e670d701062ee4126a2b3e29542bdd460e"; + sha512 = "1f053ec5c9319f3d057bf650765a59ce43f6799de18c97b85b00acaa3cf80aac53d794da8bbb48bf89ddda6b612697341b3a424c4b5e94d2b877a6782856dd59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kab/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/kab/firefox-58.0b16.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c2b1bcda181a1b26a5ba10653f6e3a88a80bceef4fdf5a77e1a57499d1d768fa52c9793dbe04fa1e7208e4274db80f270929f8d3e2d3f45238e05e7c3cdc5f94"; + sha512 = "a783e0fb4c5ebd7921e7f9f5440aa6b7a4ebb00b16ba6725e9d795bf0385c1dfb68f7bb620d9a56fbf4cec165fd0ea223212d8086bd5b54d78cbe563f3722a12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/kk/firefox-58.0b16.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "b28fc41e8d91a7088d1e526ca7d6ddd415629f1ad16635e2dc029ed76e16d837b4862696a38336cf258540584657adf9be1c6245007bad84f6eee90c104f047d"; + sha512 = "b37161827eae0a2bc22390d6ccc86db48706434b91ebcdb0ac67ce692098fd014b0c21b311883cfc6d80b48d6bb08ccb02769d436542ce0c2fde1f15153cd3b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/km/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/km/firefox-58.0b16.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "866ece013c86f0fc7d7bb6a6d9026ac64587d2f41551c9303cdb6a58622482b2412146a37acd80679c979efcd5ef8e17e18775df2fe4b480074317f0d43a4820"; + sha512 = "2e0fa61398637f043ee88c8b4d57b23454d0339ddaaff702b3d78c3172d2a61afcbfdbc0c74eddf63d2fda3b84b35a8a42d51097f5917a9eb28a2a3f9b06dfd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/kn/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/kn/firefox-58.0b16.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "fded1e77fafbd2075ba60f80269dbbbba07e35296f8298664c06c6dfe0787baee3538584c31781e87666b1ef073004074590339d2a61bc1ae4f23992dcb35ff3"; + sha512 = "a571592765e7fde7a3fb828120ad0948c391004e0022d3b692a67fb16dae489f1d03d51e42a2b6a900407fe40bf6df3b072631a18e224777135cd55b04443bb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ko/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ko/firefox-58.0b16.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "40be6d5b4e2358e0d08c4d651ba2b91f94bf94c9cd768ca4d147a07581b928d9d4aa5e66d8dab68a7fbad38b252f48677958c6a66e206045f9ae94fbf0932486"; + sha512 = "b83cead7db85122f2090755ff94e7b4101275d54820cf9839b21a7a5e0f44d1199812cd7d5c2557f8f98d3ae9999919810c2da87fecba28e6b8b9aa958b87785"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lij/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/lij/firefox-58.0b16.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b991ca90152d8e423042b268dc88bd8f35515a27aac6ab5b642b901fc03b02365edf7d0a58a939deea696368ff2769c15b45c98769be27edce561f22094e5dec"; + sha512 = "15c39826850a13043765281f7a23ac8f9da9ab3aeaa813ec88ee07c95bf22fd7166c3dde01a5d545daabb236f330bb186bce7f2614dbef26ce9888ba53af1944"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lt/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/lt/firefox-58.0b16.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "73f020b0b3958cb7f6db3da70f976dc8ef64828f7cae29d1994c04f4542885fa6389239d5a7c41f8beccd90cdcccd14dc42036cac5e34a3cbf812296edf6d49b"; + sha512 = "849a8f75c7f6e5e793ffb4adbf56bacffcf49ef638483cee23314f2924909127ec26eeec080fc8b0b0b2cf8c34e98cb0353774518751e03132ddc1efd4ea1973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/lv/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/lv/firefox-58.0b16.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "35f0aa92ead5ebed9d38688adc6ab2a9e8c9945f46bc29adccb6ba6d7007980f60343869ba65a997e04bd9fbe68b6ef78719ca771359144b73514e6d23e457f2"; + sha512 = "e229ee5acaab985b1c7bf890c8df3412a15086badb738746872fa8705d737d706501a1e3a5e26eb73d66ed7ffc74fd42ff4e2f0abdc5b5036383ac99f09df79f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mai/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/mai/firefox-58.0b16.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "79ffb596ae7afa9ab68923b4782efea6701d61463f4d200e93db9cdbd9cc13a20ba4fabdafc3f734a9d84df4c2a88400d976f77411adc22de3e11a8fc202eb20"; + sha512 = "91ae2db04afeede3c2e7ecb3551deebd85b70a679c8455cba349aa060dc5ceb0b572c4456fb90b0835af72cfca5de61866cacb84282b074992e79c72cbd74a37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/mk/firefox-58.0b16.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "077715dd9bd5b1dd6135816449f21ba8c0d4e4812c847604e92ba103aa009e6eaaea9b12a2adeac753cea1175a1fdc0100b63d2748451c52d8aeedb8af0ccb2b"; + sha512 = "9e59172ac1a828bd8c0aeeb3873ecf4765b68811ab5706033eb4595e646f3760bd3040bc92b3cf8862cb7bd2f25b134459f21eeaa0bbae8ec9b49ceed9b6bd3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ml/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ml/firefox-58.0b16.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "0294862b42dbc96d66f5095bed5aa7439f79a58bff7051bd7182e27c4a73b6f101c3bf2b6966d0b525eab1433973d9972f01a33f3074f318464596af31712a55"; + sha512 = "ec00bc2ea1f3a2c291a7b8d4d3f405c7ab9129d3232f314df04d7978f6ac683ea079a51988eac970d8f84bab1afe4f1d9de6dba8524e3b2b4a4edf7564937219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/mr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/mr/firefox-58.0b16.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "05c8c0d20f303854ce062c5a1696a5b94e796f97a4e4ac45971ee7bea6177418e54281077e962366fa95fcb77d35a5d1aac014d27c9fc1aa28c90c2fbd8bfe95"; + sha512 = "10566cde91adaa6c51f1e0f78505f4c61486567458265cbd353c5ef374eb3e377c6409c8bf69c9787447997ac127b995970eebdd7e27c4d423c420240f2d98bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ms/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ms/firefox-58.0b16.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "7a9fb16b6ecd9722eb79a09015b33e6c15683cccee8b2a278acc177e988da1eb4686324cdecd47bede2913a9b0e88640654338d92252213825c0ae2b6bc8e12b"; + sha512 = "38e620b17fe7a7997c0450c3e0cea6653a8b705b393b5d41b03909f5d84bd03c0c01d9cb503fd6ef184ad43846f342e4a674e64774cc5ca225b2f2fca9c498ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/my/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/my/firefox-58.0b16.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "5e4e9715cd7e9b5d2cb59da9828c0dbc38263373af15c64faadfe160cbc0400596b899cbbf7b8721044f2c279e7a328074ea95044848ca818a3507bb63640e0d"; + sha512 = "8d97b97e9a22fbf3885d1d2a149357d18de031ce2a5cda3173a3d5c616b6af2dc2b5cb91f4570e6a65b0a96f258fa8894574646f5f7b5f9d2278e89aaf909f72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nb-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/nb-NO/firefox-58.0b16.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "da6c123ae24be4b20048fb57746391add06ab9d856c0e4a76d5e0dbfa427f356937ee624e0f1f9158d3451c5ea9b0ecb02422860e0b0f7b214db92207d7a7863"; + sha512 = "5a6cabfa2a7ee7588275ce3dbd19b1c9eb53afa731e99777ed3322f79bbd24ebc0e406f70506f6bcc3bf33be50b051b6bbd0b4367fa84e3bbb6f1d27fe4191fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ne-NP/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ne-NP/firefox-58.0b16.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "2fbf5fa855537303fc0b97ee7a97647f47b554fe3f96754c43ce4ca426e310bc34a1afc87823898cf840cc28a6be91f9200b90e0db5ec7c258ffaca1f9526dff"; + sha512 = "2e53a4c8c1fbd3bd4d8148ab85512cff589d78e3c5bccada20312b397b216645822abee8501234a7130a69d72bc9d7a43ee489af3787e48a0a5a8d4f0a80413a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/nl/firefox-58.0b16.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "44c6c8b927c311c797571eb7003a426403d7162af50d35b41d001a36d4e058497229415faa296466c53c4921906ef5399e8b4215f5d967ee5764fbdd37ac4473"; + sha512 = "25a5a0e71b2e3bbd3db70a2fa6fd608685b2137338d35272e7de7089fc5007abc71ae8eaadb5c49370734a3aa534ce8bc89b93be5293cdb16c0934aa90998f48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/nn-NO/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/nn-NO/firefox-58.0b16.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "2c5e2402aa1d39e51660154d6a6b596b577e54b81fe9c348b90649a4cb22288239c848bf7cf484f3f85e7afe868c5f8d613a95dfca812afc59b1bec91e299ee1"; + sha512 = "46d33f5073f62cd569a5ffe3103693440926d079bb19fde949a6c425c8e5c9d3ae244ff45474095b318d30a7895e79b2c9e1922fbdf0cfbdc7131a7fad01ded2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/or/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/or/firefox-58.0b16.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "5626ce9e7ceb5d0e70dfb5f549f8bf4ab4398edf96e4adfeff06f85c307daad21e075c48df849bcc242dec52ff3a64da12f8af05b0aa475b50a3e9637832d3ab"; + sha512 = "9a3a345a1b23f9f9f8532b452754d0660f9680b1363f5e17b1460bb776c18ba2debb145688bee3057f572ec7000afd36ee91eccafac45d0e363ee63304e84bd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pa-IN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/pa-IN/firefox-58.0b16.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8e0aeedc13e102ef9b4a2aa7858b5b88ef4a21ca00882f1cd3e86506449e4b2e1e1f036d587987be8002b59ae459acfb5f884c53428540261019341f63b86a0f"; + sha512 = "52d2a38e3f0d49d1a540d07175ac6c78309c15ab13fe150ccea847ffd05c0641fbd84ea2009bdbb050f2c1e96dad946d7b45857dc19670bace28f5de9918b5d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/pl/firefox-58.0b16.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f9f9cad94ca986d67b17bd894d6b5ca5de564da3642abca8b66a1263d5ebfc3ec3462eb8a3a397c6f6667677885d9351ef81a7d1c55e15b7404cd3e3b2dcef49"; + sha512 = "d1d5736dc0013554501eabaf3e939e33e55aef9d0618fbcfa5a1ad8c4ddd316750a89694875ef62c0047628880ce2ff4df5666e4ed9461981b99a90493c38962"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pt-BR/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/pt-BR/firefox-58.0b16.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "4f385b8af555fd701c3bc93514a8712939b70b4fcb8d0a08c4cc9c514e68cad63033d1c4516751a6c79d622971e1dd22ae16bc26dd5471a216f6e2d0447a4695"; + sha512 = "f5fc0ef444e3e768a15b111fcaa87782fa47322c41e2de8c420f6f15d412af2fb5e0b4b1303d755aa3ba7771b4b70bb89a54852ebf91d8e1dc2aafd3af92655b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/pt-PT/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/pt-PT/firefox-58.0b16.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d469ba354fb6127e8321664889683821f8c5e41318c5dc6346021c4f0137dd9a8810b8bf4134c808f2a91a50f05d4a0eaca1b52ccc9f691cd5c694ef6fc856b6"; + sha512 = "be03b658cb733a869c6cfac46fedf26188b22935b0544195f22e36bf3fde7f2fedb6fb173a3110f4ac430079f0b315a34403eb8f45deb95212efd09fcea67a6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/rm/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/rm/firefox-58.0b16.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "aaa079966f9396da2771c8f04c2990854677085c872bb57d9b605c2c61be0e0917020916469db4e4e1b7e082529cdb4dba046e282cfc64345f59c1c11980aeb2"; + sha512 = "089f30bab996d1fb888fa560949d2ae5f7a1e146027e396cfd40f99ebcc17ba8b3a1d975f7b064630a655ae5818180567f1de1026f0d639e0d7274300cb64e16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ro/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ro/firefox-58.0b16.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "67aa56b44b75412371151524bcb5564eeb0a3b1e47068435a08f9ed4ab5b593e4e5e051a18b84fefc19996942aa8ad729ad5fbbe671b52ac84907d1a2898c8d1"; + sha512 = "0d68e2c5eedbdce050838e42cc886f861e934d9a740afeb9843aa3b7c75c7764c43fe6e27db7acdf9e698ee0bfd41f98b5b99306b954b801e3e70084f6a9fa12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ru/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ru/firefox-58.0b16.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "9d86946969beddba87dd75fef29214ec3ef3f1d6880b408c49905859bb4ca2e86b89bb06c842cd1b798677ce621a898dfad18d1d121bfae835f4c143a495ad0f"; + sha512 = "a755f166a28473f85e028c16445e5cec2e6e786440a3077dc406b3f866d3a83c6375658055f9348158ca35d740abf3e787864cdae22e62dc4eee75a2770c3209"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/si/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/si/firefox-58.0b16.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2e307742bec245219eddb26f213306462dddb8ec9b590bb21cfd4c7452b89e763f6408cc4ac1d37abc99ba8ecc2185429a4273ffeb694a11acab7427b3930216"; + sha512 = "2bed620a213ba7cb0c384cbc63a29727597496cc8123f9d93432aacdbcabd467545d8aa9af55158dc6bd0e4d78de7fce9f683e60e5e46bd6f2bc9a5e5936e2b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/sk/firefox-58.0b16.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d00816519c0cc00e9223446ff00a2c5eb7b23d24b3b5da6c6c1729fb5c4f333e1195a4a9c13f59b46a22666984e38c56e0d9d22963133441cd76322fbb3c7adf"; + sha512 = "c8fa10a8cef82257132bbad728b9251b0d24ffbbd68a16431236d25e6834cb8a0bd9ea80171e2e7fe3aff1fa4821070577ddb1f50b764d3e135ee037f73bb55c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sl/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/sl/firefox-58.0b16.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bcc84e96c1a1d4f2635fd9148b3a3320410b52a54ed2fd292052fc8d642a8ad38eff3d89909fe37230d9587771f28395f39599d5f8ab8b9d00b2c8b2935974e9"; + sha512 = "5687491b6b7b1e1334a81b6c2e14bc3ef2365c39b8e444ce71e890b8eccc3b6cec53c6a02cf8186ba86085804f2c1c07c2e6c7111c236ca9d4c0c2db381307af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/son/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/son/firefox-58.0b16.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "c9ec2407ddd109bfa059dcff2340a76d04d40021d3cc180966133894e567b54a9feed823ad13e7a4d8e5aba2b85e955a7a48d574a98eac0b26b53d0864d56145"; + sha512 = "a72deb899f60bc1b1c248412ad496ddd1f924181ac4ae94bbd00bf33efdb5fcd61adb7f018a86301e39e176765e3551c478eb490de255e10bab7ac2ecafb25a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sq/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/sq/firefox-58.0b16.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7f459584f85b0d9791bd48a29663567f0303753dc388f1b2f46566efe71ed9bff120c25f97dd840437f148c7af6a829d7bd1379b22d636249955d571f8ead721"; + sha512 = "3f8c87d0e46b130bbfef2cd4047e01c9131460fa8ba7147b59912a88442ab1661ac85015c47a70f71a6d7d7291fa2509193c4e84795f9ba5cd569e4cf7deeff9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/sr/firefox-58.0b16.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "3122fc1479fdab93fc0e10b6973dc0a48f38e3b114af471236ec795b4a69f4f4822314f77d71d891f0463e02fa4ee2bd7acbbc68a0af3cbd2c37e12965b09132"; + sha512 = "b74d6cd21e30e68b67b7a3d0514052adc91d4815f90d4b8329f7125fdc2bad8e3538064817bce922074c8a492bb1d810c8345535e046cf4d9350dc393a033b57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/sv-SE/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/sv-SE/firefox-58.0b16.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7e522a556353f4838090866c0ad8e2957e0b027fb61dcb749d036a231e478427d6702628d273ddd30d233187a5d1ca1e827bf638dd7f913d48755170802d839f"; + sha512 = "f828b804446204cb27f1b5552cfacf6565c68e5c738ad5c1bddb5ad02757b86754802c52cf6e22086f067c13e23d9aa062588d302e475ca139fc9d8989a6c32c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ta/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ta/firefox-58.0b16.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "bf6fc95a9dde89fe99865726d9c54615093d09f1684e493b248cbed9876cd7088ec8f967d9dc90d8592073d6c7f7ddf11bbc7ce528fa624853ef53e31576af48"; + sha512 = "e5ed60aedd493fe560aa1779b3b1c8fa9ccd016cdf13e639a56df2f3e2c9e5be4ae0b3fcaab3ea3df57949fb2f3f945d46501af2dfb86289a1a337049b7051a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/te/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/te/firefox-58.0b16.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "dbba2f55271ed55734834a0f661ba7ebba4619128b117d7e5792c3bfd21abca7b817dd11052d2d26a4c21e7af4bb41cb4abb163dfe13c0b3703d1bc352185ffb"; + sha512 = "4ff30bd9f802d8b7c438ad3455d8105941ff320e44f41bd2f92019624c5ac7ff467e63f14b8c51f081e3809d1f1fa0582f113dd667a803fc89b9c9683bfced3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/th/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/th/firefox-58.0b16.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f45281dd8ad0daf82d630e446c6a87947c860c27a05faa201292acc3169b296410263394bc4faa21328319d4309bda6b36fad7bb74ab16ee920597e12cee56de"; + sha512 = "cda9564a72fd780bcb58a751e9083c5d3c33be72d6cad106b6902b9af3b0606f9d188e340b9e8109b372786339eeba2d3a1aa8e4acc6ed309a59084233bf5ff8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/tr/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/tr/firefox-58.0b16.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "486d03fb17ce51edc8b805395e3b837f19e8de2b21d504b6c53209badddc01144398dba93b1dc83c8ea75b14b1284d708f7f70e870453ac30179c6ba66e46ae5"; + sha512 = "deb3a166988d60742f7a25ac311fdd4967c96692edfdb28e3e30ad87b9835e16c671599caab85d81345c928da60b833acc0241781b193d3dc9a2a5f51199d655"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/uk/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/uk/firefox-58.0b16.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4b050532e8bf7ee04fea4ec9190ffa59fae5969e75b5287b4cc036d68061a9892aa99cd9f5527563206b79bf4527684d85a82e80891d190f391c64c236a22222"; + sha512 = "25a350319be568862417acf5ca0088c6a9c4df3c4e6bd6998f8dd40b7815514809c1bf97e20ba33cc2e11fc0af6fe14e224275b08f1b3a0f1a4116d2296b76bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/ur/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/ur/firefox-58.0b16.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "060e555027a13fad246e2ca01f590c0b4ecc886949e4592ff9438aad529d21f0ca1d00dd4671c2d76efaf4285f5938ea27600b9aa5c4f9273c57dd286de21701"; + sha512 = "8d3a92ecbcfa0a8cee7c2a64ead50a2db8e9859788a1888cfd7f576ad97eadb157b5fd92fb9e0364a2d00ad4c0f46733340a4163b1bb6fb85b13c2c177530a14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/uz/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/uz/firefox-58.0b16.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "73841dc4be445337bf80a4bfcb74c681c997d69d053d453121ece75a5a91bbfb474ddc3c232d707833a5b39722bbd4b83c319066f73a9493908e77ac87723aa0"; + sha512 = "657eac2426ea9722fe0d4dd7cba1c7df3fc9a9eb1647bb08edbb92e3ad9200b978503d91f560d93c7b064cc7b112024460879047e7cc3a34c6fa41ee4e439b2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/vi/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/vi/firefox-58.0b16.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e866cd2d760899f42e818cb5ca68cc3770d71eac92b30adabdef1fcabee1794f36f5687a2ef2350a987686c2a6ce644c820640825fa26ce604b636235bd99b2d"; + sha512 = "dfe9c1f0c8a18cf337c4db0b31c99a5e8f25db06035484e63d510a40c5c9c354e8d849dd57175470bd5185a94ef22df26711178f01dcd05c12c5433c968f59e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/xh/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/xh/firefox-58.0b16.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9e7bedb054fa367ed8ece1c43d66b70d2184bcf759d344457bece9d515325d0b22f3359b85bbcbc72889a72b39397a94f0f48e730da8f0e779f8cf9fe97147ab"; + sha512 = "12ec3b621e93205c0495ae2691c27cc9e95fb2a48a5122baa75b3ce534d776221752fbcd91a9014b4a1b548059b98016a7736d6d24cc98a24fc92a2046b6f33f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/zh-CN/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/zh-CN/firefox-58.0b16.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "14d3ba252d92777a8e8a935091b4d1288f561d19ce94f0220c70c1327276e2f230abe99983bf2de8e8043cfb101f6698aa64bc701e29f666792b733e0dadcbd5"; + sha512 = "382c1d60f94dd5d3878fad7655dd66202103a1435a5c5bd8fe6d04f525098ae3407f0caa45f5996b090cf7ad950156bd00b833305269b75412fe4b0c01338f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b15/linux-i686/zh-TW/firefox-58.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b16/linux-i686/zh-TW/firefox-58.0b16.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "78bac26c0d360f3e60a3b0cd2b7c9b4642d0351f47322d20adc4df815fb466149fd98710314c38c9681115a30a9226f792049bf00b1b8020abeb665e1729d89e"; + sha512 = "752a93a5217209cf2cbaf1a5f9fcc23326acb335cf8a9948e2855788eb61781300b21e707e1031c0860c6c8474e66f699a8896b3aad64465a0af596c2d3f50d6"; } ]; } From d573885dd27704a0519c4cb84df729fd4b40606b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 13 Jan 2018 09:27:06 +0100 Subject: [PATCH 116/197] perl-URI: 1.72 -> 1.73 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cf421c6e88df..f7df25af393d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15505,10 +15505,10 @@ let self = _self // overrides; _self = with self; { }; URI = buildPerlPackage rec { - name = "URI-1.72"; + name = "URI-1.73"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "35f14431d4b300de4be1163b0b5332de2d7fbda4f05ff1ed198a8e9330d40a32"; + sha256 = "cca7ab4a6f63f3ccaacae0f2e1337e8edf84137e73f18548ec7d659f23efe413"; }; buildInputs = [ TestNeeds ]; meta = { From ad3b2e865733a8dabdf5750c8efbe2c2d79c7944 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 9 Jan 2018 21:34:09 +0100 Subject: [PATCH 117/197] lombok: 1.16.8 -> 1.16.20 Also perform a few package cleanups. --- .../development/libraries/java/lombok/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 05ad908b3c36..df9b3f96c871 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,13 +1,18 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.16.8"; + name = "lombok-1.16.20"; + src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "0s7ak6gx1h04da2rdhvc0fk896cwqm2m7g3chqcjpsrkgfdv4cpy"; + sha256 = "0v8fq4qlpjh4b87xx35m32y2xpnj4d05xflrgghia6mar8c8n5y5"; }; - phases = [ "installPhase" ]; - installPhase = "mkdir -p $out/share/java; cp $src $out/share/java/lombok.jar"; + + buildCommand = '' + mkdir -p $out/share/java + cp $src $out/share/java/lombok.jar + ''; + meta = { description = "A library that can write a lot of boilerplate for your Java project"; platforms = stdenv.lib.platforms.all; From cf6c05fda7d980fff47c734508157175d0c563b8 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sat, 13 Jan 2018 01:17:23 -0800 Subject: [PATCH 118/197] add haddock version for GHC 8.0 --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8894ede82f15..e8b7e665119e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2681,6 +2681,7 @@ extra-packages: - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock < 2.17 # required on GHC 7.10.x + - haddock == 2.17.* # required on GHC 8.0.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-api == 2.17.* # required on GHC 8.0.x From b9ae8efca53bf90c5dbe18af8fbb2a9b52c0b4e0 Mon Sep 17 00:00:00 2001 From: xurei Date: Sat, 13 Jan 2018 11:40:45 +0100 Subject: [PATCH 119/197] libzxcvbn: init at 2.3 (#33822) * Add package libzxcvbn * zxcvbn-c: name after the project not the library --- lib/maintainers.nix | 1 + .../libraries/zxcvbn-c/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/zxcvbn-c/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a18e8a24b12c..ff9a699a35f5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -732,6 +732,7 @@ wyvie = "Elijah Rum "; xaverdh = "Dominik Xaver Hörl "; xnwdd = "Guillermo NWDD "; + xurei = "Olivier Bourdoux "; xvapx = "Marti Serra "; xwvvvvwx = "David Terry "; xzfc = "Albert Safin "; diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix new file mode 100644 index 000000000000..1ba073943483 --- /dev/null +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "zxcvbn-c-${version}"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "tsyrogit"; + repo = "zxcvbn-c"; + rev = "v${version}"; + sha256 = "1m097b4qq1r3kk4b236pc3mpaj22il9fh43ifagad5wy54x8zf7b"; + }; + + installPhase = '' + install -D -t $out/lib libzxcvbn.so* + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tsyrogit/zxcvbn-c; + description = "A C/C++ implementation of the zxcvbn password strength estimation"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71668f56bc46..080dcee11be8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20126,6 +20126,8 @@ with pkgs; zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; + snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; openmsx = callPackage ../misc/emulators/openmsx { From c660ed4bafde4e58473004ee655ebe2b4e404744 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 12:22:33 +0100 Subject: [PATCH 120/197] palemoon: remove fix for upstream issue #826 --- pkgs/applications/networking/browsers/palemoon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 9187e7d002a5..553fd71f1468 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { patchPhase = '' chmod u+w . - sed -i /status4evar/d browser/installer/package-manifest.in ''; buildPhase = '' From 5beed4e3ce005d5631e50544caf7da40134b99b8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 12:23:55 +0100 Subject: [PATCH 121/197] palemoon: install icons --- .../networking/browsers/palemoon/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 553fd71f1468..006aa88f363c 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "palemoon"; exec = "palemoon %U"; + icon = "palemoon"; desktopName = "Pale Moon"; genericName = "Web Browser"; categories = "Application;Network;WebBrowser;"; @@ -86,6 +87,14 @@ stdenv.mkDerivation rec { installPhase = '' 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 \ + $out/share/icons/hicolor/$size/apps/palemoon.png + done + cd $builddir $src/mach install ''; From 17a4f0f756364821a550d0c0e4f591d6dcc91eb5 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sat, 13 Jan 2018 12:43:18 +0100 Subject: [PATCH 122/197] woff2: set platforms to linux only Signed-off-by: Christoph Hrdinka --- pkgs/development/web/woff2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index 22b38af29a3c..3480924370e2 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/google/woff2; license = licenses.mit; maintainers = [ maintainers.hrdinka ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From a35a8d603396b93e7091a93063c14797c9e36045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 13 Jan 2018 11:48:37 +0000 Subject: [PATCH 123/197] mblaze: fix darwin build --- pkgs/applications/networking/mailreaders/mblaze/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 30c392b55e48..6cfac41676cc 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, libiconv }: stdenv.mkDerivation rec { name = "mblaze-${version}"; version = "0.3"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + src = fetchFromGitHub { owner = "chneukirchen"; repo = "mblaze"; From 5f0c823a61850b42a74372336fefa2afe2649b4f Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 13 Jan 2018 13:27:35 +0100 Subject: [PATCH 124/197] ldc: Disable cdvecfill test to fix build on older processors https://github.com/NixOS/nixpkgs/pull/33830 --- pkgs/development/compilers/ldc/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 5fc8c7837a4a..bdb74680b134 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -110,6 +110,13 @@ let substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan '' + + stdenv.lib.optionalString (!bootstrapVersion) '' + # TODO Can be removed with the next ldc version > 1.7.0 + # https://github.com/ldc-developers/ldc/issues/2493 + substituteInPlace tests/d2/dmd-testsuite/Makefile \ + --replace "# disable tests based on arch" "DISABLED_TESTS += test_cdvecfill" + '' + + stdenv.lib.optionalString (bootstrapVersion) '' substituteInPlace runtime/${datetimePath} \ --replace "import std.traits;" "import std.traits;import std.path;" From 18550603e978f528239b3d53ac1c50ba3795678e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Jan 2018 10:20:53 -0600 Subject: [PATCH 125/197] imagemagick: 6.9.9-28 -> 6.9.9-33 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 519bf025b43e..bb6b8c89a2f6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-28"; - sha256 = "132kdl7jlkghfg3smdab14c29cpvrx65ibipxkmwg1nc88ycqivh"; + version = "6.9.9-33"; + sha256 = "05931wfhllrb1c2g2nwnwaf1wazn60y5f70gd11qcqp46rif7z21"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From 397157cc94ad271c763e19c1aac36bcfec725feb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Jan 2018 10:21:20 -0600 Subject: [PATCH 126/197] imagemagick: 7.0.7-19 -> 7.0.7-21 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e1d8dd01f9c5..6aa2ba118d69 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-19"; - sha256 = "1naib6hspmq7d4gfpsksx78gc1lq3p2v3i9pxkkdvr9p9j15c4az"; + version = "7.0.7-21"; + sha256 = "0680dbg77gcyb3g4n22z5mp7c8mg0jpkqb0g4nj7d7r78nl869rv"; patches = []; }; in From 82ef7ce3d22d4ae3b8aa452dd4a87fb7d7c2ae74 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 13 Jan 2018 17:35:48 +0100 Subject: [PATCH 127/197] timewarrior: 1.0.0 -> 1.1.0 --- .../applications/misc/timewarrior/default.nix | 6 ++--- .../misc/timewarrior/install-all-themes.patch | 27 ------------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/misc/timewarrior/install-all-themes.patch diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index f5201f8061f0..f6dd7cb8c232 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { name = "timewarrior-${version}"; - version = "1.0.0"; + version = "1.1.0"; enableParallelBuilding = true; src = fetchurl { url = "https://taskwarrior.org/download/timew-${version}.tar.gz"; - sha256 = "1d8b9sjdbdld81n535iwip9igl16kcw452wa47fmndp8w487j0mc"; + sha256 = "0jnwj8lflr6nlch2j2hkmgpdqq3zbdd2sfpi5iwiabljk25v9iq9"; }; nativeBuildInputs = [ cmake ]; - patches = [ ./install-all-themes.patch ]; - meta = with stdenv.lib; { description = "A command-line time tracker"; homepage = https://tasktools.org/projects/timewarrior.html; diff --git a/pkgs/applications/misc/timewarrior/install-all-themes.patch b/pkgs/applications/misc/timewarrior/install-all-themes.patch deleted file mode 100644 index c6e8d3b0dbf7..000000000000 --- a/pkgs/applications/misc/timewarrior/install-all-themes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Tue, 14 Mar 2017 07:51:02 -0500 -Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'. - ---- - doc/themes/CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt -index a954576..3a3b453 100644 ---- a/doc/themes/CMakeLists.txt -+++ b/doc/themes/CMakeLists.txt -@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8) - - message ("-- Configuring theme documentation") - --install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) --install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) -+install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) -+install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) -+install (FILES dark_blue.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) -+install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) -+install (FILES dark_red.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) --- -2.12.0 - From d40d41ef51cbe82bf98e4d309374706002f50385 Mon Sep 17 00:00:00 2001 From: Gregory Pfeil Date: Sat, 13 Jan 2018 09:56:42 -0700 Subject: [PATCH 128/197] Move flootty from python-modules. --- .../{python-modules => tools}/flootty/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/development/{python-modules => tools}/flootty/default.nix (80%) diff --git a/pkgs/development/python-modules/flootty/default.nix b/pkgs/development/tools/flootty/default.nix similarity index 80% rename from pkgs/development/python-modules/flootty/default.nix rename to pkgs/development/tools/flootty/default.nix index 92ce520fd194..9535ba86dd06 100644 --- a/pkgs/development/python-modules/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,6 +1,10 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, python }: -buildPythonPackage rec { +let + inherit (python.pkgs) buildPythonApplication fetchPypi; +in + +buildPythonApplication rec { pname = "Flootty"; version = "3.2.1"; name = "${pname}-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 843849319744..4d31c9bcfdf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7444,7 +7444,7 @@ with pkgs; findbugs = callPackage ../development/tools/analysis/findbugs { }; - flootty = pythonPackages.flootty; + flootty = callPackage ../development/tools/flootty { }; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eede88535740..fec2e3fd4932 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -225,8 +225,6 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; - flootty = callPackage ../development/python-modules/flootty { }; - gssapi = callPackage ../development/python-modules/gssapi { }; h5py = callPackage ../development/python-modules/h5py { From 87677d039010d28b26e581062878c37b5010af39 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 13 Jan 2018 16:38:54 +0100 Subject: [PATCH 129/197] tor: 0.3.1.9 -> 0.3.2.9 - Adds next-generation onion services[1] - Lots of fixes, e.g., for CVE-2017-8821, CVE-2017-8820, CVE-2017-8823, CVE-2017-8819, CVE-2017-8822, CVE-2017-8822 - Adds new option `NoExec` to disallow exec syscalls --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a60cea1a738a..4d355bd86b8b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.1.9"; + name = "tor-0.3.2.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "09ixizsr635qyshvrn1m5asjkaz4fm8dx80lc3ajyy0fi7vh86vf"; + sha256 = "03qn55c969zynnx71r82iaqnadpzq0qclq0zmjhb3n4qma8pnnj3"; }; outputs = [ "out" "geoip" ]; From fa3aec7e4dc1292fa0fee0319b7efec04c68fde6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 14 Jan 2018 02:07:08 +0800 Subject: [PATCH 130/197] gst-plugins-bad: Fix CVE-2016-9447 --- .../libraries/gstreamer/legacy/gst-plugins-bad/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index bdb1b6c7bb7a..77465645d237 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf"; }; + postInstall = '' + # Fixes CVE-2016-9447 + # Does not actually impact NSF playback + rm -v $out/lib/gstreamer-0.10/libgstnsf.so + ''; + buildInputs = [ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ]; From 6ccb554f3b9f96834e9af313cdfd69b971fd35fa Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 13 Jan 2018 21:12:56 +0300 Subject: [PATCH 131/197] tifffile: init at 0.13.0 (#33750) * tifffile: init at v0.13.0 * python.pkgs.tifffile: actually run tests --- .../python-modules/tifffile/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/tifffile/default.nix diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix new file mode 100644 index 000000000000..3acc42ce2cc3 --- /dev/null +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder +, numpy, nose, enum34, futures }: + +buildPythonPackage rec { + pname = "tifffile"; + version = "0.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rqx2bar6dcsbmzq68mjh5bsyjzhbkqxi2dsv7j0vdbnjs5dfq9q"; + }; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests --exe -v --exclude="test_extension" + ''; + + propagatedBuildInputs = [ numpy ] + ++ lib.optional isPy27 futures + ++ lib.optional (pythonOlder "3.0") enum34; + + meta = with stdenv.lib; { + description = "Read and write image data from and to TIFF files."; + homepage = https://github.com/blink1073/tifffile; + maintainers = [ maintainers.lebastr ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fec2e3fd4932..2ec70db93773 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17779,6 +17779,8 @@ in { tiros = callPackage ../development/python-modules/tiros { }; + tifffile = callPackage ../development/python-modules/tifffile { }; + # Tkinter/tkinter is part of the Python standard library. # The Python interpreters in Nixpkgs come without tkinter by default. # To make the module available, we make it available as any other From e2f7267ba2f89e858fc60b6033f0f85191b1ee61 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 14 Jan 2018 02:40:43 +0800 Subject: [PATCH 132/197] xxdiff-tip: Build with qt59 --- pkgs/development/tools/misc/xxdiff/tip.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index d3b69901ed8a..844758c0f065 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; + # Fixes build with Qt 5.9 + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + preConfigure = '' cd src make -f Makefile.bootstrap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 988cf446a00e..4463b5b77d4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7962,7 +7962,7 @@ with pkgs; xxdiff = callPackage ../development/tools/misc/xxdiff { bison = bison2; }; - xxdiff-tip = qt56.callPackage ../development/tools/misc/xxdiff/tip.nix { }; + xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; yacc = bison; From 5ccfd0ee34ae525b7e10a6973150a7bcf92cbb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 13 Jan 2018 18:44:19 +0000 Subject: [PATCH 133/197] linuxPackages.extfat-nofuse: fix libelf dependency --- pkgs/os-specific/linux/exfat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index ee6249ce0408..56da5b0f16f4 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; From 5c76e6cbaedddbc660c1bbacb2ddfe2fcbb73680 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Jan 2018 23:04:19 +0100 Subject: [PATCH 134/197] youtubeDL: 2017.12.31 -> 2017.01.14 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index debfee34197e..7a1ac3525a98 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.12.31"; + version = "2018.01.14"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0cq10ii96lpq3z7l1js0s59sqb4h4yqwdqinl2yf7cdjynvj62xi"; + sha256 = "0pl7ja7xg47mns96s65d534hq4y9n6d5xmhj3n2b9nylfshdpzbb"; }; nativeBuildInputs = [ makeWrapper ]; From 5c73ee1a9375d225a66a4fd469fc82e59a2d7414 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Jan 2018 23:04:42 +0100 Subject: [PATCH 135/197] youtubeDL: don't double wrap executable Fixes command name detection via argv. --- pkgs/tools/misc/youtube-dl/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7a1ac3525a98..e071891fff96 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -30,15 +30,13 @@ buildPythonApplication rec { # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails - postInstall = let - packagesToBinPath = - [ atomicparsley ] - ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump - ++ optional phantomjsSupport phantomjs2; - in '' - wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" - ''; + makeWrapperArgs = let + packagesToBinPath = + [ atomicparsley ] + ++ optional ffmpegSupport ffmpeg + ++ optional rtmpSupport rtmpdump + ++ optional phantomjsSupport phantomjs2; + in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ]; # Requires network doCheck = false; From 111d4dbc06c6f29e9ce01bcc5e2e2c001679fb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= Date: Sat, 13 Jan 2018 23:18:26 +0100 Subject: [PATCH 136/197] gephi: 0.9.1 -> 0.9.2 --- pkgs/applications/science/misc/gephi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 6736ce758973..82b95132d880 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; -let version = "0.9.1"; in +let version = "0.9.2"; in stdenv.mkDerivation { name = "gephi-${version}"; src = fetchurl { url = "https://github.com/gephi/gephi/releases/download/v${version}/gephi-${version}-linux.tar.gz"; - sha256 = "f1d54157302df05a53b94e1518880c949c43ba4ab21e52d57f3edcbdaa06c7ee"; + sha256 = "1wr3rka8j2y10nnwbg27iaxkbrp4d7d07ccs9n94yqv6wqawj5z8"; }; meta = { From f6936ea842366d129ee5a04b51077ee28046ec20 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Sat, 13 Jan 2018 17:20:33 -0500 Subject: [PATCH 137/197] skypeforlinux: 8.11.0.4 -> 8.13.0.2 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 11a1efec8abe..f75487565e1d 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.11.0.4"; + version = "8.13.0.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -57,7 +57,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1chwc4rqcwwim03n6nski5dar33bb1gnadbvcjg6gln3xqr0ipib"; + sha256 = "15p1v6y8fwx9qj3ag645bvrcw7c1j20v63iy75s4xwsv1siz8cf9"; } else throw "Skype for linux is not supported on ${stdenv.system}"; From eb21bf3d99e99301962455ca3c4f88a27ecbff18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= Date: Sat, 13 Jan 2018 23:21:49 +0100 Subject: [PATCH 138/197] cytoscape: 3.5.1 -> 3.6.0 --- pkgs/applications/science/misc/cytoscape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index d5ffe9cd9ba8..0194ee0b83c0 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cytoscape-${version}"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz"; - sha256 = "1dvv0f7sc7q7lwmpd7xkcx86dd8lxh2il3wiwkij44gh7ni1qkfm"; + sha256 = "13q8caksbzi6j7xy8v5f0pi6766yfawys6jcm50ng78mnhrv2v97"; }; buildInputs = [jre makeWrapper]; From 00791534140f82828a0f0cb1784a5e5a3208a909 Mon Sep 17 00:00:00 2001 From: Sebastian Galkin Date: Sat, 13 Jan 2018 23:42:51 -0200 Subject: [PATCH 139/197] scid-vs-pc: Set meta platforms to linux Darwin spits the following error: Location of "tk.h": not found Location of Tcl 8.6 library: /nix/store/zr4n0fdb3nsdp80vff9mihks22w1g8jm-tcl-8.6.6/lib Location of Tk 8.6 library: /nix/store/bwlx46zncj2c6bv2sn75ai0wgzc89d93-tk-8.6.6/lib Location of X11 library: /nix/store/093lzjvm2r27rprpqxvyrgqvfp1k0dlf-libX11-1.6.5/lib/ Checking if your system already has zlib installed: no. Error: compiler g++ does not support C++0x (C++11). --- pkgs/games/scid-vs-pc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 60fa7bf56216..db32cb70d413 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { homepage = http://scidvspc.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; + platforms = stdenv.lib.platforms.linux; }; } From 08492b31d128501927862844b370b9facca17273 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jan 2018 18:36:07 +0000 Subject: [PATCH 140/197] ocamlPackages.mstruct: 1.3.3 -> 1.4.0 --- pkgs/development/ocaml-modules/mstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix index 958cbdc554e8..5aa57ba8fbb8 100644 --- a/pkgs/development/ocaml-modules/mstruct/default.nix +++ b/pkgs/development/ocaml-modules/mstruct/default.nix @@ -7,14 +7,14 @@ then throw "mstruct is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "1.3.3"; + version = "1.4.0"; name = "ocaml${ocaml.version}-mstruct-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-mstruct"; rev = "v${version}"; - sha256 = "1rxjzkg6156vl6yazbk1h0ndqj80wym5aliaapijf60apqqmsp4s"; + sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm"; }; buildInputs = [ ocaml findlib jbuilder opam ]; From aee1cebda7d244de1aa520db409b819391adb7b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 14 Jan 2018 05:51:06 +0000 Subject: [PATCH 141/197] why3: 0.88.1 -> 0.88.3 --- pkgs/applications/science/logic/why3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 54c8caa99d86..202d52f0cc0e 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.88.1"; + version = "0.88.3"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37185/why3-0.88.1.tar.gz; - sha256 = "1qj00963si0vdrqjp79ai27g9rr8sqvly6n6nwpga6bnss98xqkw"; + url = https://gforge.inria.fr/frs/download.php/file/37313/why3-0.88.3.tar.gz; + sha256 = "0limdqy9l5bjzwhdalcfdyh0b6laxgiphhvr4bby9p0030agssiy"; }; buildInputs = (with ocamlPackages; [ From 3eb0ddcfc41fb88b8570919b90ed8851700238a2 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Thu, 11 Jan 2018 19:42:18 +0100 Subject: [PATCH 142/197] virt-manager: add gobjectIntrospection to nativeBuildInputs --- pkgs/applications/virtualization/virt-manager/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index b99475bcda84..527371791082 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -17,7 +17,10 @@ python2Packages.buildPythonApplication rec { sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj"; }; - nativeBuildInputs = [ wrapGAppsHook intltool file ]; + nativeBuildInputs = [ + wrapGAppsHook intltool file + gobjectIntrospection # for setup hook populating GI_TYPELIB_PATH + ]; buildInputs = [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi From 9121a973667a407be156fafa95f0fc59927624ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Jan 2018 23:01:06 +0100 Subject: [PATCH 143/197] pythonPackages.user-agents: init at 1.1.0 --- .../python-modules/ua-parser/default.nix | 23 ++++++++++++++++++ .../python-modules/user-agents/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/ua-parser/default.nix create mode 100644 pkgs/development/python-modules/user-agents/default.nix diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix new file mode 100644 index 000000000000..1b397f6c7379 --- /dev/null +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml }: + +buildPythonPackage rec { + pname = "ua-parser"; + version = "0.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p8siba0rnb5nsl354fd5fc4751d5ybw7hgnd56yn8dncxdb1bqa"; + }; + + buildInputs = [ pyyaml ]; + + doCheck = false; # requires files from uap-core + + meta = with stdenv.lib; { + description = "A python implementation of the UA Parser"; + homepage = https://github.com/ua-parser/uap-python; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix new file mode 100644 index 000000000000..6b14eebb310f --- /dev/null +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }: + +buildPythonPackage rec { + pname = "user-agents"; + version = "1.1.0"; + + # PyPI is missing devices.json + src = fetchFromGitHub { + owner = "selwin"; + repo = "python-user-agents"; + rev = "v${version}"; + sha256 = "14kxd780zhp8718xr1z63xffaj3bvxgr4pldh9sv943m4hvi0gw5"; + }; + + propagatedBuildInputs = [ ua-parser ]; + + meta = with stdenv.lib; { + description = "A Python library to identify devices by parsing user agent strings"; + homepage = https://github.com/selwin/python-user-agents; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecda0c56cea8..197d4599b283 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18134,6 +18134,8 @@ in { u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; + ua-parser = callPackage ../development/python-modules/ua-parser { }; + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; umalqurra = buildPythonPackage rec { @@ -18354,6 +18356,8 @@ in { }; }; + user-agents = callPackage ../development/python-modules/user-agents { }; + pyuv = buildPythonPackage rec { name = "pyuv-1.2.0"; disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 From 9956687151f136172a0dfe2d97ee04132f4a90d8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 2 Jan 2018 14:52:27 +0000 Subject: [PATCH 144/197] stdenv: change some indent --- pkgs/stdenv/generic/make-derivation.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 6038e2c339bf..41b0cc1a4371 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -194,24 +194,24 @@ rec { # but it's not part of the actual derivation, i.e., it's not # passed to the builder and is not a dependency. But since we # include it in the result, it *is* available to nix-env for queries. - meta = { } + meta = { # If the packager hasn't specified `outputsToInstall`, choose a default, # which is the name of `p.bin or p.out or p`; # if he has specified it, it will be overridden below in `// meta`. # Note: This default probably shouldn't be globally configurable. # Services and users should specify outputs explicitly, # unless they are comfortable with this default. - // { outputsToInstall = - let - outs = outputs'; # the value passed to derivation primitive - hasOutput = out: builtins.elem out outs; - in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; + outputsToInstall = + let + outs = outputs'; # the value passed to derivation primitive + hasOutput = out: builtins.elem out outs; + in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; } // attrs.meta or {} - # Fill `meta.position` to identify the source location of the package. - // lib.optionalAttrs (pos != null) - { position = pos.file + ":" + toString pos.line; } - ; + # Fill `meta.position` to identify the source location of the package. + // lib.optionalAttrs (pos != null) { + position = pos.file + ":" + toString pos.line; + }; in From ecd3990cd4bd76e15658975f2e6f523f805ce52e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 2 Jan 2018 14:52:27 +0000 Subject: [PATCH 145/197] stdenv: provide `meta.evaluates` This gives a way to see the result of `check-meta` without triggering any assertions. --- pkgs/stdenv/generic/check-meta.nix | 1 + pkgs/stdenv/generic/make-derivation.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 0a8dc006dc5d..ed4a0e2d8410 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -159,6 +159,7 @@ let executables = listOf str; outputsToInstall = listOf str; position = str; + evaluates = bool; repositories = attrsOf str; isBuildPythonPackage = platforms; schedulingPriority = str; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 41b0cc1a4371..78e558daff1b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -211,6 +211,9 @@ rec { # Fill `meta.position` to identify the source location of the package. // lib.optionalAttrs (pos != null) { position = pos.file + ":" + toString pos.line; + # Expose the result of the checks for everyone to see. + } // { + evaluates = validity.valid; }; in From eaee2a119916b2761d08cb8f68f1b4afbde15e51 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 2 Jan 2018 14:52:27 +0000 Subject: [PATCH 146/197] stdenv: implement `config.checkMetaRecursively` This option makes `meta.evaluate` into a close approximation of the result of evaluating `.outPath` by checking all the dependencies recursively at a cost of 2x slowdown. Note that actually evaluating `.outPath` costs some 5x-7x more because `.outPath` also computes all the hashes. --- pkgs/stdenv/generic/make-derivation.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 78e558daff1b..ab5edfcd17c0 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -72,6 +72,9 @@ rec { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; }) else let + references = nativeBuildInputs ++ buildInputs + ++ propagatedNativeBuildInputs ++ propagatedBuildInputs; + dependencies = map (map lib.chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) @@ -213,7 +216,10 @@ rec { position = pos.file + ":" + toString pos.line; # Expose the result of the checks for everyone to see. } // { - evaluates = validity.valid; + evaluates = validity.valid + && (if config.checkMetaRecursively or false + then lib.all (d: d.meta.evaluates or true) references + else true); }; in From 50148f06304ba1dce9130f9476a73fc2d955e10e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 3 Jan 2018 15:22:35 +0000 Subject: [PATCH 147/197] stdenv: hide `name` under `check-meta` assert This is a temporary workaround to make `nix-env -qa` and `nix search` ignore broken packages as they they did before this patchset. This patch should be reverted after `nix` gets a proper fix for this. See NixOS/nix#1771. --- pkgs/stdenv/generic/make-derivation.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index ab5edfcd17c0..aef39fedb79c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -134,9 +134,12 @@ rec { (lib.concatLists propagatedDependencies)); in { - name = name + lib.optionalString + # A hack to make `nix-env -qa` and `nix search` ignore broken packages. + # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix. + name = assert validity.handled; name + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ("-" + stdenv.hostPlatform.config); + builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; inherit stdenv; From fac3d49e486cbca4306f991ed49687ac1230ed89 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 3 Jan 2018 15:22:35 +0000 Subject: [PATCH 148/197] stdenv: provide `meta.name` --- pkgs/stdenv/generic/check-meta.nix | 1 + pkgs/stdenv/generic/make-derivation.nix | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index ed4a0e2d8410..13149c33f1c9 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -153,6 +153,7 @@ let # Weirder stuff that doesn't appear in the documentation? knownVulnerabilities = listOf str; + name = str; version = str; tag = str; updateWalker = bool; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index aef39fedb79c..6c29e6746883 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -201,6 +201,10 @@ rec { # passed to the builder and is not a dependency. But since we # include it in the result, it *is* available to nix-env for queries. meta = { + # `name` above includes cross-compilation cruft (and is under assert), + # lets have a clean always accessible version here. + inherit name; + # If the packager hasn't specified `outputsToInstall`, choose a default, # which is the name of `p.bin or p.out or p`; # if he has specified it, it will be overridden below in `// meta`. From 8606dd855656e3785df0d24ba8d3e226fe03f597 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 26 Dec 2017 08:40:04 +0000 Subject: [PATCH 149/197] lib: change the order of arguments of `addPassthru` --- lib/customisation.nix | 4 ++-- pkgs/os-specific/linux/kernel/generic.nix | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 84f7783a6aa7..08020456e7c8 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -36,7 +36,7 @@ rec { overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in addPassthru newDrv ( + in lib.flip addPassthru newDrv ( { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } @@ -157,7 +157,7 @@ rec { /* Add attributes to each output of a derivation without changing the derivation itself. */ - addPassthru = drv: passthru: extendDerivation true passthru drv; + addPassthru = extendDerivation true; /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 0d2b7655edb9..fed6f382b81b 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -134,10 +134,12 @@ let passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); }; - nativeDrv = lib.addPassthru kernel.nativeDrv passthru; + addPassthru' = lib.addPassthru passthru; - crossDrv = lib.addPassthru kernel.crossDrv passthru; + nativeDrv = addPassthru' kernel.nativeDrv; + + crossDrv = addPassthru' kernel.crossDrv; in if kernel ? crossDrv then nativeDrv // { inherit nativeDrv crossDrv; } - else lib.addPassthru kernel passthru + else addPassthru' kernel From f3c996e25d7e5f0c1c1e73046f3d6bf192fc2404 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 14 Jan 2018 15:10:31 +0200 Subject: [PATCH 150/197] pythonPackages.versioneer: init at 0.18 --- .../python-modules/versioneer/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/versioneer/default.nix diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix new file mode 100644 index 000000000000..a33286714173 --- /dev/null +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + + +buildPythonPackage rec { + + pname = "versioneer"; + version = "0.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dgkzg1r7mjg91xp81sv9z4mabyxl39pkd11jlc1200md20zglga"; + }; + + # Couldn't get tests to work because, for instance, they used virtualenv and + # pip. + doCheck = false; + + meta = with stdenv.lib; { + description = "Version-string management for VCS-controlled trees"; + homepage = https://github.com/warner/python-versioneer; + license = licenses.publicDomain; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c1cc710c13a..88217984051e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23152,6 +23152,8 @@ EOF pyqt5 = self.pyqt56; }; + versioneer = callPackage ../development/python-modules/versioneer { }; + vine = callPackage ../development/python-modules/vine { }; wp_export_parser = buildPythonPackage rec { From ef2591ee0183e8fe5ccb42765a8a69cdf3e48d86 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 14 Jan 2018 22:28:23 +0800 Subject: [PATCH 151/197] kde-frameworks: 5.41 -> 5.42 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../kcmutils/kcmutils-follow-symlinks.patch | 14 +- .../0001-qdiriterator-follow-symlinks.patch | 21 +- .../kde-frameworks/plasma-framework.nix | 4 +- .../libraries/kde-frameworks/srcs.nix | 608 +++++++++--------- 5 files changed, 321 insertions(+), 328 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index b9f6d0925715..119abbe9f530 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.41/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.42/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch index 5e1007b7fc0b..cc041b9aa3b8 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch @@ -1,13 +1,13 @@ -Index: kcmutils-5.33.0/src/kpluginselector.cpp -=================================================================== ---- kcmutils-5.33.0.orig/src/kpluginselector.cpp -+++ kcmutils-5.33.0/src/kpluginselector.cpp -@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index 137c865..097ab75 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -303,7 +303,7 @@ void KPluginSelector::addPlugins(const QString &componentName, QStringList desktopFileNames; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { + for (const QString &dir : dirs) { - QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { desktopFileNames.append(it.next()); } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee90534..3b6ea27d41e5 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -1,25 +1,18 @@ -From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:47:01 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 +index fbbc0fa..cb78741 100644 --- a/src/khelpclient.cpp +++ b/src/khelpclient.cpp @@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) QString docPath; const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { + for (const QString &dir : desktopDirs) { - QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); + QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { const QString desktopPath(it.next()); KDesktopFile desktopFile(desktopPath); --- -2.5.2 - +@@ -75,4 +75,3 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + // launch khelpcenter, or a browser for URIs not handled by khelpcenter + QDesktopServices::openUrl(url); + } +- diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index d3a81b50bf17..a2a90e448d49 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -4,7 +4,7 @@ kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui, - qtbase, qtdeclarative, qtscript, qtx11extras, + qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2 }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications - kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras + kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2 ]; propagatedBuildInputs = [ kpackage kservice qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d99c723082f1..d4390da66506 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,611 +3,611 @@ { attica = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/attica-5.41.0.tar.xz"; - sha256 = "1l97qhf053z7grl8d77p9zajdvaw3zicllwna9p2vyzbb6n6qyq7"; - name = "attica-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/attica-5.42.0.tar.xz"; + sha256 = "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd"; + name = "attica-5.42.0.tar.xz"; }; }; baloo = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/baloo-5.41.0.tar.xz"; - sha256 = "1kl4xs09r21bi11b5dzjkmc8igh5iv8nvq0gxd00n7qjghpxa399"; - name = "baloo-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/baloo-5.42.0.tar.xz"; + sha256 = "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl"; + name = "baloo-5.42.0.tar.xz"; }; }; bluez-qt = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/bluez-qt-5.41.0.tar.xz"; - sha256 = "08wlsmr12n3whqr65zm3l9hmzbaca2jkkhb1wwq5ilqm3gvxxz0n"; - name = "bluez-qt-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/bluez-qt-5.42.0.tar.xz"; + sha256 = "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f"; + name = "bluez-qt-5.42.0.tar.xz"; }; }; breeze-icons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/breeze-icons-5.41.0.tar.xz"; - sha256 = "1k06ms48cnnwnlrh9wdabsms581jy70nz5narwg1zpzb6clf9p4w"; - name = "breeze-icons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz"; + sha256 = "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r"; + name = "breeze-icons-5.42.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz"; - sha256 = "0rwz2rdyxr424z0mra29p8i6gf0b1402ifi94qrq7y4z1fa61bxs"; - name = "extra-cmake-modules-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz"; + sha256 = "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3"; + name = "extra-cmake-modules-5.42.0.tar.xz"; }; }; frameworkintegration = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/frameworkintegration-5.41.0.tar.xz"; - sha256 = "1k67hkzc2jw5im7vc8j64fqsxz5m8fnlq696hm5dh4fbclyckh5s"; - name = "frameworkintegration-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/frameworkintegration-5.42.0.tar.xz"; + sha256 = "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7"; + name = "frameworkintegration-5.42.0.tar.xz"; }; }; kactivities = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kactivities-5.41.0.tar.xz"; - sha256 = "1zxwmizq48kk6pd9y350gzszqi87wjbqni8z4mxa1kmw9lq01xlc"; - name = "kactivities-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kactivities-5.42.0.tar.xz"; + sha256 = "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r"; + name = "kactivities-5.42.0.tar.xz"; }; }; kactivities-stats = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kactivities-stats-5.41.0.tar.xz"; - sha256 = "1nm34ln222x6mm4zpmvn8prqk9fr3jxyppn18kwlv0nfw16qmppq"; - name = "kactivities-stats-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kactivities-stats-5.42.0.tar.xz"; + sha256 = "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8"; + name = "kactivities-stats-5.42.0.tar.xz"; }; }; kapidox = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kapidox-5.41.0.tar.xz"; - sha256 = "0jdphs536ymaj5f9gh5ycfgq1d41sas6bx4dzzjg13y26w6afyy6"; - name = "kapidox-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kapidox-5.42.0.tar.xz"; + sha256 = "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz"; + name = "kapidox-5.42.0.tar.xz"; }; }; karchive = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/karchive-5.41.0.tar.xz"; - sha256 = "0hd7jy9517m53ijvprl9ci97kjx7nd42ga33af71kqx5x030zi23"; - name = "karchive-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/karchive-5.42.0.tar.xz"; + sha256 = "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi"; + name = "karchive-5.42.0.tar.xz"; }; }; kauth = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kauth-5.41.0.tar.xz"; - sha256 = "1hkaf83p3xwcwkhlfbrdbg7b7nhw0gh0yw4lv8y3vpryn7pcd32l"; - name = "kauth-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kauth-5.42.0.tar.xz"; + sha256 = "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi"; + name = "kauth-5.42.0.tar.xz"; }; }; kbookmarks = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kbookmarks-5.41.0.tar.xz"; - sha256 = "173rf85msrp1awmf2zsxwv6jjfkz7yc2pbh4jq0hfcgnqk46s9v0"; - name = "kbookmarks-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kbookmarks-5.42.0.tar.xz"; + sha256 = "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2"; + name = "kbookmarks-5.42.0.tar.xz"; }; }; kcmutils = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcmutils-5.41.0.tar.xz"; - sha256 = "165b5hk0cv769kk9dqqggc6ji6gzln8zns5k6rv12rz825aysnhs"; - name = "kcmutils-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcmutils-5.42.0.tar.xz"; + sha256 = "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7"; + name = "kcmutils-5.42.0.tar.xz"; }; }; kcodecs = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcodecs-5.41.0.tar.xz"; - sha256 = "0y96mbp9j083kwkqxk0qgrjyhylp8f7f0ngcqcvhh8s6sgpb8xq9"; - name = "kcodecs-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcodecs-5.42.0.tar.xz"; + sha256 = "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc"; + name = "kcodecs-5.42.0.tar.xz"; }; }; kcompletion = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcompletion-5.41.0.tar.xz"; - sha256 = "0b6bh5l4s5q8yi6vls11c8b8dpscykh138kydfi925nxkrms7yv3"; - name = "kcompletion-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcompletion-5.42.0.tar.xz"; + sha256 = "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f"; + name = "kcompletion-5.42.0.tar.xz"; }; }; kconfig = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kconfig-5.41.0.tar.xz"; - sha256 = "1jch9bpqshigwvc2qs46qa0mclr1hdn0sqlkxbl4b2xb5xj28nzn"; - name = "kconfig-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kconfig-5.42.0.tar.xz"; + sha256 = "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq"; + name = "kconfig-5.42.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kconfigwidgets-5.41.0.tar.xz"; - sha256 = "1lbpjkhxmpah32ig1wlxkr1v1l3fqicnnvj6lhwpk0bxys8cdnd2"; - name = "kconfigwidgets-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kconfigwidgets-5.42.0.tar.xz"; + sha256 = "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z"; + name = "kconfigwidgets-5.42.0.tar.xz"; }; }; kcoreaddons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcoreaddons-5.41.0.tar.xz"; - sha256 = "1f45x4adql708903x4g27x1wbzvbwd809ibiqa5kiijayaqkjxqf"; - name = "kcoreaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcoreaddons-5.42.0.tar.xz"; + sha256 = "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9"; + name = "kcoreaddons-5.42.0.tar.xz"; }; }; kcrash = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcrash-5.41.0.tar.xz"; - sha256 = "1jp06hz33mpcy2y93w4j3yqcvkphigiwq6j89mvgi9h21pahpjvy"; - name = "kcrash-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcrash-5.42.0.tar.xz"; + sha256 = "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins"; + name = "kcrash-5.42.0.tar.xz"; }; }; kdbusaddons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdbusaddons-5.41.0.tar.xz"; - sha256 = "02d6zv43vpz5h8si100zlsf5yfgjajsgwldcxblckyjr0qn42xny"; - name = "kdbusaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdbusaddons-5.42.0.tar.xz"; + sha256 = "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd"; + name = "kdbusaddons-5.42.0.tar.xz"; }; }; kdeclarative = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdeclarative-5.41.0.tar.xz"; - sha256 = "1hxfrz4d7xjm63b9kawhf382gz1xykvdi9q4syhkjfbpyacxfjga"; - name = "kdeclarative-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdeclarative-5.42.0.tar.xz"; + sha256 = "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22"; + name = "kdeclarative-5.42.0.tar.xz"; }; }; kded = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kded-5.41.0.tar.xz"; - sha256 = "10wmj3nb8vn90h1j0s5kfr8iydk7k853gg9v6hxivm92v6zr6l9g"; - name = "kded-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kded-5.42.0.tar.xz"; + sha256 = "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l"; + name = "kded-5.42.0.tar.xz"; }; }; kdelibs4support = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kdelibs4support-5.41.0.tar.xz"; - sha256 = "1mkp3w8h8cyskbfxcwsl72v87376x66n20ig7b3b6ply36578br4"; - name = "kdelibs4support-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.0.tar.xz"; + sha256 = "0aiig8akn6bdxrqdl96xjjy2pxw8hhfrsalbkkzyhh06j794snfb"; + name = "kdelibs4support-5.42.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdesignerplugin-5.41.0.tar.xz"; - sha256 = "1c1pnjgp9nifynwvsyjp7c45j40i111xnmjp89bb1jk9fv9g2f99"; - name = "kdesignerplugin-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdesignerplugin-5.42.0.tar.xz"; + sha256 = "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6"; + name = "kdesignerplugin-5.42.0.tar.xz"; }; }; kdesu = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdesu-5.41.0.tar.xz"; - sha256 = "126m7by50zzkmk0r778xlkqfbfpihwd6d3wzd4hbqkh9km18l1rb"; - name = "kdesu-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdesu-5.42.0.tar.xz"; + sha256 = "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx"; + name = "kdesu-5.42.0.tar.xz"; }; }; kdewebkit = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdewebkit-5.41.0.tar.xz"; - sha256 = "1rnixlm37x5k4cdwckml2zdmm30k938nklkd7qnbaal230dzvj6d"; - name = "kdewebkit-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdewebkit-5.42.0.tar.xz"; + sha256 = "1csd4p996im7ygxc5rfdkzgdpngjgzyqakj12rl9rnfbsd15i8kb"; + name = "kdewebkit-5.42.0.tar.xz"; }; }; kdnssd = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdnssd-5.41.0.tar.xz"; - sha256 = "042dmh50rxvipb5pqz0csb3y7cvzc2ga2a5qcvd1vw84ii1mmjbh"; - name = "kdnssd-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdnssd-5.42.0.tar.xz"; + sha256 = "1k1rz62h3mafliik5n0k98dc56b5v2v6qyqj40696mcyc2d1yvll"; + name = "kdnssd-5.42.0.tar.xz"; }; }; kdoctools = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdoctools-5.41.0.tar.xz"; - sha256 = "06v63br6m5nhvsdsynhb7i825yrry94s7zrk20k0xw4yahpvkjcs"; - name = "kdoctools-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdoctools-5.42.0.tar.xz"; + sha256 = "1bby3avdllch1mji0mxzcix8q5yir5a0i6wpjs5lwckv1glh6kmz"; + name = "kdoctools-5.42.0.tar.xz"; }; }; kemoticons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kemoticons-5.41.0.tar.xz"; - sha256 = "1lj6c6k8dh2rgj1128ms2xv7dk1v9li5rcy2djqfynqdrvg5iy3g"; - name = "kemoticons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kemoticons-5.42.0.tar.xz"; + sha256 = "0f6an1bwxnga41a2b35b2pdcni4p0hh76k4jvanl3g046v07f2wr"; + name = "kemoticons-5.42.0.tar.xz"; }; }; kfilemetadata = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kfilemetadata-5.41.0.tar.xz"; - sha256 = "0y9ya18bqa8sfi2c10y2q0dkwdry0wfq5s2sb53q0fh2fph7hjvi"; - name = "kfilemetadata-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kfilemetadata-5.42.0.tar.xz"; + sha256 = "03wk38q3sq354ykz9dwbgykn73ldf94ryx6hxvpr66bq3a59jmwz"; + name = "kfilemetadata-5.42.0.tar.xz"; }; }; kglobalaccel = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kglobalaccel-5.41.0.tar.xz"; - sha256 = "0i8aw0jbsh26asjmhs0lax1yv9qalpr82cd8m0nbyqn2s3f4jyaf"; - name = "kglobalaccel-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kglobalaccel-5.42.0.tar.xz"; + sha256 = "0nlza73i0qd79yhwhpnvgbh2xa9lvd1n2xg25p3bvfzwidcfdxg6"; + name = "kglobalaccel-5.42.0.tar.xz"; }; }; kguiaddons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kguiaddons-5.41.0.tar.xz"; - sha256 = "0cva0qy946srqay9nmh97mjv7kf2lr51nipx9qx2jd21d8cvz8p1"; - name = "kguiaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kguiaddons-5.42.0.tar.xz"; + sha256 = "193i8b4f13dkgp88m3pk9wzi0dhx7qmsnmpizxia3457gg016wn7"; + name = "kguiaddons-5.42.0.tar.xz"; }; }; khtml = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/khtml-5.41.0.tar.xz"; - sha256 = "0gbs63d7izb8kaf4k8ssp2lkcps9fqk32czjpmzx3fq1gnaczry3"; - name = "khtml-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/khtml-5.42.0.tar.xz"; + sha256 = "1bfslndxvad0zgzr22w2mz1xwavix9bh5qrrv8dpshlh043bwr3l"; + name = "khtml-5.42.0.tar.xz"; }; }; ki18n = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/ki18n-5.41.0.tar.xz"; - sha256 = "12ylqsi7lsxvdcg9a1p9hkd6lpcj971k77zly6vpb4yb3s6z0jqd"; - name = "ki18n-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/ki18n-5.42.0.tar.xz"; + sha256 = "1rpriflb2a48j94zxgh63l6rzq4nlnlkvy89ns1vkdw42bnqrjx9"; + name = "ki18n-5.42.0.tar.xz"; }; }; kiconthemes = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kiconthemes-5.41.0.tar.xz"; - sha256 = "1ywg7b3vy3p7vmd055a72hmpnwp0l0yvf6cnb6nvmpnp3pm737g1"; - name = "kiconthemes-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kiconthemes-5.42.0.tar.xz"; + sha256 = "1nbxxpf8bv835xl35b17rk8s3zs110bh31078kqqh7dhvwzlxic7"; + name = "kiconthemes-5.42.0.tar.xz"; }; }; kidletime = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kidletime-5.41.0.tar.xz"; - sha256 = "0k4q8ssqfbgfqvjq1rpills16nz4fi92mc754644by3s0czh409w"; - name = "kidletime-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kidletime-5.42.0.tar.xz"; + sha256 = "019r41r28pcrcn1kwxsll53za705jkc9n23b6sr2lplgjk05bcxh"; + name = "kidletime-5.42.0.tar.xz"; }; }; kimageformats = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kimageformats-5.41.0.tar.xz"; - sha256 = "11df264s3n192pggdmql2pklnflc8fn9v8zrjpn38f99hs46bq8s"; - name = "kimageformats-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kimageformats-5.42.0.tar.xz"; + sha256 = "1k67yrmszx7azjzrg478rimbz991lghx4d6dmg22p6dknajd78a6"; + name = "kimageformats-5.42.0.tar.xz"; }; }; kinit = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kinit-5.41.0.tar.xz"; - sha256 = "05jqsnj33gwxp4lc81378kb58idnmcmn84smy3hkqwlakisnwgy9"; - name = "kinit-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kinit-5.42.0.tar.xz"; + sha256 = "05vpac41pw1n8y58l2z08vyknzv950x8dxxw66dnymm2v31w07ia"; + name = "kinit-5.42.0.tar.xz"; }; }; kio = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kio-5.41.0.tar.xz"; - sha256 = "17k4pfbhkv1inx5c3wqm388c02cdf3wnqgnhky271v7gb5ww5i4h"; - name = "kio-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kio-5.42.0.tar.xz"; + sha256 = "1526a89x11ank55dp3rfp7xd04w8x7prjg3y6i7n2q9nabwhw7gc"; + name = "kio-5.42.0.tar.xz"; }; }; kirigami2 = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kirigami2-5.41.0.tar.xz"; - sha256 = "04l7b86fs7s80dfrznc2c0zh6phpgirwsinykrzfqg792gmbvx2h"; - name = "kirigami2-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kirigami2-5.42.0.tar.xz"; + sha256 = "11gqn7amp0r9bgh8ldgisfc2lrkzkn5mq2a1madf24nvjbkvqnqv"; + name = "kirigami2-5.42.0.tar.xz"; }; }; kitemmodels = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kitemmodels-5.41.0.tar.xz"; - sha256 = "13kngcj8ifnhbp0jsrjwhw49my8pnw493g11y11cw17hw7sqg55k"; - name = "kitemmodels-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kitemmodels-5.42.0.tar.xz"; + sha256 = "0mcdzdqwmvf9pwirsrnjbhrgqphnfmanbl9zij4qsmin8n866mhc"; + name = "kitemmodels-5.42.0.tar.xz"; }; }; kitemviews = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kitemviews-5.41.0.tar.xz"; - sha256 = "0147pm5p03w1b71mrr5rssmh2n80q54ghfpbjpq3spjdkjg1f26f"; - name = "kitemviews-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kitemviews-5.42.0.tar.xz"; + sha256 = "1j1q0b08f8mnfc3r2a7rplyb2nv9f0aq5a3fxskinvg70c6y248w"; + name = "kitemviews-5.42.0.tar.xz"; }; }; kjobwidgets = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kjobwidgets-5.41.0.tar.xz"; - sha256 = "1fbdk6l8rbnyqn0cz2dm9cagn7x89zpy3wczj1cdvnc7k7wg75qv"; - name = "kjobwidgets-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kjobwidgets-5.42.0.tar.xz"; + sha256 = "1m3csdl7wh18ywv5p0qpbjpixvflgjcq3yvk3vlvh0sxxlwcz8k4"; + name = "kjobwidgets-5.42.0.tar.xz"; }; }; kjs = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kjs-5.41.0.tar.xz"; - sha256 = "1a263cng8i304yh66iq45hwpgnl8ng6wvjrsl11hhqmyv07h2kk0"; - name = "kjs-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kjs-5.42.0.tar.xz"; + sha256 = "1m26sb2qyrcgmpkw76k2yv5my2pkhld96vw6aaqm77q90faw734g"; + name = "kjs-5.42.0.tar.xz"; }; }; kjsembed = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kjsembed-5.41.0.tar.xz"; - sha256 = "1vxbh5rd9rdj3m7sag48c4cns443j479mlfbwxgnpm92z67ka7x7"; - name = "kjsembed-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kjsembed-5.42.0.tar.xz"; + sha256 = "10w4w4ncwr245bv1ii4sh154w91ghfz0l60k89j50lsydpcqcp3a"; + name = "kjsembed-5.42.0.tar.xz"; }; }; kmediaplayer = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kmediaplayer-5.41.0.tar.xz"; - sha256 = "03420i82p984w6iqdiam2xam7b9khh76pll4ffn0c5k4wf1ba2z4"; - name = "kmediaplayer-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kmediaplayer-5.42.0.tar.xz"; + sha256 = "1k1pjc0cz36gs0pl2pxw8f9f82xkbqyy320nfyhan5waxbl1qd5n"; + name = "kmediaplayer-5.42.0.tar.xz"; }; }; knewstuff = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/knewstuff-5.41.0.tar.xz"; - sha256 = "0j9qgswiacv7yj8c28q343falaglh5zc4wwcflwy1zvrp59bjcz4"; - name = "knewstuff-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/knewstuff-5.42.0.tar.xz"; + sha256 = "0i2gmyp67xzf2m5wnv7v574q3gsp1yxfflv1jgl0wy57vchwn9g6"; + name = "knewstuff-5.42.0.tar.xz"; }; }; knotifications = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/knotifications-5.41.0.tar.xz"; - sha256 = "1dsiigmzmhmg3x6y5nf2i9zq3hc4nca2gg2dvl0bz1lm438ddy84"; - name = "knotifications-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/knotifications-5.42.0.tar.xz"; + sha256 = "0awmwypmd104vhaj2v9k83niflxj26d4mbl6mzfcj75lgka6kffc"; + name = "knotifications-5.42.0.tar.xz"; }; }; knotifyconfig = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/knotifyconfig-5.41.0.tar.xz"; - sha256 = "0hrdjh76php34wkcswnh5rfnkajf0g9n8mpqsdj4djxja39vi6vs"; - name = "knotifyconfig-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/knotifyconfig-5.42.0.tar.xz"; + sha256 = "1h07bjj71611v6912m5ajli6qszh9w925zqbk3vih8rn6pd2s3mc"; + name = "knotifyconfig-5.42.0.tar.xz"; }; }; kpackage = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kpackage-5.41.0.tar.xz"; - sha256 = "1663sshy52my9qbrj8ny1a6sipl94l2paxss4k5977fyyax15zdm"; - name = "kpackage-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kpackage-5.42.0.tar.xz"; + sha256 = "10amhh07x8d0jkyylb19cyzjs71k8dq1y8isfahqzb2kd43vijqa"; + name = "kpackage-5.42.0.tar.xz"; }; }; kparts = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kparts-5.41.0.tar.xz"; - sha256 = "09ddh7n8jj8zisdm90lbmc4xk4axsibhx1cjbpaigzcfcvnj1b71"; - name = "kparts-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kparts-5.42.0.tar.xz"; + sha256 = "1mb5gp2ckmmrb4ym7cqvyl81wnp7cryk85gmizl7cnn69svlf40h"; + name = "kparts-5.42.0.tar.xz"; }; }; kpeople = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kpeople-5.41.0.tar.xz"; - sha256 = "1k72br66mnvkripzdq2wcchlrg6p7mxfqa0rbq0rq3q7npw1zzw5"; - name = "kpeople-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kpeople-5.42.0.tar.xz"; + sha256 = "050km3rpx58acx2341si46lxc2hywa59m8rwd849c2dnsxw3w1hm"; + name = "kpeople-5.42.0.tar.xz"; }; }; kplotting = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kplotting-5.41.0.tar.xz"; - sha256 = "197n2m3q9b588j56m30i12z55nbymbj4wgpgrkbsci7162jjjj1z"; - name = "kplotting-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kplotting-5.42.0.tar.xz"; + sha256 = "109b9grshrwralyp8ilkbf1k0akaggygqh6wafqdf0ris0ps13l9"; + name = "kplotting-5.42.0.tar.xz"; }; }; kpty = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kpty-5.41.0.tar.xz"; - sha256 = "04xg5pn65nvk1bdh6bfznbsmlra6gzph72i7m28h9idnz143lr12"; - name = "kpty-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kpty-5.42.0.tar.xz"; + sha256 = "07s16zxs03ixy7yxy9fda83yqhcgqzx42gnvwjwkyc8q05njmma6"; + name = "kpty-5.42.0.tar.xz"; }; }; kross = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kross-5.41.0.tar.xz"; - sha256 = "0xsfgwb3ihgby6r6wycxnqkd9d7zrj6w3h9bxw8n4asjfri7lgwi"; - name = "kross-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kross-5.42.0.tar.xz"; + sha256 = "1aqqwby6jslimpvx42d4n6gjsjc8l82gmsq5ajpv9zkkk91dqfqi"; + name = "kross-5.42.0.tar.xz"; }; }; krunner = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/krunner-5.41.0.tar.xz"; - sha256 = "0vyxijs0vnpa19z7avd1438q1c7s4ka17hbsdq2r0jza3iwkfx83"; - name = "krunner-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/krunner-5.42.0.tar.xz"; + sha256 = "0xh9kss67l09am1ilsr9zyx1yhlmaq3g9x60hw0sx7h7wrl6zsw6"; + name = "krunner-5.42.0.tar.xz"; }; }; kservice = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kservice-5.41.0.tar.xz"; - sha256 = "0k3ch3vbdy9rm82d9n6mf6ir3qm7l2fddp98jy4jmsr0qynqn50q"; - name = "kservice-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kservice-5.42.0.tar.xz"; + sha256 = "0z8zfpd00ndvkm1klp8l4mrcksshhyg280zgmg3gffz5rgh3gwri"; + name = "kservice-5.42.0.tar.xz"; }; }; ktexteditor = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/ktexteditor-5.41.0.tar.xz"; - sha256 = "1idvldchfbnvimvcrizigmmam62q7rpam06xprcizywyxq53yw7z"; - name = "ktexteditor-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/ktexteditor-5.42.0.tar.xz"; + sha256 = "020y3j6vm15sfpiwainr3qsx9i93j15mrvq523wmbmdj1z36yrh2"; + name = "ktexteditor-5.42.0.tar.xz"; }; }; ktextwidgets = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/ktextwidgets-5.41.0.tar.xz"; - sha256 = "0m6n4v0njvcaky87f0ga47iwq12hsvghadj8pngjrksankvaj23n"; - name = "ktextwidgets-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/ktextwidgets-5.42.0.tar.xz"; + sha256 = "088azbv95ycwxmxxw4l63i2l14fmn8l473pb4djh2mvz1ypfqayk"; + name = "ktextwidgets-5.42.0.tar.xz"; }; }; kunitconversion = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kunitconversion-5.41.0.tar.xz"; - sha256 = "1kn6lw58b9w6f38mra2hizbnik64ka3gvgqk1xqp0mspqmr498rw"; - name = "kunitconversion-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kunitconversion-5.42.0.tar.xz"; + sha256 = "0219pna4l3vvhyf5acsc87n48jzdnws6kwyhaiy3hy1pzrilv32l"; + name = "kunitconversion-5.42.0.tar.xz"; }; }; kwallet = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwallet-5.41.0.tar.xz"; - sha256 = "1gdzfp3gbr5qp821pkhaj6v8zg3q21xz6j11frjww8fn5nmp3v3l"; - name = "kwallet-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwallet-5.42.0.tar.xz"; + sha256 = "1kv3v7593srfn0wd7qp4rhvb30rxp7d2qmlwi0n4nc9s6v59pabn"; + name = "kwallet-5.42.0.tar.xz"; }; }; kwayland = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwayland-5.41.0.tar.xz"; - sha256 = "1dw2g6wwj7hhxlgzrjqk39ywpzh6ijwfjnzqjp6s8s5274fvjqbn"; - name = "kwayland-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwayland-5.42.0.tar.xz"; + sha256 = "0wr6ygppahxsx3dh71h2wmybv7z7iyqdv7wn80cxb0mp4zpyinh7"; + name = "kwayland-5.42.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwidgetsaddons-5.41.0.tar.xz"; - sha256 = "15fm7gni22wb64pski3fn5myrn9z22h077hzzcc34c3af21yh5s5"; - name = "kwidgetsaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.0.tar.xz"; + sha256 = "19fhcscc0irznqmjpi57sl22vrv2lcmqbhkcg2smimgd0r7pm7wg"; + name = "kwidgetsaddons-5.42.0.tar.xz"; }; }; kwindowsystem = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwindowsystem-5.41.0.tar.xz"; - sha256 = "0x4jz9qkvxs5dlzk860f8vhlczgxg6di614y8ji6afra760nk17l"; - name = "kwindowsystem-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwindowsystem-5.42.0.tar.xz"; + sha256 = "15k6x0f93qxka3mz7qfzak2ibdd88q77pz6akil8s3g41zsg2dqv"; + name = "kwindowsystem-5.42.0.tar.xz"; }; }; kxmlgui = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kxmlgui-5.41.0.tar.xz"; - sha256 = "0cgwx3lhnn982gvl2yv5272bs3il05ssfpjlkgmqgnrnz2qxlhlr"; - name = "kxmlgui-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kxmlgui-5.42.0.tar.xz"; + sha256 = "0kfxjx8wrhkys5bydnv84nqxc2jqvv92zb2l6zpi0km5ggmia5y0"; + name = "kxmlgui-5.42.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kxmlrpcclient-5.41.0.tar.xz"; - sha256 = "0y7n6xk18a6zci36ka426h7ar8r7kkr80jn47mc6jw3qdk4nvri7"; - name = "kxmlrpcclient-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kxmlrpcclient-5.42.0.tar.xz"; + sha256 = "0ciip27ilsfk9s3gslpbi06v8i6ipdbmcig2jf43z3amsxpq0ncn"; + name = "kxmlrpcclient-5.42.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/modemmanager-qt-5.41.0.tar.xz"; - sha256 = "1bp9mllzgvqr3dsjg9a81yv487whf26vfxiyim8hr42b9j8v8wj0"; - name = "modemmanager-qt-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/modemmanager-qt-5.42.0.tar.xz"; + sha256 = "0q6qzn60z55h0gyc9xwdfaq45mjpk3zrr6d4qqjjfkqsr3866sfx"; + name = "modemmanager-qt-5.42.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/networkmanager-qt-5.41.0.tar.xz"; - sha256 = "0vdrbfwamk5p6mm0i05bxvmrlqxm9c5d373pn7qrm0kzs916xhlv"; - name = "networkmanager-qt-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/networkmanager-qt-5.42.0.tar.xz"; + sha256 = "03hhvx8d52mfgbhd4gn0vhsk9k1fv1pvq24ixxdgs2mw44v884xq"; + name = "networkmanager-qt-5.42.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/oxygen-icons5-5.41.0.tar.xz"; - sha256 = "1zpcjfzw4pv73ms8pc1w4fpvxcbpasl2av0g4y6sj7rshzdgrj31"; - name = "oxygen-icons5-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/oxygen-icons5-5.42.0.tar.xz"; + sha256 = "0pnav9h0xmvbaamzpcyznjjv25slz8maszshx7sj7h07b5a23x46"; + name = "oxygen-icons5-5.42.0.tar.xz"; }; }; plasma-framework = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/plasma-framework-5.41.0.tar.xz"; - sha256 = "1risn810pyncfpn01xiqsb5j8pwsnmx60lfajnx7qygny6b69pl4"; - name = "plasma-framework-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/plasma-framework-5.42.0.tar.xz"; + sha256 = "079c8h0lmbkfr3srj5m8a40b50kyrxbgmy1n66329l8js9xrvaah"; + name = "plasma-framework-5.42.0.tar.xz"; }; }; prison = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/prison-5.41.0.tar.xz"; - sha256 = "0q3r1a3047yxhsd3qfwzwsw261zrfdmsklnyq5d2ayflchcj5vxi"; - name = "prison-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/prison-5.42.0.tar.xz"; + sha256 = "0bhg2fjdwsv7mk16jh1nc3miwggz1dl9l99l2f20xvi75hn7rryg"; + name = "prison-5.42.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/qqc2-desktop-style-5.41.0.tar.xz"; - sha256 = "166cjfaly8fzzchq8pk2s7f5mm63cwmayw3qc0p7amy5d0nykm0w"; - name = "qqc2-desktop-style-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/qqc2-desktop-style-5.42.0.tar.xz"; + sha256 = "1arlfhcshfs11pgf87jzjgln1p711zlx0v0q014740mbzb9g5wnk"; + name = "qqc2-desktop-style-5.42.0.tar.xz"; }; }; solid = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/solid-5.41.0.tar.xz"; - sha256 = "0i2qxps26rg2x1576m35k4kj018i9jpsnlayzsk4fcj44kvsq9z3"; - name = "solid-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/solid-5.42.0.tar.xz"; + sha256 = "10lr8paaq6vaiqn833kzcdc3kkyv8j9fdchy7h8pvi9ajjjwq0lq"; + name = "solid-5.42.0.tar.xz"; }; }; sonnet = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/sonnet-5.41.0.tar.xz"; - sha256 = "1jhpl0ajqlln88fmzbwjxn0illbas4s0hbzwd3w56s9wg8j18s76"; - name = "sonnet-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/sonnet-5.42.0.tar.xz"; + sha256 = "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw"; + name = "sonnet-5.42.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/syntax-highlighting-5.41.0.tar.xz"; - sha256 = "0hmcb9f162hyvfb0mfkm69avgrbl146l7lyfzb93z1hk6f2gpxqc"; - name = "syntax-highlighting-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/syntax-highlighting-5.42.0.tar.xz"; + sha256 = "1iwiym50859jki4x41rfdmbd14jiq5lr2hdg46pjkyw17njdjd60"; + name = "syntax-highlighting-5.42.0.tar.xz"; }; }; threadweaver = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/threadweaver-5.41.0.tar.xz"; - sha256 = "08nlskhdds13wplv4lwy4xshimkhl8jvzkz1h1qks6wggbwxf11m"; - name = "threadweaver-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/threadweaver-5.42.0.tar.xz"; + sha256 = "1isqlpnfxzxyz7mdm7yfrafgnx09mcndicdgdw3mi4r4misbrrbn"; + name = "threadweaver-5.42.0.tar.xz"; }; }; } From cb6a25db0aff4548469d13a2c21b6daa5ba1844e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jan 2018 15:38:36 +0100 Subject: [PATCH 152/197] spectre-meltdown-checker: init at 0.29 --- .../spectre-meltdown-checker/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/spectre-meltdown-checker/default.nix diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix new file mode 100644 index 000000000000..9c12a4fa1060 --- /dev/null +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, binutils-unwrapped }: + +stdenv.mkDerivation rec { + name = "spectre-meltdown-checker-${version}"; + version = "0.29"; + + src = fetchFromGitHub { + owner = "speed47"; + repo = "spectre-meltdown-checker"; + rev = "v${version}"; + sha256 = "14i9gx1ngs3ixjirlx4qd87pmac916rvv9y61a5f7nl0dig4awl4"; + }; + + patches = fetchpatch { + url = "https://github.com/speed47/spectre-meltdown-checker/pull/79.patch"; + sha256 = "185kac5r97s3dnihgpwx4aashnzffb1f09xv9jw409g7i6cv2sq9"; + }; + + prePatch = '' + substituteInPlace spectre-meltdown-checker.sh \ + --replace /bin/echo echo + ''; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = with stdenv.lib; '' + install -Dt $out/lib spectre-meltdown-checker.sh + makeWrapper $out/lib/spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker \ + --prefix PATH : ${makeBinPath [ binutils-unwrapped ]} + ''; + + meta = with stdenv.lib; { + description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; + homepage = https://github.com/speed47/spectre-meltdown-checker; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b90f81a1972..c6063ac59d2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4627,6 +4627,8 @@ with pkgs; sparsehash = callPackage ../development/libraries/sparsehash { }; + spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; + spiped = callPackage ../tools/networking/spiped { }; sqliteman = callPackage ../applications/misc/sqliteman { }; From f2c08d3e9e65cf944c18aefddae7a79964fc745a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Jan 2018 21:53:41 +0100 Subject: [PATCH 153/197] python3Packages.netdisco: init at 1.2.3 --- .../python-modules/netdisco/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/netdisco/default.nix diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix new file mode 100644 index 000000000000..280c110e11d5 --- /dev/null +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }: + +buildPythonPackage rec { + pname = "netdisco"; + version = "1.2.3"; + + disabled = !isPy3k; + + # PyPI is missing tests/ directory + src = fetchFromGitHub { + owner = "home-assistant"; + repo = pname; + rev = version; + sha256 = "137p7qlv85mva96v6kav8xxca7i09k4giayag4cglrgjd7q3lk1r"; + }; + + propagatedBuildInputs = [ requests zeroconf netifaces ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Python library to scan local network for services and devices"; + homepage = https://github.com/home-assistant/netdisco/; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e635ef40539d..74d08255cb17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5954,6 +5954,8 @@ in { netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + netdisco = callPackage ../development/python-modules/netdisco { }; + Nikola = callPackage ../development/python-modules/Nikola { }; nxt-python = buildPythonPackage rec { From 9306956b8a5b1d92560e8b508ef5700ab3569e4b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 14 Jan 2018 17:09:55 +0100 Subject: [PATCH 154/197] fantasque-sans-mono: 1.7.1 -> 1.7.2 --- pkgs/data/fonts/fantasque-sans-mono/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index de52ae411efb..7d05482ef5ff 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,11 +1,15 @@ -{stdenv, fetchzip}: +{ stdenv, fetchzip }: let - version = "1.7.1"; -in fetchzip rec { + + version = "1.7.2"; + +in + +fetchzip rec { name = "fantasque-sans-mono-${version}"; - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -13,13 +17,13 @@ in fetchzip rec { unzip -j $downloadedFile README.md -d $out/share/doc/${name} ''; - sha256 = "1sjdpnxyjdbqxzrylzkynxh1bmicc71h3pmwmr3a3cq0h53g28z0"; + sha256 = "1fwvbqfrgb539xybwdawvwa8cg4f215kw905rgl9a6p0iwa1nxqk"; meta = with stdenv.lib; { homepage = https://github.com/belluzj/fantasque-sans; description = "A font family with a great monospaced variant for programmers"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } From 05d803ab5f015a49d2e24ea3fd93262d989a8739 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 15 Jan 2018 01:47:42 +0800 Subject: [PATCH 155/197] qmltermwidget: Use fetchFromGitHub --- pkgs/development/libraries/qmltermwidget/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 2057aee3e995..79ed37dd2a9a 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, qtbase, qtquick1, qmake, qtmultimedia }: +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }: stdenv.mkDerivation rec { version = "0.1.0"; name = "qmltermwidget-${version}"; - src = fetchgit { - url = "https://github.com/Swordfish90/qmltermwidget.git"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + repo = "qmltermwidget"; + owner = "Swordfish90"; + rev = "v${version}"; sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; }; From 3538492f3308952b74570ddd63e1bc1999f9c641 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 15 Jan 2018 01:47:57 +0800 Subject: [PATCH 156/197] cool-retro-term: 1.0.0 -> 1.0.1 --- pkgs/applications/misc/cool-retro-term/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 985a418e1582..f4ad3a1c5382 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchgit, qtbase, qtquick1, qmltermwidget, +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget, qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; name = "cool-retro-term-${version}"; - src = fetchgit { - url = "https://github.com/Swordfish90/cool-retro-term.git"; - rev = "refs/tags/v${version}"; - sha256 = "19sf9ppp2xzwfjwmdqgq9pils4yafsz662n1h65sv5aq04c7gmxs"; - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "Swordfish90"; + repo = "cool-retro-term"; + rev = version; + sha256 = "1ah54crqv13xsg9cvlwmgyhz90xjjy3vy8pbn9i0vc0ljmpgkqd5"; }; patchPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6063ac59d2e..5b5ad168f96a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1660,7 +1660,7 @@ with pkgs; convoy = callPackage ../tools/filesystems/convoy { }; - cool-retro-term = libsForQt56.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; From f0b97a6dac8d5a1471cd6ac181b8d012b27d5ae6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 15 Jan 2018 02:04:23 +0800 Subject: [PATCH 157/197] mendeley: Re-link with qt 5.9 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b5ad168f96a..766aa78dc936 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15967,7 +15967,7 @@ with pkgs; mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = libsForQt56.callPackage ../applications/office/mendeley { + mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; From b986078593af4108371c210ce0106b6b3e82ee20 Mon Sep 17 00:00:00 2001 From: David Asabina Date: Sat, 13 Jan 2018 13:38:16 +0100 Subject: [PATCH 158/197] bitscope: refactored to pass nixpkgs-lint The linter (nixpkgs-lint) was not able to find the bitscope packages because `recurseIntoAttrs` was not applied to the suite's set. The name supplied to `buildFHSUserEnv` produces a binary that corresponds to the binary names in the deb packages (e.g.: bitscope-dso, bitscope-chart, bitscope-logic, etc), however; this name does not constitute a valid nixpkgs name. Valid nixpkgs names satisfy the `/(.*)(-[0-9].*)$/` pattern, therefore a valid name is merged into the derivation produced by `buildFHSUserEnv`. --- .../applications/science/electronics/bitscope/common.nix | 9 ++++++--- .../science/electronics/bitscope/packages.nix | 2 +- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index b93b68458f9a..90bf4dc840df 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -9,7 +9,7 @@ , makeWrapper , pango , stdenv -, writeScriptBin +, writeTextFile , xorg }: @@ -60,8 +60,11 @@ let ${(wrapBinary libs) attrs.toolName} ''; }); + fhs = target: buildFHSUserEnv { + inherit (pkg) name; + runScript = target; + }; in buildFHSUserEnv { name = attrs.toolName; - meta = pkg.meta; runScript = "${pkg.outPath}/bin/${attrs.toolName}"; -} +} // { inherit (pkg) meta name; } diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix index bb7710bf82eb..c10e9de851a4 100644 --- a/pkgs/applications/science/electronics/bitscope/packages.nix +++ b/pkgs/applications/science/electronics/bitscope/packages.nix @@ -88,7 +88,7 @@ in { meta = { description = "Mixed signal logic timing and serial protocol analysis software for BitScope"; - home = "http://bitscope.com/software/logic/"; + homepage = "http://bitscope.com/software/logic/"; }; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b5ad168f96a..6cdbeb7be694 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14262,7 +14262,8 @@ with pkgs; bitmeter = callPackage ../applications/audio/bitmeter { }; - bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { }; + bitscope = recurseIntoAttrs + (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { inherit (gnome2) zenity; From 01e1ba6ab264f20924c8304ef0482536c3104d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 14 Jan 2018 17:10:17 -0200 Subject: [PATCH 159/197] uget: 2.0.10 -> 2.2.0 --- pkgs/tools/networking/uget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 7d3e4ba1c61b..620584ab1df1 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "uget-${version}"; - version = "2.0.10"; + version = "2.2.0"; src = fetchurl { url = "mirror://sourceforge/urlget/${name}.tar.gz"; - sha256 = "1zldsiy83xxpm8jdh1i9h7zrh8ak52srgy38fiyszysfapl8nx8a"; + sha256 = "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m"; }; nativeBuildInputs = [ From fb5f636cd833330a01da7e9df9113b76612bc645 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 14 Jan 2018 20:45:17 +0100 Subject: [PATCH 160/197] svtplay-dl: 1.9.6 -> 1.9.7 --- pkgs/tools/misc/svtplay-dl/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5999fa316223..f0fa1c198885 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "11xw4whh60k61i8akd7avb254mmffaig72kb7w6prk1kjq05js2s"; + sha256 = "0zj102ir08s9knqqv8y6vy9rkrgk77xs7kqp00v9fzrlqyspf68r"; }; pythonPaths = [ pycrypto requests ]; @@ -34,7 +34,12 @@ in stdenv.mkDerivation rec { ''; doCheck = true; - checkPhase = "sh scripts/run-tests.sh -2"; + checkPhase = '' + sed -i "/def test_parse_m3u8/i\\ + @unittest.skip('requires internet')" lib/svtplay_dl/tests/hls.py + + sh scripts/run-tests.sh -2 + ''; meta = with stdenv.lib; { homepage = https://github.com/spaam/svtplay-dl; From dd798d13bd025fb6fb23fcf3135fa6978b523e43 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 14 Jan 2018 20:45:43 +0100 Subject: [PATCH 161/197] eclipse-plugin-checkstyle: 8.5.1 -> 8.7.0 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 769891423d7e..f13538cba6a3 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -192,12 +192,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "8.5.1.201712211522"; + version = "8.7.0.201801131309"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.5.1/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "0nid4a4qib9vx34ddry7sylj20p2d47dd0vn4zqqmj5dgqx1a1ab"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.7.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "07fymk705x4mwq7vh2i6frsf67jql4bzrkdzhb4n74zb0g1dib60"; }; meta = with stdenv.lib; { From 85cd22cf7df997c35192b28fa3b8f37320ffbe5e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 14 Jan 2018 19:53:57 +0000 Subject: [PATCH 162/197] treewide: replace `addPassthru` --- lib/customisation.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 08020456e7c8..32bc1b34683f 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -36,7 +36,7 @@ rec { overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in lib.flip addPassthru newDrv ( + in lib.flip (extendDerivation true) newDrv ( { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index fed6f382b81b..b1df6c54c456 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -134,7 +134,7 @@ let passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); }; - addPassthru' = lib.addPassthru passthru; + addPassthru' = lib.extendDerivation true passthru; nativeDrv = addPassthru' kernel.nativeDrv; From 41df99400149a6747b31c8ed1049f556c9c0e0ed Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 14 Jan 2018 19:54:47 +0000 Subject: [PATCH 163/197] lib: deprecate `addPassthru` --- lib/customisation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 32bc1b34683f..fb78335ea1c2 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -157,7 +157,8 @@ rec { /* Add attributes to each output of a derivation without changing the derivation itself. */ - addPassthru = extendDerivation true; + addPassthru = lib.warn "`addPassthru` is deprecated, replace with `extendDerivation true`" + (extendDerivation true); /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the From 4de01b67238829a1cb089f98447ee0057ef4a782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 10 Jan 2018 09:36:59 +0100 Subject: [PATCH 164/197] rebuild-amount.sh: add --print option (PR #33693) to allow additionally listing all the rebuilt packages. --- maintainers/scripts/rebuild-amount.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh index 098a8c88cb7e..1a54cada8af6 100755 --- a/maintainers/scripts/rebuild-amount.sh +++ b/maintainers/scripts/rebuild-amount.sh @@ -1,9 +1,16 @@ #!/usr/bin/env bash set -e +# --print: avoid dependency on environment +optPrint= +if [ "$1" == "--print" ]; then + optPrint=true + shift +fi + if [ "$#" != 1 ] && [ "$#" != 2 ]; then cat <<-EOF - Usage: $0 commit-spec [commit-spec] + Usage: $0 [--print] commit-spec [commit-spec] You need to be in a git-controlled nixpkgs tree. The current state of the tree will be used if the second commit is missing. EOF @@ -113,3 +120,8 @@ newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist" sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \ | sort | uniq -c +if [ -n "$optPrint" ]; then + echo + cat "$newlist" +fi + From 799b941a2bb61970d6b99366bcf2062f1ce14328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Jan 2018 21:33:58 +0100 Subject: [PATCH 165/197] release notes: mention removal of lib.addPassthru --- nixos/doc/manual/release-notes/rl-1803.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 3dc4c353e257..3c51dfbc88de 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -113,7 +113,7 @@ following incompatible changes: - cc-wrapperhas been split in two; there is now also a bintools-wrapper. + cc-wrapper has been split in two; there is now also a bintools-wrapper. The most commonly used files in nix-support are now split between the two wrappers. Some commonly used ones, like nix-support/dynamic-linker, are duplicated for backwards compatability, even though they rightly belong only in bintools-wrapper. Other more obscure ones are just moved. @@ -131,6 +131,11 @@ following incompatible changes: Other types dependencies should be unaffected. + + + lib.addPassthru is removed. Use lib.extendDerivation true instead. TODO: actually remove it before branching 18.03 off. + + From 1a054480d312a40feba4f579eec3cd2d0db21280 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 14 Jan 2018 15:35:45 -0500 Subject: [PATCH 166/197] mono54: init Still trying to figure out how msbuild should fit into the picture... --- pkgs/development/compilers/mono/5.4.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/compilers/mono/5.4.nix diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix new file mode 100644 index 000000000000..31e86f94c0a2 --- /dev/null +++ b/pkgs/development/compilers/mono/5.4.nix @@ -0,0 +1,8 @@ +{ stdenv, callPackage, Foundation, libobjc }: + +callPackage ./generic-cmake.nix (rec { + inherit Foundation libobjc; + version = "5.4.1.6"; + sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx"; + enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cdbeb7be694..1f456165d231 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6382,6 +6382,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); + mono54 = lowPrio (callPackage ../development/compilers/mono/5.4.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; From 332389611ac8cf4d6c09b763890164771d6124f2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 13:58:15 -0600 Subject: [PATCH 167/197] mendeley: Add update-checker script, add myself as maintainer Doesn't actually edit the file, but reports when an update is available and provides useful information. --- pkgs/applications/office/mendeley/default.nix | 11 +++- pkgs/applications/office/mendeley/update.nix | 60 +++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/office/mendeley/update.nix diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index c2b6dc710ba2..8c69c8f891c6 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -31,6 +31,8 @@ # will leave entries on your system after uninstalling mendeley. # (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u') , autorunLinkHandler ? true +# Update script +, writeScript }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -133,11 +135,14 @@ stdenv.mkDerivation { dontStrip = true; dontPatchElf = true; - meta = { + updateScript = import ./update.nix { inherit writeScript; }; + + meta = with stdenv.lib; { homepage = http://www.mendeley.com; description = "A reference manager and academic social network"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix new file mode 100644 index 000000000000..9ac82615c561 --- /dev/null +++ b/pkgs/applications/office/mendeley/update.nix @@ -0,0 +1,60 @@ +{ writeScript }: + +writeScript "update-mendeley" '' + function follow() { + local URL=$1 + while true; do + NEWURL=$(curl -m20 -sI "$URL" -o /dev/null -w '%{redirect_url}') + [ -z "$NEWURL" ] && break + [[ $NEWURL = $URL ]] && (echo "redirect loop?!"; exit 1) + echo "Following $URL -> $NEWURL ..." >&2 + URL=$NEWURL + done + + echo $URL + } + + amd64URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/amd64/mendeleydesktop-latest) + amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+") + i386URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/i386/mendeleydesktop-latest) + i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+") + + echo "amd64 version: $amd64V" + echo "i386 version: $i386V" + if [[ $amd64V != $i386V ]]; then + echo "Versions not the same!" + exit 1 + fi + + if grep -q -F "$amd64V" ${./default.nix}; then + echo "No new version yet, nothing to do." + echo "Have a nice day!" + exit 0 + fi + + amd64OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "x86_64-linux"| tr -d '"') + i386OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "i686-linux"| tr -d '"') + + echo "Prefetching amd64..." + amd64NewHash=$(nix-prefetch-url $amd64URL) + echo "Prefetching i386..." + i386NewHash=$(nix-prefetch-url $i386URL) + + # Don't actually update, just report that an update is available + cat < Date: Sun, 14 Jan 2018 14:34:03 -0600 Subject: [PATCH 168/197] mendeley: 1.17.12 -> 1.17.13 --- pkgs/applications/office/mendeley/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 8c69c8f891c6..6a741e0ab9eb 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -45,14 +45,14 @@ let then "i386" else "amd64"; - shortVersion = "1.17.12-stable"; + shortVersion = "1.17.13-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "09n910ny8k103g1v8m19f9n827l2y0kmz79cwgy95k6acf2rkc2x" - else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; + then "0q4x62k00whmq8lskphpcxc610cvclxzcr5k0v7pxjxs9sx5yx43" + else "01ylyily1hip35z0d4qkdpbzp5yn4r015psc5773xsqlgrnlwjm3"; deps = [ qtbase From 17453b2310419d4afdb30bf06712be9b6cdacc56 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 14:56:17 -0600 Subject: [PATCH 169/197] snowman: Drop qt4 variant cc #33248 --- pkgs/development/tools/analysis/snowman/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 907e44420e95..fba7d3d5cd41 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, qt4 ? null, qtbase ? null }: - -# Only one qt -assert qt4 != null -> qtbase == null; -assert qtbase != null -> qt4 == null; +{ stdenv, fetchFromGitHub, cmake, boost, qtbase }: stdenv.mkDerivation rec { name = "snowman-${version}"; @@ -17,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost qt4 qtbase ]; + buildInputs = [ boost qtbase ]; postUnpack = '' export sourceRoot=$sourceRoot/src diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f456165d231..2cd9fbd38b65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7868,9 +7868,7 @@ with pkgs; smc = callPackage ../tools/misc/smc { }; - snowman_qt4 = callPackage ../development/tools/analysis/snowman { }; - snowman_qt5 = qt5.callPackage ../development/tools/analysis/snowman { qt4 = null; }; - snowman = snowman_qt5; + snowman = qt5.callPackage ../development/tools/analysis/snowman { }; sparse = callPackage ../development/tools/analysis/sparse { }; From fecfd3b7ae6b71759167b886d7d9c40e1ea93de7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 15:42:28 -0600 Subject: [PATCH 170/197] wireshark: 2.4.3 -> 2.4.4 https://www.wireshark.org/docs/relnotes/wireshark-2.4.4.html --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f91c0de9c8d7..5556a58ec564 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.3"; + version = "2.4.4"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"; + sha256 = "0n3g28hrhifnchlz4av0blq4ykm4zaxwwxbzdm9wsba27677b6h4"; }; cmakeFlags = [ From 898ac01eb8070c05624ecbd11c8329a307a258ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jan 2018 22:50:42 +0100 Subject: [PATCH 171/197] spectre-meltdown-checker: 0.29 -> 0.31 --- .../security/spectre-meltdown-checker/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 9c12a4fa1060..65377538fc16 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, binutils-unwrapped }: +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, binutils-unwrapped }: stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "14i9gx1ngs3ixjirlx4qd87pmac916rvv9y61a5f7nl0dig4awl4"; - }; - - patches = fetchpatch { - url = "https://github.com/speed47/spectre-meltdown-checker/pull/79.patch"; - sha256 = "185kac5r97s3dnihgpwx4aashnzffb1f09xv9jw409g7i6cv2sq9"; + sha256 = "14g5q2prd5w2zhwi7sr9pnalakd87zkvxk0vrzw4cv3x71d44nk2"; }; prePatch = '' substituteInPlace spectre-meltdown-checker.sh \ - --replace /bin/echo echo + --replace /bin/echo ${coreutils}/bin/echo ''; nativeBuildInputs = [ makeWrapper ]; From 0ed9de25468515928415ac1bd9c7cceaa6bba6fa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 15 Jan 2018 00:03:38 +0200 Subject: [PATCH 172/197] gnuplot: Use quoting syntax that's compatible with old and new Nix versions There is probably a way to have it work with substituteInPlace, but using sed is a cheap solution to not having to figure out how to escape "'$'" in Nix that works in both versions. Issue #31179. Fixes #33833. --- pkgs/tools/graphics/gnuplot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 8aa14220250f..a177f33bb377 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postPatch = '' # lrelease is in qttools, not in qtbase. - substituteInPlace configure --replace '$'{QT5LOC}/lrelease lrelease + sed -i configure -e 's|''${QT5LOC}/lrelease|lrelease|' ''; configureFlags = [ From 50f48fce0957211b2c703dd91e444f05e3203546 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 15 Jan 2018 00:11:07 +0100 Subject: [PATCH 173/197] transmission: fix RCE via dns rebinding attach For further details see [1] & [2]. [1] https://github.com/transmission/transmission/pull/468 [2] http://www.openwall.com/lists/oss-security/2018/01/12/1 --- .../networking/p2p/transmission/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index d2bbef7f581f..3c5fb499a8bd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux @@ -27,6 +27,16 @@ stdenv.mkDerivation rec { ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; + patches = [ + (fetchpatch { + # See https://github.com/transmission/transmission/pull/468 + # Patch from: https://github.com/transmission/transmission/pull/468#issuecomment-357098126 + name = "transmission-fix-dns-rebinding-vuln.patch"; + url = https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt; + sha256 = "1p9m20kp4kdyp5jjr3yp5px627n8cfa29mg5n3wzsdfv0qzk9gy4"; + }) + ]; + postPatch = '' substituteInPlace ./configure \ --replace "libsystemd-daemon" "libsystemd" \ From 550136f516c9c940d602233fedeea7caf0ce5950 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 15 Jan 2018 05:01:50 +0100 Subject: [PATCH 174/197] ocamlPackages.asn1-combinators: 0.1.3 -> 0.2.0 (#33566) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.asn1-combinators: 0.1.3 -> 0.2.0 * ocamlPackages.x509: 0.5.3 -> 0.6.0 * ocamlPackages.x509: 0.6.0 -> 0.6.1 * ocamlPackages.tls: 0.7.1 -> 0.9.0 * jackline: fix build with ocaml-tls ≥ 0.9.0 --- .../instant-messengers/jackline/default.nix | 2 ++ .../jackline/tls-0.9.0.patch | 29 +++++++++++++++ .../asn1-combinators/default.nix | 24 +++++++++---- .../development/ocaml-modules/tls/default.nix | 24 ++++++------- .../ocaml-modules/x509/default.nix | 35 +++++++++---------- 5 files changed, 76 insertions(+), 38 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 32e7c877614a..9f85c940c1bc 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5"; }; + patches = [ ./tls-0.9.0.patch ]; + buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring diff --git a/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch b/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch new file mode 100644 index 000000000000..38f38a03a802 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch @@ -0,0 +1,29 @@ +diff --git a/cli/cli_config.ml b/cli/cli_config.ml +index 991ee77..59a0edb 100644 +--- a/cli/cli_config.ml ++++ b/cli/cli_config.ml +@@ -207,7 +207,9 @@ let configure term () = + ask above "CA file: " (fun x -> x) (fun x -> if Sys.file_exists x then `Ok x else `Invalid) term >>= fun trust_anchor -> + Lwt_unix.access trust_anchor [ Unix.F_OK ; Unix.R_OK ] >>= fun () -> + X509_lwt.certs_of_pem trust_anchor >>= fun tas -> +- (match X509.Validation.valid_cas ~time:(Unix.time ()) tas with ++ let time = match Ptime.of_float_s (Unix.time ()) ++ with Some time -> time | None -> assert false in ++ (match X509.Validation.valid_cas ~time tas with + | [] -> Lwt.fail (Invalid_argument "trust anchor file is empty!") + | _ -> Lwt.return (`Trust_anchor trust_anchor)) + | Some fp -> Lwt.return (`Fingerprint fp) ) >>= fun authenticator -> +diff --git a/cli/cli_state.ml b/cli/cli_state.ml +index d5db502..91540c9 100644 +--- a/cli/cli_state.ml ++++ b/cli/cli_state.ml +@@ -262,7 +262,8 @@ module Connect = struct + (match config.Xconfig.authenticator with + | `Trust_anchor x -> X509_lwt.authenticator (`Ca_file x) + | `Fingerprint fp -> +- let time = Unix.gettimeofday () in ++ let time = match Ptime.of_float_s (Unix.gettimeofday ()) ++ with Some time -> time | None -> assert false in + let fp = + Nocrypto.Uncommon.Cs.of_hex + (String.map (function ':' -> ' ' | x -> x) fp) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 65a310c9cf04..78102b9c673b 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,8 +1,22 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib +, cstruct, zarith, ounit, result, topkg, ptime +}: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "0.2.0"; + sha256 = "0yfq4hnyzx6hy05m60007cfpq88wxwa8wqzib19lnk2qrgy772mx"; + propagatedBuildInputs = [ ptime ]; + } else { + version = "0.1.3"; + sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; + propagatedBuildInputs = [ ]; + }; +in buildOcaml rec { name = "asn1-combinators"; - version = "0.1.3"; + inherit (param) version; minimumSupportedOcamlVersion = "4.01"; @@ -10,13 +24,11 @@ buildOcaml rec { owner = "mirleft"; repo = "ocaml-asn1-combinators"; rev = "v${version}"; - sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ounit topkg ]; - propagatedBuildInputs = [ result cstruct zarith ]; - - createFindlibDestdir = true; + propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs; buildPhase = "${topkg.run} build --tests true"; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 8c146102ad1b..39f82772ffce 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg , ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: @@ -6,31 +6,27 @@ with stdenv.lib; let withLwt = lwt != null; in -buildOcaml rec { - version = "0.7.1"; - name = "tls"; - - minimunSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + version = "0.9.0"; + name = "ocaml${ocaml.version}-tls-${version}"; src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-tls"; rev = "${version}"; - sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24"; + sha256 = "0qgw8lq8pk9hss7b5i6fr08pi711i0zqx7yyjgcil47ipjig6c31"; }; - buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ppx_cstruct cstruct-unix ]; + buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ounit ppx_cstruct cstruct-unix ]; propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ optional withLwt lwt; - configureFlags = [ "--disable-mirage" "--enable-tests" ] ++ - optional withLwt ["--enable-lwt"]; - - configurePhase = "./configure --prefix $out $configureFlags"; + buildPhase = "${topkg.run} build --tests true --with-mirage false --with-lwt ${if withLwt then "true" else "false"}"; doCheck = true; - checkTarget = "test"; - createFindlibDestdir = true; + checkPhase = "${topkg.run} test"; + + inherit (topkg) installPhase; meta = with stdenv.lib; { homepage = https://github.com/mirleft/ocaml-tls; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 316035b40543..44a25865c1a7 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,29 +1,28 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto -, ounit, ocaml_oasis, ppx_sexp_conv, cstruct-unix +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +, asn1-combinators, astring, nocrypto, ppx_sexp_conv +, ounit, cstruct-unix }: -buildOcaml rec { - name = "x509"; - version = "0.5.3"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-x509-${version}"; + version = "0.6.1"; - mininimumSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-x509"; - rev = "${version}"; - sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7"; + src = fetchurl { + url = "https://github.com/mirleft/ocaml-x509/releases/download/${version}/x509-${version}.tbz"; + sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; }; - buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators nocrypto ]; + unpackCmd = "tar -xjf $curSrc"; - configureFlags = "--enable-tests"; - configurePhase = "./configure --prefix $out $configureFlags"; + buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; + + buildPhase = "${topkg.run} build --tests true"; doCheck = true; - checkTarget = "test"; - createFindlibDestdir = true; + checkPhase = "${topkg.run} test"; + + inherit (topkg) installPhase; meta = with stdenv.lib; { homepage = https://github.com/mirleft/ocaml-x509; From 271d4a7ca07cd629c80a73fa1c6d868e66aa3667 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Mon, 15 Jan 2018 15:19:20 +1000 Subject: [PATCH 175/197] dcm2niix: init at 1.0.20170130 --- lib/maintainers.nix | 1 + .../science/biology/dcm2niix/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/biology/dcm2niix/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d335f7f3b938..e45ccbe8f5dc 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -60,6 +60,7 @@ arobyn = "Alexei Robyn "; artuuge = "Artur E. Ruuge "; ashalkhakov = "Artyom Shalkhakov "; + ashgillman = "Ashley Gillman "; aske = "Kirill Boltaev "; asppsa = "Alastair Pharo "; astsmtl = "Alexander Tsamutali "; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix new file mode 100644 index 000000000000..b1c66526b126 --- /dev/null +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, cmake +, libyamlcpp +}: + +let + version = "v1.0.20170130"; + sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; + +in stdenv.mkDerivation rec { + name = "dcm2niix-${version}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "rordenlab"; + repo = "dcm2niix"; + rev = version; + }; + + enableParallelBuilding = true; + buildInputs = [ cmake libyamlcpp]; + + meta = { + description = "dcm2niix DICOM to NIfTI converter"; + longDescription = '' + dcm2niix is a designed to convert neuroimaging data from the + DICOM format to the NIfTI format. + ''; + homepage = https://www.nitrc.org/projects/dcm2nii; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ashgillman ]; + platforms = stdenv.lib.platforms.linux; +}; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad77d0f98a8..587f4c18fd6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18844,6 +18844,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; + diamond = callPackage ../applications/science/biology/diamond { }; ecopcr = callPackage ../applications/science/biology/ecopcr { }; From 245a67df8bc4f6e1fa0ab40578c1b9668599a042 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Mon, 15 Jan 2018 16:53:28 +1000 Subject: [PATCH 176/197] dcm2niix: cmake is native, style --- .../science/biology/dcm2niix/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index b1c66526b126..781ceb3df59e 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -4,32 +4,30 @@ , libyamlcpp }: -let - version = "v1.0.20170130"; - sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { + version = "1.0.20170130"; name = "dcm2niix-${version}"; src = fetchFromGitHub { - inherit sha256; owner = "rordenlab"; repo = "dcm2niix"; - rev = version; + rev = "v${version}"; + sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532"; }; enableParallelBuilding = true; - buildInputs = [ cmake libyamlcpp]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libyamlcpp ]; - meta = { + meta = with stdenv.lib; { description = "dcm2niix DICOM to NIfTI converter"; longDescription = '' dcm2niix is a designed to convert neuroimaging data from the DICOM format to the NIfTI format. ''; homepage = https://www.nitrc.org/projects/dcm2nii; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ashgillman ]; - platforms = stdenv.lib.platforms.linux; -}; + license = licenses.bsd3; + maintainers = [ maintainers.ashgillman ]; + platforms = platforms.all; + }; } From 282934ca8ea002ce041f36ed3d8ac34b731dac4e Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 15 Jan 2018 08:13:46 +0100 Subject: [PATCH 177/197] ponyc: 0.21.2 -> 0.21.3 https://github.com/ponylang/ponyc/issues/2478 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e65c8438ed72..e07d9ed67a39 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0gdkm1mihn266km3q5ma7nhvjpzwdzmy39cxb7kkz8aal2nmvwri"; + sha256 = "0cdp6wbpirl3jnlqkm0hbxyz67v00nwhi4hvk4sq2g74f36j2bnm"; }; buildInputs = [ llvm makeWrapper which ]; From 48bf2c3e817c265671112800c0f6cbd8b1d39a96 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 10 Jan 2018 00:43:51 +0900 Subject: [PATCH 178/197] libvncserver: reduce dependencies; only use systemd on linux Permits building on macOS. --- .../libraries/libvncserver/default.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index f7e477ff34a1..b325c9b246c2 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, - libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, - xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, - libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook - , systemd, pkgconfig, libpng + libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, + systemd }: -assert stdenv.isLinux; - let s = # Generated upstream information rec { @@ -16,27 +12,25 @@ let url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r"; }; - buildInputs = [ - libtool libjpeg openssl libX11 libXdamage xproto damageproto - xextproto libXext fixesproto libXfixes xineramaproto libXinerama - libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd - pkgconfig libpng - ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; src = fetchurl { inherit (s) url sha256; }; preConfigure = '' sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure ''; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ + libtool libjpeg openssl libgcrypt libpng + ] ++ stdenv.lib.optional stdenv.isLinux systemd; + propagatedBuildInputs = [ zlib ]; meta = { inherit (s) version; description = "VNC server library"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 6e8290ec3126f21b8b6a0716c009203f8f814b7c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 15 Jan 2018 17:11:33 +0800 Subject: [PATCH 179/197] solc: 0.4.17 -> 0.4.19 --- pkgs/development/compilers/solc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 078cf3e36c27..cd8c839cf4fe 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchgit, boost, cmake, z3 }: let - version = "0.4.17"; - rev = "bdeb9e52a2211510644fb53df93fb98258b40a65"; - sha256 = "1x6q2rlq6gxggidgsy6li7m4phwr1hcfi65pq9yimz64ddqfiira"; + version = "0.4.19"; + rev = "c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40"; + sha256 = "1h2ziwdswghj4aa3vd3k3y2ckfiwjk6x38w2kp4m324k2ydxd15c"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; From 6e84522610598da609f47409c3d7701b709d77cc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 15 Jan 2018 12:14:39 +0200 Subject: [PATCH 180/197] linux_testing: 4.15-rc7 -> 4.15-rc8 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6143f03dc8c4..a3570fd11a43 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.15-rc7"; - modDirVersion = "4.15.0-rc7"; + version = "4.15-rc8"; + modDirVersion = "4.15.0-rc8"; extraMeta.branch = "4.15"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1ph3asz5cc82mj7vb5cd5n80wnf66cm9jrlpa66da8kz8za0cdkh"; + sha256 = "15d24b47mfkfs2b0l54sq0yl3ylh5dnx23jknb2r7cq14wxiqmq3"; }; # Should the testing kernels ever be built on Hydra? From c6c3344cc47e215b4edb4d0ed0759889f15a6119 Mon Sep 17 00:00:00 2001 From: dywedir Date: Mon, 15 Jan 2018 12:33:15 +0200 Subject: [PATCH 181/197] tokei: 6.1.2 -> 7.0.0 --- pkgs/development/tools/misc/tokei/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 2759b18e35c3..d1f6cc4ea29b 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,26 +2,21 @@ rustPlatform.buildRustPackage rec { name = "tokei-${version}"; - version = "6.1.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "Aaronepower"; repo = "tokei"; rev = "v${version}"; - sha256 = "1bzs3mr6f9bna39b9ddwwq0raas07nbn106mnq3widxg59i0gxhd"; + sha256 = "1c8m2arhy58ky8pzj0dp3w9gpacia9jwmayi0il640l4fm8nr734"; }; - cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz"; - - buildPhase = '' - # do not pass --frozen since Cargo.lock has the wrong tokei version - cargo build --release - ''; + cargoSha256 = "1cl4fjbvrw7zhpb8rxj566ddlxbj9vdsb1cp7mh6llmvaia2vgks"; meta = with stdenv.lib; { description = "Count code, quickly"; homepage = https://github.com/Aaronepower/tokei; - license = licenses.mit; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; From fad6250276273fd2d87b073d1b9faa2d22574e2a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 15 Jan 2018 10:47:52 +0000 Subject: [PATCH 182/197] Revert "aws_shell: move to pythonPackages" This reverts commit ffd35a7849f6477eeba9deeea33c8dcc2d582383. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad77d0f98a8..9be3a5de5eaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -539,7 +539,7 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; - aws_shell = pythonPackages.aws_shell; + aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; aws-vault = callPackage ../tools/admin/aws-vault { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74d08255cb17..bad68571d3e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -177,8 +177,6 @@ in { awscli = callPackage ../tools/admin/awscli { }; - aws_shell = callPackage ../tools/admin/aws_shell { }; - # packages defined elsewhere backports_csv = callPackage ../development/python-modules/backports_csv {}; From 1775b036bb20f82a126d6fe0edfadb502277c646 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 15 Jan 2018 10:49:03 +0000 Subject: [PATCH 183/197] Revert "awscli: move to pythonPackages" This reverts commit 29b8e5fb6f64ea93e548a517026f1d1350124003. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9be3a5de5eaf..2ce3ee5892ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -533,7 +533,7 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; - awscli = pythonPackages.awscli; + awscli = pythonPackages.callPackage ../tools/admin/awscli { }; awsebcli = callPackage ../tools/virtualization/awsebcli {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bad68571d3e1..10705d02d6bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,8 +175,6 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - awscli = callPackage ../tools/admin/awscli { }; - # packages defined elsewhere backports_csv = callPackage ../development/python-modules/backports_csv {}; From 156b8029f2202a438044a0a820d9734332ec31e6 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 15 Jan 2018 12:25:03 +0100 Subject: [PATCH 184/197] ispc: 20170807 -> 1.9.2 Version bump, fixes #29979 --- pkgs/development/compilers/ispc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 0e4bc420241d..62fa578cef68 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -3,8 +3,8 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n }: stdenv.mkDerivation rec { - version = "20170807"; - rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44"; + version = "1.9.2"; + rev = "v${version}"; inherit testedTargets; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh"; + sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry"; }; # there are missing dependencies in the Makefile, causing sporadic build failures From be776435ce59acd981fedf6313829543f978e243 Mon Sep 17 00:00:00 2001 From: Anton Schirg Date: Mon, 15 Jan 2018 13:20:34 +0100 Subject: [PATCH 185/197] portaudio: add old 2014 version Needed e.g. for lightworks package as there was a breaking ABI change between portaudio 2014 and 2016 --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ce3ee5892ad..4cc8d801571d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10532,6 +10532,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; }; + portaudio2014 = portaudio.overrideAttrs (oldAttrs: { + src = fetchurl { + url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; + }; + }); + portmidi = callPackage ../development/libraries/portmidi {}; prison = callPackage ../development/libraries/prison { }; From e0af7de6de36092c8bff9882079ee55e571da7d6 Mon Sep 17 00:00:00 2001 From: Anton Schirg Date: Mon, 15 Jan 2018 13:21:01 +0100 Subject: [PATCH 186/197] lightworks: use portaudio 2014 There was an ABI change in portaudio 2016 which caused lightworks to fail to start --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cc8d801571d..76c9bc76c1b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15875,7 +15875,9 @@ with pkgs; inherit (gnome3) libpeas gsettings_desktop_schemas dconf; }; - lightworks = callPackage ../applications/video/lightworks { }; + lightworks = callPackage ../applications/video/lightworks { + portaudio = portaudio2014; + }; lingot = callPackage ../applications/audio/lingot { inherit (gnome2) libglade; From 994e5ddd0c8461ed573795f021b023e47642ed98 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 15 Jan 2018 14:53:49 +0100 Subject: [PATCH 187/197] apache-directory-studio: add missing desktop item (#33893) * apache-directory-studio: add missing desktop item * apache-directory-studio: use install command to copy icons --- .../apache-directory-studio/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 36d0c9e4acf6..d593947f3e62 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,9 +1,20 @@ -{ stdenv, fetchurl, xorg, jre, makeWrapper }: +{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }: let rpath = stdenv.lib.makeLibraryPath (with xorg; [ libXtst ]); + + desktopItem = makeDesktopItem { + name = "apache-directory-studio"; + exec = "ApacheDirectoryStudio"; + icon = "apache-directory-studio"; + comment = "Eclipse-based LDAP browser and directory client"; + desktopName = "Apache Directory Studio"; + genericName = "Apache Directory Studio"; + categories = "Java;Network"; + }; + in stdenv.mkDerivation rec { name = "apache-directory-studio-${version}"; @@ -36,6 +47,8 @@ stdenv.mkDerivation rec { "$out/bin/ApacheDirectoryStudio" \ --prefix PATH : "${jre}/bin" \ --prefix LD_LIBRARY_PATH : "${rpath}" + install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" + install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; meta = with stdenv.lib; { From fb2a43f8ad151196cdc0ee5098d66b3b5d2df09e Mon Sep 17 00:00:00 2001 From: mingchuan Date: Mon, 15 Jan 2018 22:12:55 +0800 Subject: [PATCH 188/197] rstudio: 1.1.383 -> 1.1.414 --- pkgs/applications/editors/rstudio/default.nix | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index bf2363d3939b..6ff67728ea11 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl -, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk -, gnumake, makeWrapper, pandoc +{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost +, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts +, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: let - version = "1.1.383"; + version = "1.1.414"; ginVer = "1.5"; gwtVer = "2.7.0"; in @@ -15,19 +15,15 @@ stdenv.mkDerivation rec { buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ]; - src = fetchurl { - url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; - sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f"; + src = fetchFromGitHub { + owner = "rstudio"; + repo = "rstudio"; + rev = "v${version}"; + sha256 = "1rr2zkv53r8swhq5d745jpp0ivxpsizzh7srf34isqpkn5pgx3v8"; }; # Hack RStudio to only use the input R. - patches = [ - ./r-location.patch - (fetchpatch { - url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git; - sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d"; - }) - ]; + patches = [ ./r-location.patch ]; postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; inherit ginVer; @@ -49,14 +45,18 @@ stdenv.mkDerivation rec { sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; - rmarkdownSrc = fetchurl { - url = "https://github.com/rstudio/rmarkdown/archive/95b8b1fa64f78ca99f225a67fff9817103be56.zip"; - sha256 = "12fa65qr04rwsprkmyl651mkaqcbn1znwsmcjg4qsk9n5nxg0fah"; + rmarkdownSrc = fetchFromGitHub { + owner = "rstudio"; + repo = "rmarkdown"; + rev = "v1.8"; + sha256 = "1blqxdr1vp2z5wd52nmf8hq36sdd4s2pyms441dqj50v35f8girb"; }; - rsconnectSrc = fetchurl { - url = "https://github.com/rstudio/rsconnect/archive/425f3767b3142bc6b81c9eb62c4722f1eedc9781.zip"; - sha256 = "1sgf9dj9wfk4c6n5p1jc45386pf0nj2alg2j9qx09av3can1dy9p"; + rsconnectSrc = fetchFromGitHub { + owner = "rstudio"; + repo = "rsconnect"; + rev = "953c945779dd180c1bfe68f41c173c13ec3e222d"; + sha256 = "1yxwd9v4mvddh7m5rbljicmssw7glh1lhin7a9f01vxxa92vpj7z"; }; rstudiolibclang = fetchurl { @@ -88,8 +88,10 @@ stdenv.mkDerivation rec { done unzip $mathJaxSrc -d dependencies/common/mathjax-26 - unzip $rmarkdownSrc -d dependencies/common/rmarkdown - unzip $rsconnectSrc -d dependencies/common/rsconnect + mkdir -p dependencies/common/rmarkdown + ln -s $rmarkdownSrc dependencies/common/rmarkdown/ + mkdir -p dependencies/common/rsconnect + ln -s $rsconnectSrc dependencies/common/rsconnect/ mkdir -p dependencies/common/libclang/3.5 unzip $rstudiolibclang -d dependencies/common/libclang/3.5 mkdir -p dependencies/common/libclang/builtin-headers From af9724d9791fcda0217bd60dfdb7332fb181c9da Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 15 Jan 2018 12:34:56 -0500 Subject: [PATCH 189/197] vscode: 1.19.1 -> 1.19.2 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 15477c5c7d45..6b449193337d 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.19.1"; + version = "1.19.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0ypx1jrzg76f8p4yh9hi3bhsrc6w4r7rg6i2aa6q7s8ny0q9hrlx"; - "x86_64-linux" = "1934wdiy2d1fzcjxjyf60dw1g1pp3lk2wv41xgrabfy5j2xfz14r"; - "x86_64-darwin" = "1zbcddgdwvmnk1gpmgw6rz0rswhkfc72wcjdbvgghm4msfwcgvc8"; + "i686-linux" = "05qfcmwl1r43slwkb2rxh99hwpzd8c622la0ffd9p2jg4lbkgs1p"; + "x86_64-linux" = "0kjwmw68av9mnqcg1vaazm3k240y9jvbng6n7ycgzxwddzx0qlac"; + "x86_64-darwin" = "1mjmi5r9qlc6ggh3w566454ar06by15xsm6dymr8zv4sb352w70h"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 9059c93b8436f6d591d956111dc6be02adb84436 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 15 Jan 2018 20:50:03 +0100 Subject: [PATCH 190/197] linuxPackages.vhba: fix add libelf build input --- pkgs/misc/emulators/cdemu/vhba.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 56f63e747342..1dd34fa23c33 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchurl, kernel, libelf }: stdenv.mkDerivation rec { name = "vhba-${version}"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + buildInputs = [ libelf ]; hardeningDisable = [ "pic" ]; From 56c02aedee4ed261e2f959aac2fc43608611dab3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:10:58 -0500 Subject: [PATCH 191/197] elpa-packages: 2018-01-15 --- .../editors/emacs-modes/elpa-generated.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 6a438672601b..754061270123 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -135,10 +135,10 @@ arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "arbitools"; - version = "0.93"; + version = "0.94"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.93.el"; - sha256 = "0z3lqp8dqfkams5h4sw569p48d2rvpd3d8lb4xaw0z8l49y2mvg8"; + url = "https://elpa.gnu.org/packages/arbitools-0.94.el"; + sha256 = "00iq8rr1275p48ic5mibcx657li723q8r7ax4g21w6bzwsj3gksd"; }; packageRequires = [ cl-lib ]; meta = { @@ -768,10 +768,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.4.0.14"; + version = "1.4.0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.4.0.14.tar"; - sha256 = "1qc30dia59i2bklhivfhmsghirnpgz5mvcjdc78n0r8nizb68jfp"; + url = "https://elpa.gnu.org/packages/el-search-1.4.0.17.tar"; + sha256 = "14jacy0gjhpvia15ffa99np2wyblmadb95f17a9azl6dsn6dq1m6"; }; packageRequires = [ emacs stream ]; meta = { @@ -1386,10 +1386,10 @@ mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "mines"; - version = "1.2"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mines-1.2.tar"; - sha256 = "1xwnw2hyk1qz98mdnckk0i05li0gzygq12kkmrlidxnk7ngbq9vw"; + url = "https://elpa.gnu.org/packages/mines-1.5.tar"; + sha256 = "1wpkn47iza78hzj396z5c05hsimnhhhmr1cq598azd6h8c1zca7g"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2320,10 +2320,10 @@ }) {}; which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "which-key"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.0.2.tar"; - sha256 = "1s7bq7vq9xsf2pz1w03l743yzaxm9gk5qgympcwlkiq90ph13vcn"; + url = "https://elpa.gnu.org/packages/which-key-3.1.0.tar"; + sha256 = "17n09i92m7qdicybxl60j81c8fn7jcx25wds0sb7j8i364psjabq"; }; packageRequires = [ emacs ]; meta = { From 8a24756dd848f141dc48f53475fff137c02677a9 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:11:11 -0500 Subject: [PATCH 192/197] org-packages: 2018-01-15 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index b173dcff936c..9673166c2fd1 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20180108"; + version = "20180115"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180108.tar"; - sha256 = "02rs7zi3dzps0mlyfbgiywd2smnlw0pk8ps1nqk0d5hx3n6d15yv"; + url = "https://orgmode.org/elpa/org-20180115.tar"; + sha256 = "1zc75kxbx9bk1xag46s027a290fnva1id8vv92lz9i5nkqnrm430"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180108"; + version = "20180115"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180108.tar"; - sha256 = "10mhiqsrxxmhsy8dl88r456shx6ajm4w19pz259b960551r596iz"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180115.tar"; + sha256 = "1gm6b0hpa4y83bxsbps39b1xvq99m1dh9nbvn9r4spw4rxhhfppy"; }; packageRequires = []; meta = { From e621929d972ca74e7b0a310e465585d06c15ad0f Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:11:29 -0500 Subject: [PATCH 193/197] melpa-stable-packages: 2018-01-15 --- .../emacs-modes/melpa-stable-generated.nix | 233 +++++++++++++----- 1 file changed, 169 insertions(+), 64 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index dd3a30271f39..567ba06c82af 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1753,12 +1753,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5d25972192cd34553997ba193c09eab093a2b870"; - sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; + rev = "7935275ee45f0359d887b8563ffd1d002f0c618e"; + sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2047,12 +2047,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; - sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; + rev = "8d117868a0a091389d528428136e60f951e9c550"; + sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -3061,12 +3061,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "cf7817de3f37ce2404ee637a655f1a511b829585"; - sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5"; + rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; + sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -3142,6 +3142,27 @@ license = lib.licenses.free; }; }) {}; + borg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "borg"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "borg"; + rev = "34eac585d6829e17ce59b09fe6ad5d675302c096"; + sha256 = "1q7k2c7pxcywg6xjk8awg73skyw59a6w4aa9sxbsz9vdj2zn04k9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; + sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; + name = "borg"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/borg"; + license = lib.licenses.free; + }; + }) {}; boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; @@ -6476,6 +6497,27 @@ license = lib.licenses.free; }; }) {}; + cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cubicle-mode"; + version = "1.1.2"; + src = fetchFromGitHub { + owner = "cubicle-model-checker"; + repo = "cubicle"; + rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6"; + sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; + sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv"; + name = "cubicle-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/cubicle-mode"; + license = lib.licenses.free; + }; + }) {}; cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cuda-mode"; @@ -6626,12 +6668,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "6b260611dc08468fca9b9af132a00783dd2cf8d9"; - sha256 = "0s5wi010sn3ng9fr7fqbc11kmjqirr28wya3rnnzzb3m5gyxs8id"; + rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6"; + sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -6962,12 +7004,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"; - sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n"; + rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; + sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -9433,12 +9475,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "9cf096448b69c795b20aab89557e9add6029b13c"; - sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf"; + rev = "83a38b5721c459d311833522903de96f874e1a4e"; + sha256 = "0j2nk1nhbihfqajkmzp3501mhv5617qhb7qbj46qz8azs8a1dvri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -9545,12 +9587,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "127fd4fca8ac6470cfda62f47bb1c29859862cfc"; + sha256 = "0j7j7wh89a34scilw11pbdb86nf515ig38pjkwyarfvj93gigc04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -12435,12 +12477,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "22aabbccd564883684f6d224b8e0a512f334be41"; - sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24"; + rev = "cd0387f7f1d5c50e080091f86ca97d8a67d603a6"; + sha256 = "0q4cq1rkiz5mjxhp7p5awmw59q1yjb2sryc9i54cwhr5dwwqf95k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -14760,12 +14802,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; - sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; + rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636"; + sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -18065,12 +18107,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "26749ff9f34b2abddf7c47ff71b1046942e38398"; - sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2"; + rev = "68f01726795ca3054cfc6327dcdb22c9c83dfdfa"; + sha256 = "0vak9phqgxz5dk1zj3i4cs94y797h77qadirsf33gl073cg95l8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -18632,12 +18674,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "9fdbf5b24df28b046731db1c7a1cc90338d55dce"; - sha256 = "13kw0i4vhd8fgwgchap5qxckvhs00ifr7z68whnd3xzklx3v47bj"; + rev = "e1b660e2a48b39b0a81119c2593362dd60076757"; + sha256 = "031hglxwlq8fryi8vs11hyflcrk09qc9qja28nqby0adn20z47mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -19409,12 +19451,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "df591e452f9a56c69fb69de961baa75751bae3d8"; - sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d"; + rev = "f022c86d566a4b0b4ffdc5c8c75a4a7b9468fa71"; + sha256 = "087rjk26pfa29igq3cbp48yaxlm4xqz62svszbdb1hjfip5y453a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -19889,6 +19931,27 @@ license = lib.licenses.free; }; }) {}; + imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "imake"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "imake"; + rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; + sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; + sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34"; + name = "imake"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/imake"; + license = lib.licenses.free; + }; + }) {}; imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; @@ -21569,12 +21632,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "d4a1cbae1fc77192e5844291821709c82c9dc455"; - sha256 = "04k2yz3vrj1h0zf6cz0jd97fg8zah2j980l5ycsgyy0dk9ysink8"; + rev = "88a25b89a480f1193cc1c5502f3a5d0b68cb7227"; + sha256 = "03bbpaih29yx8s16v59mca8v6sak6294zq7d534613la28n4h6w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -23115,12 +23178,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "05a836caf02eba91fa26bdf5dd6fd183fe23937d"; - sha256 = "08p57alfbkcsqkhnfjhfckqhans278ffjyhhhvgy8s7asa6as9kl"; + rev = "5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2"; + sha256 = "0m8h6jc87bcl3lhygc06la4hs7sh6c7vflxlqvwr3bfmknl8l8yw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -25388,12 +25451,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; - sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; + rev = "8e321f1036770c20637a0f946b655805cd070e25"; + sha256 = "11hxf0fkka4mv1qsw0nx3ymvgcav95r2bvk1gwyj5m5cbwb4a1n9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -25490,11 +25553,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.26pre2"; + version = "0.26"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4cb1eeba83416a12c616aca6469c027b8b8a303d"; - sha256 = "0brcdwblfj3nb2ca0izvhlm3x1pf0r72wsa9f2hf0ssnh9w2z40s"; + rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583"; + sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -28310,12 +28373,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; - sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; + rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5"; + sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -29040,6 +29103,27 @@ license = lib.licenses.free; }; }) {}; + php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "php-runtime"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "php-runtime.el"; + rev = "fa4312863245511462b75cb31df2f8558288f4df"; + sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; + sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb"; + name = "php-runtime"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/php-runtime"; + license = lib.licenses.free; + }; + }) {}; phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "phpcbf"; @@ -29292,6 +29376,27 @@ license = lib.licenses.free; }; }) {}; + play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "play-crystal"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "play-crystal.el"; + rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7"; + sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; + sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; + name = "play-crystal"; + }; + packageRequires = [ dash emacs request ]; + meta = { + homepage = "https://melpa.org/#/play-crystal"; + license = lib.licenses.free; + }; + }) {}; play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; @@ -31491,12 +31596,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "30f76a9c52994562191c90c315002410706f6c0b"; - sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15"; + rev = "15c0dfecad2bb939e97abf9d0c7fa086676e5c05"; + sha256 = "0qidddvnv2qdcqx4b1fkp8lbax6hzp7np4c6r66h0d33dk6b7m77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -37792,12 +37897,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031"; - sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88"; + rev = "7559a79e95aada65601f7413a1c3f08bfa34557b"; + sha256 = "1l9m04hypk8j5qkg7rlhsknj9hx5l3zjy97s3kv7wbcwvcx3yxhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -38089,8 +38194,8 @@ version = "0.9.8"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "52fa9101d8c4"; - sha256 = "1ijzd3xmygkkkwm0ckkmi576y93drcs63l6bsc8qz2pvjcn5k8sw"; + rev = "d04938232934"; + sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -38127,12 +38232,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051"; - sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr"; + rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; + sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -38864,8 +38969,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "668632d9392e"; - sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n"; + rev = "cef987df070f"; + sha256 = "1nryf7pizmwhyk2jw5dgild031xb6xylyyhr8pwx74iijcbpz2qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; From fbb8fc18ee59c7a1142298e7ed587cea9af3998a Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:14:27 -0500 Subject: [PATCH 194/197] melpa-packages: 2018-01-15 --- .../editors/emacs-modes/melpa-generated.nix | 1048 +++++++++-------- 1 file changed, 576 insertions(+), 472 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index a2b9564faa50..906737e381bd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -761,8 +761,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +778,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171209.2145"; + version = "20180111.116"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +824,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1552,12 +1552,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20180107.1311"; + version = "20180113.1316"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "418e23d9ab85deeaa4818f8dc72e27061687b3e3"; - sha256 = "1b1rsnm85haq04p4189vg2hxff8ncrjv8xmmiwr527ipq7wmd4wf"; + rev = "b30158d5d9e43318fa0e4a211d81fe4b2495c027"; + sha256 = "0hylvk7ivibm8l6y21v88j1gfv8mwggdcbgw6gb4rz5ws6n0jdxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1720,12 +1720,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161124.550"; + version = "20180111.602"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "11e27444692bbf0eb38ec28af6bd041618c5c091"; - sha256 = "1qcag5sjg2p64lllgy237j8gkm7vp2kxr6wppkps5wgkf7bn4q4z"; + rev = "01fd19e0d635ccaf8e812364d8720733f2e84126"; + sha256 = "040g07k2hcwqspansjqfpng0lxzkmip26ipz26q6mvkpwm2wilv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1771,12 +1771,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20161213.912"; + version = "20180115.627"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1"; - sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw"; + rev = "64845a6b67627e897dd42d8302c25c03ddce2aee"; + sha256 = "0fb5pq5242xqss02si4nlwgy073kpvf909avwdngvyg6apyk66p2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -2505,12 +2505,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171202.1653"; + version = "20180111.2112"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5363671b6a8fe8ecd4674497664974e089b2b035"; - sha256 = "04a4v6vpzmhj3g4mqr2fsq47k8spi8c7v4pbzkdz9si097dskvrg"; + rev = "7935275ee45f0359d887b8563ffd1d002f0c618e"; + sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2966,12 +2966,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20171217.2049"; + version = "20180112.609"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "d5b785ba6118110a9404a7f65429a954ae820d69"; - sha256 = "1a0ayw7jhbw3im5frs0rycl1ya18lbfslcr4xqsgs4kvczar4rzx"; + rev = "273661ca30517e189e7d62233ba5ad1359a2a810"; + sha256 = "0mk2pf5vq353l2zjh18sabx1yd8fp8sdvx6b5k3a7hdq5x6ddwn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3155,12 +3155,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20171213.756"; + version = "20180111.436"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "694b92ea58feb30a0104ccf2424fd921235ba517"; - sha256 = "1im7z4sf4zxv97dcwviv7rzlc8ff5ibx8lhqmvhm8kxc0jf84iid"; + rev = "8d117868a0a091389d528428136e60f951e9c550"; + sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -4295,12 +4295,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20171212.1621"; + version = "20180114.1149"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "3b0bb640572825873754276f699b18765c7e5172"; - sha256 = "14pyf9aw8qbc1367j32yl8hn9lxs9027cxsxw510x9qa8ffrmi7n"; + rev = "3492ce6613e974a329c8773e09a615c28b48aa10"; + sha256 = "140yxkg1gnfhmsw6pira2p0nq2ll1x8swi9rlngraxshldf0c6zv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4990,8 +4990,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; @@ -5011,8 +5011,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5385,12 +5385,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "20161109.1647"; + version = "20180113.759"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "88f69fe61955d655b774427ca95ce359f52d5e21"; - sha256 = "1br1li9ffxynqm8v5ayfl6pb36di0syplxfjs9x64gsq0y4fbcng"; + rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; + sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -5508,6 +5508,27 @@ license = lib.licenses.free; }; }) {}; + borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "borg"; + version = "20180115.428"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "borg"; + rev = "362ae8aebc69aab81e04427d221717dd6bc1a81d"; + sha256 = "0mj841vjrwrfsvpvlcwcdj6zm6ia87qsinv16gcjj93rkhlpdxwg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; + sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; + name = "borg"; + }; + packageRequires = [ dash emacs epkg magit ]; + meta = { + homepage = "https://melpa.org/#/borg"; + license = lib.licenses.free; + }; + }) {}; borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "borland-blue-theme"; @@ -6690,8 +6711,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "cc539b70ff27afa241936aacc88983d63474e770"; - sha256 = "0nwmbsa9gy5qpmy45qn4ihawrbg6avbancbg0va5dcfbjavp1wz2"; + rev = "150f8d2e39be9ba3dba5db1389be533387b4111f"; + sha256 = "01888dr85jcnr1rh6rxsvw61n2bkv03va3hg5gxil44dqkkyd49x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7084,12 +7105,12 @@ centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-cursor-mode"; - version = "20170830.948"; + version = "20180112.755"; src = fetchFromGitHub { owner = "andre-r"; repo = "centered-cursor-mode.el"; - rev = "670af669b6871d4447e11710d1d39a4d5fcd4b17"; - sha256 = "1vihsd0kp6skad7j5y5is5c7qiisz9myspsxsi86i7x8vrhmsvc3"; + rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8"; + sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; @@ -7193,8 +7214,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "388f399536b757722886b777084e22ddad4eb451"; - sha256 = "0qaxgqrgj9dpgv1d9k9a66lqpclrs22pcyppgl2m71fkqzm09ip4"; + rev = "23cd431ad02e9b56f90346fee4e4fed3d1a31ee2"; + sha256 = "1mq7zfbc7bwr2c58rd7d4sv1vx1vw39mw8vkdshrqqvr1v9dj1f0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7756,12 +7777,12 @@ chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chruby"; - version = "20170509.700"; + version = "20180114.852"; src = fetchFromGitHub { owner = "plexus"; repo = "chruby.el"; - rev = "3eddd2f5fc2ac979b496394c74e4aee436b64a28"; - sha256 = "15fihl38fa3jzn4r0abjpkqzibsrn0pnlvab6xba0ffr4sv4m0y2"; + rev = "42bc6d521f832eca8e2ba210f30d03ad5529788f"; + sha256 = "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby"; @@ -7777,12 +7798,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180107.2236"; + version = "20180115.7"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "4fe3a30cf45ee8af911a80b78e6d4d05c42d0f32"; - sha256 = "0z6q2h9nis72sydj1ky37v6g1klchzd04w7ykin0rpm2c0mvbigr"; + rev = "32c25bee573dbec429e6df25357c8b526e2708fa"; + sha256 = "1kn8il4jsz3mp1cizfmjzwyr59jj4jw3layl372i1v2p29627kn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8461,12 +8482,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20171103.1150"; + version = "20180114.911"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8"; - sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l"; + rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e"; + sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8482,12 +8503,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "20171102.1020"; + version = "20180114.911"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8"; - sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l"; + rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e"; + sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8545,12 +8566,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }: melpaBuild { pname = "clomacs"; - version = "20180101.1354"; + version = "20180113.1550"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "20706c65f218dd0671b0331f35bd8965e443062a"; - sha256 = "1mkn5y2mgdxv6njhy1njbpigzhx3x2hb618fzcd54yxn59mb5r47"; + rev = "38240d15e4929a3c9f3788815f9743a855926812"; + sha256 = "0vql6hcraa6y6njxz62kwwfnkhl8l2gjs52bvpgsrgrkq471w48h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8717,8 +8738,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "2c089d80de3945e4f08f13557d59e04cbc942a60"; - sha256 = "01164wd8p0wwabnynsqv34pz53ji1s3k7nb0ff51i616q6095rdx"; + rev = "675adaa4a4c5348049324d8cabe0cdde7a3d0ef0"; + sha256 = "02szks3ymhiw4k7imryn06k1c0hp4alrxw0gvzc2dnsn5j4vzlvp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9175,12 +9196,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171202.1759"; + version = "20180114.2348"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "e3e051f88734593d4b7b92f157e618ebfe63693b"; - sha256 = "1nh26v8vk7g5rkqbklan2ai4i4lx3bdn03pch84xyn3drpq40rb3"; + rev = "dd60e9929a0e1819457eeb4a7934864a31a0266a"; + sha256 = "0ljzgiy9pdzr9b64zfxkxrs84d82iiwvykg6wq19mzgd7gpd3g63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -10012,8 +10033,8 @@ src = fetchFromGitHub { owner = "hotpxl"; repo = "company-irony-c-headers"; - rev = "5bbd427a2d3d4445e3413f7516def9aa80543b2a"; - sha256 = "172wf0ywbvqn9smwnh4kgxx8gw9g2f76irg3fmcv4d8d53mi08wa"; + rev = "72c386aeb079fb261d9ec02e39211272f76bbd97"; + sha256 = "1f462v8xq2hdsr4ks4i79icpfz6fjpb4q7khnx6si55agxj3rvaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers"; @@ -10071,12 +10092,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20180102.1535"; + version = "20180108.2225"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "678d5e8f1ad76e7bd9e5bf93ed6813f54e769773"; - sha256 = "1yqcikpgnnqg986zyy23jifq40pspdhrhhz825vp92g1k724gj86"; + rev = "f790850035c38a19a153cd5babca1ff778432cbc"; + sha256 = "12d4ajk1lz3r92smg69yfn1nj8g08jjddg4zfjzxvswvgnyk2ka7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10201,8 +10222,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10354,8 +10375,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10581,12 +10602,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }: melpaBuild { pname = "composer"; - version = "20171227.421"; + version = "20180111.942"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "e6ef820c7f7f221881d185e59943a7ec4fbc484a"; - sha256 = "0cdx17gpcyx8azannk8wiy62fzyf9r9niavr83axsapdidcyrl8i"; + rev = "e34ebe795d267e28965c85bd84cbb16b18165bd8"; + sha256 = "1vqjraldl2an10q1w91l7rx66mpsvqvjgg3j1k7xcvw07570aabl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; @@ -10980,12 +11001,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180106.127"; + version = "20180114.1336"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11526,12 +11547,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20171230.1100"; + version = "20180113.251"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "6c02dab04fadd8ffb96dc513467e443b0549d1d3"; - sha256 = "08yv469k3rvnxnqrj7iwywq974z9lp0szkrgxlxxfap03wv59f66"; + rev = "3e07035660f953cb08847362378267f5859bbe69"; + sha256 = "07l49l5fb7sv2ncvakr7nq616vw6nwrpl9czvqi46dnwvcdpjaxl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11652,12 +11673,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20180106.1819"; + version = "20180112.1056"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "3af632652c33e733e0da598f1254f8fcc50fe5b6"; - sha256 = "11xmc3kqn0i702lc103h49yya70fhyib8qi4b15slpnliqx2q8f4"; + rev = "5d16d2ea42dd4c8a4ead75d4fd4f89c3a8c9a4ff"; + sha256 = "1dx8vigch38rax5xycb7hhn6i7xq19fm1nqvh61l80k7v8zv6vfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11866,8 +11887,8 @@ src = fetchFromGitHub { owner = "cubicle-model-checker"; repo = "cubicle"; - rev = "9d108b900e0123236b4991c2d06b5061f34feee8"; - sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr"; + rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6"; + sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; @@ -12097,8 +12118,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "5b6497c8329c778c97f6f59f3f358304bc1ebd1e"; - sha256 = "07wwv24zcpxbdjf3mrx2ax4ji70kz1s2llisycfkv8lpfnw96yc9"; + rev = "f9d1114696ff3a6eda20b64b3604d5839d64d3d4"; + sha256 = "0sz0hmmic0wq6rvpakinyshkpzgv1yiqrgx2rsjnwf4ccyxibkj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12261,12 +12282,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180107.1329"; + version = "20180115.709"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "f597233a765b80660c6332b5565c7d651e378acc"; - sha256 = "1jjdr1h0hihwh3jabxyy4dq4l6z7w4lhrlmyb6xsxkqss7xsb74c"; + rev = "2ddf94defd23189ae2435a27824900cb56e0e511"; + sha256 = "1qzi5h0qnjp6rkr2r09r31zlfq12rlj2zim8ss2lv6hwx8zsvq3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12555,12 +12576,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20180101.2352"; + version = "20180110.1153"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "7b514b2c4895034b645cb2028220a411882e3b0e"; - sha256 = "0wrlj4nvqr6qcdap0wa6f1pjf77mnyrw820249qb2flb2j4xbd7x"; + rev = "e3fc28a6d3626c8cae9eb2e448b2f2e6b1a98f52"; + sha256 = "0kfdx5za610v3s8hmvy39gqn5w6xc8yljz6ybxzbg09byjinhxmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12975,12 +12996,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "20171031.530"; + version = "20180112.1155"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8"; - sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1"; + rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; + sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -13436,12 +13457,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "20180104.2127"; + version = "20180114.1924"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "f2e9a383cf03597bde9bcd3fa2e7ecb4ca266041"; - sha256 = "14nmk6kld5q6wd6z3r8v938gyi1x6875i0fbfbmfs5v1hykdm2s5"; + rev = "0c92663e476413dafd6eb231e19c351bcc195cae"; + sha256 = "07988a5jsvchrnra5smdaqirw7jc0nr6bih596r1dydib1rzypbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -14955,12 +14976,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180105.1142"; + version = "20180108.1934"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "464774515c348ad32bad4b062d768d443f44beaf"; - sha256 = "17pszvr2i27drym63j4hkmdhra5j6ixv5i2ab5b8i8049fbrnqzf"; + rev = "d74fb168948c2b0142a2ae9cb6180d7c67b137eb"; + sha256 = "0pra1kq4z2cmkgm278dw9nxza2sw056hh2463f28crdw6scdim3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15459,12 +15480,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20180107.2324"; + version = "20180109.1318"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "2e87dc528cfdde9b8e13bb7dcadc12f482bf98fa"; - sha256 = "1jl2mg3w2xj7njdvldilav0drgvr15ddx0bq8jkgxa9l0k718dl7"; + rev = "a2bcfd357e16b3404cd0e210fedbc9a584da83b8"; + sha256 = "1pqwra01w7wga9jrhafbnnlbn5rh31a0j84ffzsdpkcmac4xk0gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15920,12 +15941,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "20180103.1726"; + version = "20180108.559"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "4a529ce42a720960f2594b7081359c8766fc2643"; - sha256 = "1gr72wqs620i56cchblwgsca9wd0fxxcz750fpp594j7xcxn9scl"; + rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; + sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -16046,12 +16067,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20171110.1"; + version = "20180111.30"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "ab9596e03b749785919857f9785dc37c3c5dfc4e"; - sha256 = "0xn1dna7bwk5m144z53lpv0fxh5mg42gk8a7mgfz9d6yj890k33w"; + rev = "8c4735fbd7864a8420a16378ac2240fa60af5332"; + sha256 = "0g6prr8512dkr4mizqy1jkqc60w88i7kcx1lbarqi2mfkqdhhvg6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -17246,12 +17267,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20171229.304"; + version = "20180114.1000"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "e414534bd0a4149919647beec8fe4e342d2d1219"; - sha256 = "0ahxxjlfpr2zj3sbiz9xyb422pld8xhzzj5nkzxyfksbnbvms5hd"; + rev = "63661980cef82a8032108f5ce14d5bd4f44d1255"; + sha256 = "1wanfvhx3wv3iych0v93kaxapg86vzgbsd8l7r460s8l2nl5yybr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17330,12 +17351,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20180107.1156"; + version = "20180109.1604"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "138fd5661ac07b19525de7750177b1f0d2054006"; - sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd"; + rev = "e99f232fb3400545f096a19688a5030d0ed3afa6"; + sha256 = "0gga3nbpl1n5rbm87p030sidp38yq3hm9pwr0vavz75m1bcdbv3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17425,8 +17446,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "138fd5661ac07b19525de7750177b1f0d2054006"; - sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd"; + rev = "e99f232fb3400545f096a19688a5030d0ed3afa6"; + sha256 = "0gga3nbpl1n5rbm87p030sidp38yq3hm9pwr0vavz75m1bcdbv3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17544,22 +17565,22 @@ license = lib.licenses.free; }; }) {}; - elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + elisp-refs = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20171224.1532"; + version = "20180111.1431"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "d0a63ae9e564f082c904c02fa5123f3a557886c6"; - sha256 = "1h1jr72nxsjpshqp725dh4wcsahr9hkj6y3zc99m8lilndm3x114"; + rev = "eee751a6120f925cdffcfbb6a4545e599b953e94"; + sha256 = "01gckl8fwmwr5kp1qy4dcmvm7dh4677brwjy4xpqwhiq094fw9b1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; name = "elisp-refs"; }; - packageRequires = [ dash f list-utils loop s ]; + packageRequires = [ dash loop s ]; meta = { homepage = "https://melpa.org/#/elisp-refs"; license = lib.licenses.free; @@ -17652,12 +17673,12 @@ elm-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "elm-mode"; - version = "20171114.1225"; + version = "20180114.9"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "a01626ce462fffc11af1f7e64f6d520e363157f9"; - sha256 = "0v2c7h7j5y9mjvgwi7ki5pz8w9d2xcvab6s5i21yb5a6lihm0gma"; + rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0"; + sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17862,12 +17883,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20171012.15"; + version = "20180113.2321"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987"; - sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96"; + rev = "a545e51c73baabdd42535c6064030fb018d38290"; + sha256 = "1bvhgi6msimhfgv9y6is0kbyrckb83qnf8z4q22gy3l83impql01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -17883,12 +17904,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180107.1243"; + version = "20180113.339"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "e59e3d67b5a2053cb121d235bc51a0d6d438058a"; - sha256 = "1l3sr011cx8sclhw720iph9r03ja7fx3qcixpc65gmxy4r3ihjz0"; + rev = "db532f91d96bcd0371ea65bdfe22bd2696360b1d"; + sha256 = "04rv5f6pcnkqv07nrmq6fkcwsd145arp5b7p615bhcjc8q20d3g5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18122,12 +18143,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20170805.449"; + version = "20180114.707"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "127fd4fca8ac6470cfda62f47bb1c29859862cfc"; + sha256 = "0j7j7wh89a34scilw11pbdb86nf515ig38pjkwyarfvj93gigc04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -18517,6 +18538,27 @@ license = lib.licenses.free; }; }) {}; + emms-bilibili = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emms-bilibili"; + version = "20180102.2018"; + src = fetchFromGitHub { + owner = "0xDEATHCODE"; + repo = "emms-bilibili"; + rev = "294bca3dfc42fe3a55fb326ab39bc0fcfc8c5090"; + sha256 = "0q8z3q1agwgb3d0kpvac7a98p3q4ljjnv404cf9kihjjfxvh4vm5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/533f96d1e68eda20b2d2e7f8eb3e7fa118904970/recipes/emms-bilibili"; + sha256 = "1mx3fn2x526np8awjn0ydsqh59b4aznf3sig410fbr6wk6pa6y47"; + name = "emms-bilibili"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/emms-bilibili"; + license = lib.licenses.free; + }; + }) {}; emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-info-mediainfo"; @@ -19128,12 +19170,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20171220.1658"; + version = "20180112.457"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "71ce3ffd41bdc90c649a044ddbee0b32b329c612"; - sha256 = "0wfhhmv92ymq43h26bn0f7vjbmp9wisl76mqaydqir33a13y3a55"; + rev = "c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99"; + sha256 = "0kf1gcyfmh7zids4q2jwz6b0kffdhalfqx9ibk11adla8sf6bvj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19698,8 +19740,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "68a0f569410f7375c44a9d806930b1172c1d92a8"; - sha256 = "0vbrnca9rfncgyz95505mmg25wl95dab5djjw5nffd627sxgnj2q"; + rev = "fd30cdac0f62c70336330d94ac944bb110932cc2"; + sha256 = "1s48r5s5bc3lzngpfi9zpifd8nrzi4g654i2crz7ldjv0aiipdms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20134,12 +20176,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20171020.2207"; + version = "20180109.2234"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "9b1a49853909c4fae95d32bb9a68cace471c161e"; - sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib"; + rev = "1d8825dcc005b488c6366d0b3015fc6686194eea"; + sha256 = "1nqzd24wwvyzf3bn7m7vd4xqmj4p8z51h8cnli07yja17cr5gwx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -20323,12 +20365,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171204.1404"; + version = "20180114.632"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "8a5cefe1bfec7c76d03332c4f6dfc224ad4bc61b"; - sha256 = "1p0j7s1vz184l4100gri8x8g453x43k5fmfp3pkvlgifny1vf26a"; + rev = "157a3a911200eec217b439b82495eb4759756206"; + sha256 = "0ljirg9zbhq0cvyl5z635j7v6l5bp35bj8cfhzlrq4wiblfmh1ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20684,8 +20726,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506"; - sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5"; + rev = "49d6167d6bb97454afe1d06a5324483682de8ab6"; + sha256 = "0l3hmmkys3fw5yxs4kmjx5nrbjh9w19d0bfkryhbxhc5xszydvzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20827,12 +20869,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180106.1137"; + version = "20180115.156"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "1e448e5a426e5c03b8da5f0a203eaa4c681833c6"; - sha256 = "05b70vn46s05ag0s27wagpaznvas3n68hwl03sz84n8d48ix7i59"; + rev = "9d2f38130fd6a36dd6548d68b88a63edc0ddb1d4"; + sha256 = "0wdw4i20i3qi9xsbkdk9jvvkg92g41h2nrkx1z3ykw2cgikm6vq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -20890,12 +20932,12 @@ evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-easymotion"; - version = "20180102.2115"; + version = "20180113.2254"; src = fetchFromGitHub { owner = "PythonNut"; repo = "evil-easymotion"; - rev = "07e1c88b2ea9962e837f97b57dbf3c5bab22662e"; - sha256 = "1j3z7j2g3vsylaykinvbm47c2z8gr172qc6zdfpgzz0hskklkszy"; + rev = "79c13ed3bce018ac09d358e642e5bd7025e93603"; + sha256 = "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion"; @@ -20999,8 +21041,8 @@ src = fetchFromGitHub { owner = "edkolev"; repo = "evil-expat"; - rev = "152fdfacea2847d438cdd4e83779fe5a57edfde2"; - sha256 = "15lmv74nd9z87q09pg8dqfr94kmxbzd6a30dnadz3xv3sfvaqkv4"; + rev = "ff443637fc514813ed3139d99950391189a9360a"; + sha256 = "1w1yj0avg54gl7a143ib3rszi0a6arrvcb3s8j5pjr4hs7sy9jbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat"; @@ -21814,12 +21856,12 @@ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; - version = "20171122.1206"; + version = "20180109.1040"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506"; - sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5"; + rev = "49d6167d6bb97454afe1d06a5324483682de8ab6"; + sha256 = "0l3hmmkys3fw5yxs4kmjx5nrbjh9w19d0bfkryhbxhc5xszydvzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22451,12 +22493,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20171222.138"; + version = "20180109.2042"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "632b2c44d6e0c8b4b069e3188a1ea42a403c1ad1"; - sha256 = "0nxibjpjifpb6v2k1s1rbci1gjdnls94gd404jfmj4996z4q1wr2"; + rev = "f896674c527f41fac8faea2ddeafb2757c7b9766"; + sha256 = "0w605iw5p4z8jzvzq0608jpcp0hdk9x48w1rvqz9hmjncsi3af8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -23267,12 +23309,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "20170430.623"; + version = "20180114.445"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "888d037008272f6001207a2990e51ba87fe187e6"; - sha256 = "1r2clxm68nq8jhgc5cly51i6axjmi720r5m34dhf6zblwib4lfdp"; + rev = "cd0387f7f1d5c50e080091f86ca97d8a67d603a6"; + sha256 = "0q4cq1rkiz5mjxhp7p5awmw59q1yjb2sryc9i54cwhr5dwwqf95k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -23760,8 +23802,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "6bc54f00666d14197cb8685b42dbd49e19c82ec8"; - sha256 = "0wdmwiy9fd5lbxdp2iix3krb7ia0aly8n5bwxap1pmrl2anjzik9"; + rev = "4c2a09579d05453d1e21773165e8d4120d7990e3"; + sha256 = "0f2lp2jrxl5gx6ii9xfz7kz0n0q9x55xis2dylzpi19rgrqq8pyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24239,12 +24281,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20170816.648"; + version = "20180109.1512"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973"; - sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs"; + rev = "43c45859af448125dd48359dfd1259366c961ba0"; + sha256 = "118mm2khlrhlqw9074430vg78ixkb42f4xj7bcjl55yz5s01n3mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24999,8 +25041,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -26322,8 +26364,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "28d7339f2e70c617f2e8e3979b45d78883a27282"; - sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn"; + rev = "8925ea85143c4c91589213fbacb275e81968d76d"; + sha256 = "1f02idd8dw02q3ddr3p33xz3n3nhc33qv6fjsbz00pslw082gr8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -26591,12 +26633,12 @@ frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; - version = "20180107.901"; + version = "20180114.1048"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "5351741363bb9b4d44ec62ae91cbc9f102cf09f5"; - sha256 = "1a8hz0wqxb14d3kkv91v1wawqllggz7245h4sv62291jmvvhdbb9"; + rev = "4dbc6871d8220cb95d287dd35475725a1b7662ab"; + sha256 = "19y23jdfp9i950vl8ahywfh6gkf8cmy0nd3fk931xkx0x5kp64h9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -26800,8 +26842,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "bf5e51b5c33d5bdd5658f7e8275850d11fc39ca8"; - sha256 = "1sgq8nq6jzgy8akxycvcmgqjaf424v7v9r41pk7r8lw57csrnz37"; + rev = "b6f2f8564308509fda48753c6159367706d32215"; + sha256 = "0skf6cdmwjfx2ap8f4izf6awdxpjmcg6lx0vn67cdjk67kamxh74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26926,8 +26968,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "7c726dd897420c9387b3117f11fa78806b66d715"; - sha256 = "0lrpn51ncix4f6cmzac4kymb8w2g3fr44z66xchggdflhys6bvp8"; + rev = "89476d6f2c6c3d1fb8eebdad4200320a1e4e06de"; + sha256 = "1qpbsfa43fsqczpvxkdpjpnsjmwrwqn77kxayq892wmc58z2wkxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27148,6 +27190,27 @@ license = lib.licenses.free; }; }) {}; + gdscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gdscript-mode"; + version = "20180101.1426"; + src = fetchFromGitHub { + owner = "AdamBark"; + repo = "gdscript-mode"; + rev = "6a94583b36b87d30974cea754b42ff719b6d3b37"; + sha256 = "1cz6w9q3z7c729nff1gvwdzs7hlhi7daq8hql0w3pya4magi27pp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52f99eafb2e80a7fa13a98add98b03a147f35e8b/recipes/gdscript-mode"; + sha256 = "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818"; + name = "gdscript-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gdscript-mode"; + license = lib.licenses.free; + }; + }) {}; geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; @@ -27361,12 +27424,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20171120.1302"; + version = "20180112.1110"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "b46dce307e90c3527bc9ed9532a06f29ecf3b085"; - sha256 = "01r8pyfjb6jpa1fi2n4wplymyk0gz2b60g0ngn5hlpirbzqyvy8y"; + rev = "519e8397fb223bb1071b726ed65c59a9ebd9fa48"; + sha256 = "0fz6f9g1r6lzwvnqmlnn4lr91nn2s59wrv9ajm9baxvivgr4x8w1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -27529,12 +27592,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20171223.916"; + version = "20180114.948"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "1395d56496c1581dda0c70a091500e2b947b8d35"; - sha256 = "0p5vn34jln08y4hnywf2vxdcjcqmr043if4da0s3h2cawd7liw2i"; + rev = "2962611aad56a0f1586383b3e4ba6a65508a3991"; + sha256 = "1fj9942qd563wy7z97ylqc2xiwclg9qhfapwnabyi9m8pivwmwww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27550,12 +27613,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171203.1627"; + version = "20180114.1758"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "4c4a1d009790a805404edf72ff55df6fce3645a7"; - sha256 = "1m0r6g2arzh87iha1kbqb327vv7wy3m9iafw9czp3655k0sx240h"; + rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636"; + sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27739,12 +27802,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180107.1020"; + version = "20180108.603"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2"; - sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg"; + rev = "24ce90832ddff0db86581c1b7e947e83a13fe83e"; + sha256 = "0sxham9vg6m4j7f7p5ral56s4rzxfmy8an23zvq2n3832jsvvri1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27974,8 +28037,8 @@ src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743"; - sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d"; + rev = "92f8ad4afc802d01c24426ff52ad6fefb3bb91be"; + sha256 = "1ljgc7jmll3534zj1r72gh4al909slhiriscqv9lmvqzdiy3l21g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -28684,12 +28747,12 @@ gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; - version = "20171231.549"; + version = "20180113.516"; src = fetchFromGitHub { owner = "vapniks"; repo = "gnus-summary-ext"; - rev = "b2259a2501f4e0c23b51aedf056b812c8140b958"; - sha256 = "1y4379wrd2y9jzbg2bhifwa03nbf84xzb4rhfih6xmh9h5gg4bi1"; + rev = "025fd853fe9280ae696a89ec2c2cac9befd010aa"; + sha256 = "07ww2nc03daz70f2ajw7b2gin22xa306001zclhrxkm1cpjif2fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; @@ -29146,12 +29209,12 @@ go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "go-snippets"; - version = "20170831.2302"; + version = "20180112.2211"; src = fetchFromGitHub { owner = "toumorokoshi"; repo = "go-snippets"; - rev = "7e38fc0ddf2cc786cdb273882ff9b3563abc3c7a"; - sha256 = "0dsbp0x8qmv2k649x7l264zc8cv08dlrxz09lv643fchm56rsljm"; + rev = "d437df148879566ffe7f2e503a3cf2602aa9fb28"; + sha256 = "0rs2yj9bh0snf13hfj9bvyawl16j8416naz6h52l21q72ymd4b0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets"; @@ -29188,12 +29251,12 @@ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-tag"; - version = "20180106.2125"; + version = "20180110.713"; src = fetchFromGitHub { owner = "brantou"; repo = "emacs-go-tag"; - rev = "e7cfc490b728dad085ae3c741ef5220d5e88dacf"; - sha256 = "1zpj88kyvsnsxzwnmb2a0nlrgviskw6q31faw8y84q08iyp7d8gc"; + rev = "c04928bfd7ac571c831c1e5afe4cea6e009c3498"; + sha256 = "0433zy7fb1j15s74b8xsz0vl2z44613aimgv7r1y7bdlkgf7ma12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; @@ -29230,12 +29293,12 @@ god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "god-mode"; - version = "20171221.106"; + version = "20180114.1119"; src = fetchFromGitHub { owner = "chrisdone"; repo = "god-mode"; - rev = "8bc22eda77af3dc04d0e92e41b0776f61a8c90fe"; - sha256 = "1wg5hngpc16n1ds7yq6kqdf23q8r27v3ppcqcl4jdnx97h9fif99"; + rev = "d58f57b98ab13bbf4dc5775bdf456b2a57c41127"; + sha256 = "0x9f4rrfrz96kiwcnpgklw23bffxl7f14scck2vmp1wmkwzig7kb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode"; @@ -29675,8 +29738,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "d70eca22cace05a6ed7a5787ecd660724d65d911"; - sha256 = "0rgvlvv8dbm47qcw9wxrdd85rxa1csysqiyrhql6gwd4a5iwrbp1"; + rev = "ea983f87a41cd624eb743413193b6dd4a8a70e32"; + sha256 = "1fy507si285mk9ix0l3l6dm1df466dn2xv9bxxjnn2xjyx10n1xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29801,8 +29864,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1"; - sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87"; + rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; + sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -30184,12 +30247,12 @@ groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20180105.215"; + version = "20180109.718"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1"; - sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87"; + rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; + sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -31169,12 +31232,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180108.414"; + version = "20180114.2330"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "455ef14604064296b5e382b044d4775814d89eaa"; - sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf"; + rev = "43569379167f4cce6d7ab3f6b490135054de2c39"; + sha256 = "10wwm5d9s6h9lq365gbg7hj4j21k7z4k1dspzy7ir546gmj7n4ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31400,12 +31463,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171213.317"; + version = "20180110.1209"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; - sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; + rev = "adf0e363ef1a1feaa1c83ef7f16a7d6c408b62ce"; + sha256 = "0jj2qgia2sf4954g56ldgx1wf734qzqhxjy31m06xanvsmamyl6i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31799,12 +31862,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180108.514"; + version = "20180113.40"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "455ef14604064296b5e382b044d4775814d89eaa"; - sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf"; + rev = "43569379167f4cce6d7ab3f6b490135054de2c39"; + sha256 = "10wwm5d9s6h9lq365gbg7hj4j21k7z4k1dspzy7ir546gmj7n4ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32951,22 +33014,22 @@ license = lib.licenses.free; }; }) {}; - helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lastpass"; - version = "20170914.142"; + version = "20180114.937"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-lastpass"; - rev = "ae5d1252d60450082a5c26af3ad2be43994201ec"; - sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi"; + rev = "65ac0a80b5908b43ecd6a89c17f22f5c9c6734b0"; + sha256 = "18ncb6lnw06amwr1avh53gqifwg0wpwf2849z2k781dls3n5j4hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57"; name = "helm-lastpass"; }; - packageRequires = [ csv emacs helm-core ]; + packageRequires = [ csv emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-lastpass"; license = lib.licenses.free; @@ -33269,12 +33332,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20171202.1216"; + version = "20180115.137"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "94cb602d6373229c88126a5888f03f4b538f0771"; - sha256 = "0jf6dc461ki21w4s5hxj5mx57y3jilxxgd2sc11cv5ilh4x0776v"; + rev = "cd875b796e1a5d36ca99dede653a8e315a00029a"; + sha256 = "004sxd3v414ac7d85jkfq36nbicyr153gias0rbmlykv660xf5dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -33756,8 +33819,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34298,12 +34361,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180107.728"; + version = "20180111.1504"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "04073c80f3c82fa488edcd0cffa4961ff40cf885"; - sha256 = "1cv7ajqrb0mqqlbv1b34ccj4k2qpi3bv217fkh580l8y6g2lcdk6"; + rev = "5746e9dbe486c75fe4904575f9663c2da455013e"; + sha256 = "1any3ikbr8q1i5shwiwmal2d2i3bcnlkjfhq56xaxcm5rx2k1ss2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -34973,8 +35036,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "cba1110ca413a41a443b8368d63d295d7d36de7a"; - sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq"; + rev = "6f6db40cca1b759f78d7e4b971111e40833c3aa0"; + sha256 = "05xlk8pq19vh61cvpbp6156pd5ynnp8zqnj09j0hp8k6kd3wq62z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -35828,12 +35891,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171202.1141"; + version = "20180111.2238"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "3220f00a9bdb24667a1c3876b4a2f889dcb77501"; - sha256 = "06aw6l8nn8w6a7dfwh9ifs41acyq0jycszhhisv0idqrs8q5njsv"; + rev = "c2a86c9d5e763723abb52a603614bfa39d2ddde4"; + sha256 = "11pf65616hrzfglmwgiwc4ar866hdz1f3zbfraiqigm0fczmm5fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35973,12 +36036,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "20180107.305"; + version = "20180112.757"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "df591e452f9a56c69fb69de961baa75751bae3d8"; - sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d"; + rev = "f022c86d566a4b0b4ffdc5c8c75a4a7b9468fa71"; + sha256 = "087rjk26pfa29igq3cbp48yaxlm4xqz62svszbdb1hjfip5y453a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -37251,12 +37314,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171213.236"; + version = "20180108.728"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "4769ab443e153a19c9d40522e5f40656b0ef4385"; - sha256 = "13rii0vnh9d981jklb6apilx8yhqyc69fxp095f7i4n0aimfa413"; + rev = "2b1ff2742c9b443529524d293c327817733b8d92"; + sha256 = "1zrfxn1k5npiqz9x2x30sxkxdni5d0dilps6131348lmf1lhli51"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -38363,12 +38426,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180104.1212"; + version = "20180112.958"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38384,12 +38447,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171213.317"; + version = "20180110.1209"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; - sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; + rev = "adf0e363ef1a1feaa1c83ef7f16a7d6c408b62ce"; + sha256 = "0jj2qgia2sf4954g56ldgx1wf734qzqhxjy31m06xanvsmamyl6i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38514,8 +38577,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38615,12 +38678,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20180107.1736"; + version = "20180109.1933"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "a87d37430afb4cfe1bfff8f65acf3197ca8e0fe9"; - sha256 = "15vshxg2yv2fy1s78xh7gns3lgk50x40y7kw3qvlsdrkfrwbkfdv"; + rev = "efe35d2f579202ca14a90cfd46ecac624109558c"; + sha256 = "1vsgz2qg8mxd3lw590zzy9zn72lcvmrixp8j9h65gjqqdwz7xzwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -38640,8 +38703,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39201,12 +39264,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20171007.835"; + version = "20180109.1233"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e"; - sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh"; + rev = "bffcac3e7a8c57da359185e01ae5a6bdce0ba8e0"; + sha256 = "0bv1pkl6a9a9cs7ka3v17lqb45nx11mg779x7l54rvlkxg4ppchs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -40457,12 +40520,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180103.1058"; + version = "20180114.917"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "3fd999ba8940ddda2ad9db7359901d3573a58864"; - sha256 = "1mc9x9pr51dkm1h70ijvllympk2nch52pqy1qzh4m09haqw6akxq"; + rev = "8689b8533bc8530f5380e913c8e3f8f467501732"; + sha256 = "1q3178s22m3vxqikjzwlzwrk32xac1ksvrpqpjbqj0f9mzs6ljsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41779,12 +41842,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20171227.1709"; + version = "20180112.1950"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "cf0c9d84a4f24c1af8059b73cf4ff40343f2b8b2"; - sha256 = "18dlsvsk3az7z26929nx30rkxw9v7aj3x11zfr6rfbawm6xc6fql"; + rev = "eff3e16d7b98af3f74ebc464d7bd4f156335600d"; + sha256 = "0lnvqhgcc1wg485x2qvjy13bfdkysrdfg30x3zjgpgrqxmv123ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -42056,8 +42119,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "3878e7009e9d1d8f3fb26e1b8bdaf21e681f1b52"; - sha256 = "0c88my6c4ycbjqwd8m5jw4ilh4bfap3202sr11z0r6wvc6kf44wk"; + rev = "5faa7106419263689bfc0bc08a7451ccb1fba718"; + sha256 = "010l1xz9wa6wm7fnajxcdxjl1nmbkwxxwszd4h14xmhj830560ph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -42333,12 +42396,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180105.1040"; + version = "20180114.605"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "ee96631f416c410dd30077311f593bf1c58eb50e"; - sha256 = "1hvlvyx0iarh7p8n8sgz4x75clg0i3f4chfis0zi0nxag274nl1r"; + rev = "3ef046fab34c3ed645d03f3ab0d8c510454aa647"; + sha256 = "089w81565k915j2bzg8d7xqf2k30004j0sn720kd434f2qjgx05y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -42648,12 +42711,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20180107.2134"; + version = "20180114.2302"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "00b7d06e525ef8d18064261ff125ac965ad06e8f"; - sha256 = "03qklbvz4w0qxcw43pj9kmsj5gnl1c3x3nywirjsn0klldi5q37r"; + rev = "84d165ad5abddd2579ebad0bf0bf5bde92d307fd"; + sha256 = "1mhdw2nw30zy253icw0wviwxz9yxpkbd7pga2diclwcmapn9l2w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42756,8 +42819,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "14e29de03db7e2b075b70fdb419f7ac428381b11"; - sha256 = "01ly5kms4w7b3jqq3d8d11cg18mlqivzk6ps9hb14wissv4mqg9f"; + rev = "3b8332372a3b2083da26a11a2de4a5a452e1119c"; + sha256 = "0fi732z5ilav8dx7zbq86398pq3glxf67z2xanj9r8j9v0zyvks7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -42999,6 +43062,26 @@ license = lib.licenses.free; }; }) {}; + lognav-mode = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lognav-mode"; + version = "20171230.1052"; + src = fetchhg { + url = "https://bitbucket.com/ellisvelo/lognav-mode"; + rev = "a9b53f2da040"; + sha256 = "0ka92x63zfgraby5ycypn3ri2s3s2b1m2j7fpb4r37bk9xkf90v4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad86b93f4982a0c6291c771e12c8f42ace3b88f9/recipes/lognav-mode"; + sha256 = "1941scifg3nn7gmnki3sa9zvwsbb84w5lw2xjmdx0sh8rbxaw8gb"; + name = "lognav-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lognav-mode"; + license = lib.licenses.free; + }; + }) {}; logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logstash-conf"; @@ -43296,12 +43379,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180105.103"; + version = "20180110.1914"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "768b07d3a76af7ba8dbe4c25aae6379da05fb306"; - sha256 = "1lv8i9lwi1r2npab0nrxmma8ghzlj8nm06kw8iyjyh5c83vi9wab"; + rev = "a8f23913753a2df7901c19bcc98d620feeafb1d9"; + sha256 = "0g9sglwvqwbzy5wilhjwcy8xc56mjvd0m33y3bjxrwyy1vfk99mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43359,12 +43442,12 @@ lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }: melpaBuild { pname = "lsp-rust"; - version = "20171128.331"; + version = "20180115.556"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "e560b81f21f770648a1a8621add9a2fe3dbe83af"; - sha256 = "1xscv5zbbz2pr893pb8a0c4mpdfkz5x2b8xmsk69960azslv7cd6"; + rev = "bdd9e82864a2fb34f7a67775158caa948e237e7e"; + sha256 = "00rlmsq9pab5r6lari82bhqfh6yr875p5vn7npckl0gfcwzad8kv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; @@ -43380,12 +43463,12 @@ lsp-ui = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180107.2330"; + version = "20180114.811"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "cc4e2035b1a7594bc0de1dd84e5bb6d7b607c39b"; - sha256 = "1i6z4slca09rnsd0n589wxm5dazkm7dkxzp0l5v522glys0p36xk"; + rev = "2c108f2dd7b7c09c43ae6b446762eb70fdc0716b"; + sha256 = "1m9ghm1wlp8fgfjsmisw0xyy17782n68q6zahqal2h9hnrndjdrp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; @@ -43737,12 +43820,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180107.832"; + version = "20180112.900"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2"; - sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg"; + rev = "24ce90832ddff0db86581c1b7e947e83a13fe83e"; + sha256 = "0sxham9vg6m4j7f7p5ral56s4rzxfmy8an23zvq2n3832jsvvri1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; @@ -43956,12 +44039,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171217.1235"; + version = "20180114.904"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "3f23e81eb0267d6578d8f1733c5e42699b0229a1"; - sha256 = "1nv3gc3wb7r2l9hbsgx78gqbcdi6iw1l9a0nqq5vjvr3cmb014r4"; + rev = "5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2"; + sha256 = "0m8h6jc87bcl3lhygc06la4hs7sh6c7vflxlqvwr3bfmknl8l8yw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -46215,12 +46298,12 @@ modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; - version = "20170625.1306"; + version = "20180110.1231"; src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; - rev = "b0a45dc1d7c49854988103c2570c783f46f44566"; - sha256 = "1gh7l6c4xznpjialbmswhfm1cmmbzkl2s6acjcway0nb52rshgr6"; + rev = "9b10e1831bac34685be89e32e83ed969c4bac683"; + sha256 = "0csaky9k24hd3qjhb3kyraycvlsdkjhmw6bbd36z0q0ac56sd2sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; @@ -48501,12 +48584,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20180108.305"; + version = "20180111.947"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "e585ca177a55808a17a53e8a9020198a18175543"; - sha256 = "197dr52a2xw3da7zaia48qndmgrs3h8nx6wan9zslpy8497c8bbn"; + rev = "8e321f1036770c20637a0f946b655805cd070e25"; + sha256 = "11hxf0fkka4mv1qsw0nx3ymvgcav95r2bvk1gwyj5m5cbwb4a1n9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -48711,8 +48794,8 @@ version = "20180104.1635"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "54982e520c3bee74e947e311ee5b1219396fa1a8"; - sha256 = "00ni0vnsq4p7cka9jy9fw2rdmkm3gxii7blq1c87bpbvrlwjzrhl"; + rev = "12541fea7fe333f7c154a4a12a1d40394c2d6364"; + sha256 = "1r5a5smg2mc28wy3iq4sp8p0rmpqsi5ajk31hwc9lhldklz2c0nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -49258,12 +49341,12 @@ ob-clojure-literate = callPackage ({ cider, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-clojure-literate"; - version = "20180106.2121"; + version = "20180111.210"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-clojure-literate"; - rev = "e2b264f0f42467436f71aac81ca848fe9ab517d5"; - sha256 = "1w0mga44s7lghivw0ixm8gb8ryav5myd9i4x0xbdc8512jgy6a91"; + rev = "7acb5d1e9a84c9caa1e8477cdbb60d9a5dbf2eaa"; + sha256 = "1n5w7c181x5zbkmcvnzk2hxi339p2mfjwlhkxnfh3i20hzgqxci6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e958745861c9673248955443bcc2c76d504b32f7/recipes/ob-clojure-literate"; @@ -49531,12 +49614,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20171209.634"; + version = "20180113.929"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "a3bf46dd6c9a76f4cd5058f3ab5426d90f0c073a"; - sha256 = "0ck3r5qwp4184anpa9f9hjp3rra6yx5hkwcxg1byippp75hdc50m"; + rev = "75b84cb1ca09dfa84113fa0790e182299b72244c"; + sha256 = "05yhrivsxf8qvnhvsdb5kdq1a881l5c7d3apz1sk2mdxw89vcv7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -50968,12 +51051,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180107.1655"; + version = "20180111.1500"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "42596a3c29e9b6b64c05b04db04d23ea282560e4"; - sha256 = "1ca0x87i6vqs004dr6qc9hi1lqbvj82464cbfj3vr0z2n5pi7hl5"; + rev = "a21280a0dec3a44d9673deec0e4bb4d57da4db5f"; + sha256 = "15ikqddngdzfsbsapdfnn6c10waxy4cf228k4f02pcp2zk4zchhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -51322,22 +51405,22 @@ license = lib.licenses.free; }; }) {}; - org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }: + org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-drill-table"; - version = "20170408.1205"; + version = "20180115.209"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "org-drill-table"; - rev = "5662511e98697e086149a223a64f9f01fabf7330"; - sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx"; + rev = "096387d929bcf3eb479e0a9d5da9cf32c756a759"; + sha256 = "1a8ygrcag8i9hdpy2vsn0sh8lwhl9b56rv91j3rddy1jv5qx1ipb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table"; sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69"; name = "org-drill-table"; }; - packageRequires = [ cl-lib dash emacs org-plus-contrib s ]; + packageRequires = [ cl-lib dash emacs org s ]; meta = { homepage = "https://melpa.org/#/org-drill-table"; license = lib.licenses.free; @@ -51828,12 +51911,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20171229.1823"; + version = "20180109.1823"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "ad3ecfc75bba19625dab07f4ff0483f043ddaf70"; - sha256 = "09y9pamb7zld41qlvfpp5szl0lyblrjd2211qzbs8zm4mk3hlzy3"; + rev = "3f1f1c7856e3e3b1482acba990bf440c13274752"; + sha256 = "1ll0ips9hs8ayk2ykh3297kby8imjl638rv12zps480mg15fmrvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52240,12 +52323,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20171222.818"; + version = "20180109.1919"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "66e23994c0964762b7a4bfe8662e81aa609e7a22"; - sha256 = "15kqfp0l0dsyw7qb7yfdfxsbjqzg7kcfp43nv7xiw808616vn7m9"; + rev = "4e32cc616df85b3e23874697abb2d1a0ac538679"; + sha256 = "1qg51km535s0i1m1zcgx6lvcsv687fx60dmvpq6p8cfqfq31h5z7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -53667,12 +53750,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180107.1554"; + version = "20180111.1032"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "44ac07fb5d3a30662dd2c4643fe9d9e3ce85465d"; - sha256 = "1p3053kkjq1kv91jm6myp3ikjvh53c3yrnvrxfg5jndr6p1zawqz"; + rev = "53cfa26dd7518b13f0d39e3fce060a844e485de1"; + sha256 = "02v4gf88lc6v3kwxx419bpg71wlb949gnz0ywjh45knbgn5kyb1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -53898,12 +53981,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20171004.1553"; + version = "20180115.405"; src = fetchFromGitHub { owner = "msnoigrs"; repo = "ox-rst"; - rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; - sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; + rev = "58715dcba3922b5c7fc8ed5e7915277a9732fae3"; + sha256 = "1267rfj1rq04g9ngw0yglsdjma6bb04j3fc8afwsjixnbqv618kj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; @@ -53919,12 +54002,12 @@ ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-textile"; - version = "20171120.1758"; + version = "20180110.516"; src = fetchFromGitHub { owner = "yashi"; repo = "org-textile"; - rev = "e40472b13aee3d7dbf7bd916825431547024303d"; - sha256 = "112d8rzwz5r9ny0k9l080qxq0ly6alwbj0wfh22678hjwgx69zcn"; + rev = "0af57d17c93049bf7533061863f711d13fbed891"; + sha256 = "17jgb5bn3c4q4gasb2xas5bs3mrd1drnizgbqpnc50c8jfmcr4kd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile"; @@ -54381,12 +54464,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20171217.551"; + version = "20180111.1014"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "4e10a68314afb5087163ee09133b9032a368c85f"; - sha256 = "11v0q3d68q9am9scjd38lw2vqx48aqzqs32316i9xsbp962snrxw"; + rev = "1eddc9be67ff66cc4a8e4eefc28f891f455df8d9"; + sha256 = "1pgkxyrgcf7c2yydq3694kgaz2h85iw2ybh9z4w297yh0zkp9a45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54469,8 +54552,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "28d7339f2e70c617f2e8e3979b45d78883a27282"; - sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn"; + rev = "8925ea85143c4c91589213fbacb275e81968d76d"; + sha256 = "1f02idd8dw02q3ddr3p33xz3n3nhc33qv6fjsbz00pslw082gr8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -54694,12 +54777,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "20170501.347"; + version = "20180111.20"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; - sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; + rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5"; + sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -54757,12 +54840,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20171010.410"; + version = "20180109.201"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b"; - sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17"; + rev = "855e89446676f03065ed01e4a5c8dfba5eca3610"; + sha256 = "0s784pvv8jxiicvqcb9x0nynnpp0m431vw835qhp1pi1y4cfbbf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -55345,12 +55428,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20171012.2226"; + version = "20180109.1234"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5"; - sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv"; + rev = "9241a79bbf159ba0b079ebdbfa8ad1b3e69cf8c0"; + sha256 = "00v2rqrh3z93s651j1i1z9i6chr0lxw1kbnkpr56pqrh5rbvy0q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -56183,12 +56266,12 @@ php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-runtime"; - version = "20170901.1106"; + version = "20180110.934"; src = fetchFromGitHub { owner = "emacs-php"; repo = "php-runtime.el"; - rev = "e1bca88ab5472e9b520b4ce915cd27d1e7803c2d"; - sha256 = "1krnfzck9j5wmda1rkmzhl9lcdzxfw324xfy4lz92nwb92mgw8gq"; + rev = "fa4312863245511462b75cb31df2f8558288f4df"; + sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; @@ -56726,6 +56809,27 @@ license = lib.licenses.free; }; }) {}; + play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "play-crystal"; + version = "20180114.224"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "play-crystal.el"; + rev = "0b4810a9025213bd11dbcbfd38b3ca928829e0a5"; + sha256 = "15gqr11paz5qmx43qb0f95wc87nn2snr7my22b0n6jwbk5djf402"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; + sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; + name = "play-crystal"; + }; + packageRequires = [ dash emacs request ]; + meta = { + homepage = "https://melpa.org/#/play-crystal"; + license = lib.licenses.free; + }; + }) {}; play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; @@ -57701,12 +57805,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170823.159"; + version = "20180108.2326"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "6cc79cc933968f9ecae988ed79398d9dc97790e2"; - sha256 = "01k1k68rwwpjdajc12dvpjr8jfncvj8lli2l6065jwbq8ldg2ja0"; + rev = "0e8b95c4e5898a03e85dbc555c37b4f968292aec"; + sha256 = "0l8i0fbwwyhllkpk8xd6w5gcv65z4ja1ygf6slh5sd1g0ixh29md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -58544,8 +58648,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "bab843b8b96757ed2138fdc01dc5d82d47a2239c"; - sha256 = "0b5vj227rr501fzy8y6hbg0q2y0z6hs8yk39m7crw3fwd4zqyn0h"; + rev = "47b7d2c7cadf74ceec90fc5042232819cd0dd557"; + sha256 = "0kjhxqrbyj5rlfrkfbn8wlr4w1yi2i2r8pgsw7dz63rabf1xd0fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -59283,12 +59387,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20180108.310"; + version = "20180111.1529"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "eefbdec87ae923c91dbe33fcfc1af5a47b2e2ba5"; - sha256 = "0y7m9446dlip4qwx7s3w2jgx5s0r1s4cjvgacby20l1vs25k5drk"; + rev = "157bfbab77ac74d504567ce2a3874b575976f7a5"; + sha256 = "0l9p7yc57agiq7hh2jkb8jb93nswm9skg4s6di32n99cpjv22npw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -60669,12 +60773,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20180102.1645"; + version = "20180115.127"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "2b3ffb5c375dd32a633668eec969148590b489b4"; - sha256 = "0sbldlhji6rzxjs2hip54sn376ar6rqbyaancmg85y85349q6q3b"; + rev = "a5853d53a63e8a23b7b4c2ae0faf575623637c8d"; + sha256 = "0yalj4nn42g32xjr2s5hvlhinyhz1jjyx74494c018prybs16z75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60990,12 +61094,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20180102.1356"; + version = "20180112.838"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "73a87f907871e5dcd559e2ed2ea73370021b0390"; - sha256 = "1j1i8l81a3s5h482r7whsdl1fbgmnb2s2zijf7vbnq92dvmx6pfm"; + rev = "191555243a38977493954276f61851c182f7ee06"; + sha256 = "091j5f1i5fscvlpr68mfdsb7gbcl0xkbzqibphyarlnmgzw31wsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61451,12 +61555,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "20170826.2252"; + version = "20180114.2334"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "179ab70bb3d4f7a94401dace64f695c50acfe389"; - sha256 = "1j54l002vq8hz1pghyas4aalqhsnma5czjh4fh5s5cs4v7v6d7s8"; + rev = "770234c5b3370f758ed4d1935bf7e1d0d3a7dcec"; + sha256 = "0650x87dp692rkn8z04kvxxzyxygx65fn5cmjjjy9wgvgxr3w0dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -61980,8 +62084,8 @@ src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d"; - sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8"; + rev = "ed8ff80f7fb7a9d46715577e4937de756b001ff7"; + sha256 = "14a6qhh4rvsn1z8jhj4wjlljmxmmq2hrmsqpfmvx7yn1r3x51liq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -62211,8 +62315,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62606,12 +62710,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20171208.1015"; + version = "20180109.544"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "27911c88b0d32b66429d61bb056ecf1b10e66598"; - sha256 = "1p8z1s3j0cbwxkbcb1p3h4m1vmrxrpkch0xax24jmkpzjrqhl7j9"; + rev = "cfb440810a010b099e7196f8701c9d990a3641d8"; + sha256 = "17mm7mk8s4s9ka7035bf7bd6sfxwi3m2iss9q3pg2d7931nzh1dz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62669,12 +62773,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20180102.547"; + version = "20180114.1004"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "fee33898b5726b3c15b6ceb2ebb051bebd4f3592"; - sha256 = "1rpn309s7a7rgs2n9l4m409x2r5p83xkgaq1aa2dab4p594hy29g"; + rev = "4dbe9e472306e5d293213842d9488c0b531eae8b"; + sha256 = "0l4153dczvkl88xnppqwdmj78c9rfj1bhl2d4c2sr1gc6hy7nj9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -63047,12 +63151,12 @@ scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scad-mode"; - version = "20170219.2003"; + version = "20180108.1809"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "3473eb1a568669779e3e896ededd0d0708766fe4"; - sha256 = "0d6ky2kglqraq61k9ikk1nbrpmra8h16vhhafkail41wq36vx6x5"; + rev = "b8327fda10f90801209c584e596a572275452f1c"; + sha256 = "06p5ig8haz03vd0by60b5nrf3qy0damwhidvr2s5ycm5mapqaxkc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -64410,12 +64514,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20171224.1958"; + version = "20180108.1712"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1"; - sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d"; + rev = "d56e64b44cebb53a06c5a1eadafdbeba696dc9df"; + sha256 = "1l5kl8y46c62q9fhb173zkygfli9cnya8n9k3vc52k3i43xikg90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -65229,12 +65333,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20171230.1630"; + version = "20180111.429"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "179741a0616f78f4e5901fe04dea79654c504fba"; - sha256 = "0vljhr6gkmw5jkdzhq6vsl9sa48hv1a02d9g4sfwqraz85k4x85k"; + rev = "2e7f94633acebd5cf4074ce9601b021624ad8233"; + sha256 = "15brbny68wjfcm1sm6981d3w6hylvblg1y4jiq652bp04nhzdr84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65397,12 +65501,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20171220.1443"; + version = "20180113.717"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "436094626698e77efa38cbf45681db7ea6b7e9f7"; - sha256 = "08zii0vaa8w72adi2fy7v5rwvqp8kbv2wv0cws1q6wz9z95jjnmx"; + rev = "70df0149391302619b69cf56884ac8711430974e"; + sha256 = "1nw5h6icmvfd88n51hlrrpr39zm2h8387364sfk2s1kr41y2d707"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -67124,12 +67228,12 @@ spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: melpaBuild { pname = "spiral"; - version = "20180105.1253"; + version = "20180114.342"; src = fetchFromGitHub { owner = "unrepl"; repo = "spiral"; - rev = "b25c42dd5add3192e846a5fe34be689e73f0c28c"; - sha256 = "16ls5iy98p9y8f5q9l3wz1g187zbpli2zgcjvnsbsv480bdpzgf6"; + rev = "7c79f538524b8ffef2cd8592dbdd6ec2965a2f7d"; + sha256 = "10rc84p30iqy19bdiz0bnki8c47jv42fdidxi7dkizjxmymx0hn5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; @@ -67628,12 +67732,12 @@ stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stan-mode"; - version = "20161023.1958"; + version = "20180110.1441"; src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; - rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; - sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; + rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; + sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode"; @@ -67653,8 +67757,8 @@ src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; - rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; - sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; + rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; + sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets"; @@ -67817,12 +67921,12 @@ stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stem-english"; - version = "20170113.24"; + version = "20180108.1958"; src = fetchFromGitHub { owner = "kawabata"; repo = "stem-english"; - rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70"; - sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz"; + rev = "c9fc4c6ed6bf82382e479dae80912f4ae17d31f4"; + sha256 = "1bkmgjfp7xir6d0yf782xkjvf595blrqhr3hack26jg5zl8qsrya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english"; @@ -68256,12 +68360,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171229.1712"; + version = "20180111.1523"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "5caf98ab49c6b3c421d8f274c0682bbb7fc662fe"; - sha256 = "1niifkdirlwcyx5rk398dgk9lqnqr06ilhh0r89hx1xxdnbjglbi"; + rev = "79d3b73848b41498d33f009dfa20dcdfe52837ff"; + sha256 = "1zcl53knrwqz7ifhdlg6ya77zd9glnn1hfixhhqfp46c71c3ns56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68508,12 +68612,12 @@ swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swap-regions"; - version = "20160413.1023"; + version = "20180114.936"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "swap-regions.el"; - rev = "2789091b6f34c0d4b82546eb39c4e73dc96e8679"; - sha256 = "1m0apxjcj6xhbic36il1mbbril6pw2h6d9kmsb0jhibyy6mc8r78"; + rev = "c74ddad3d3916fc57becfbad90c8981d063c27c6"; + sha256 = "1ag5y81v3z8jgwjvi7dk8g63f2dawixmdb7ghna516dnjsdg2njq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6805c7710618ed1178ffd3488295d4d6b33e8ebe/recipes/swap-regions"; @@ -68613,12 +68717,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180102.1035"; + version = "20180112.1001"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -68928,12 +69032,12 @@ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20180105.831"; + version = "20180109.316"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "01fa7cf280d27dbb2af2261cc0e8ff2aa14742b1"; - sha256 = "19snnxiyjkgzsrdynxdyzmqc168jdzcvk9jr5g2w9ca2f0x7m9s8"; + rev = "0118d3a041448dbf98c1ab8cc25ed75d7649ca17"; + sha256 = "0s1hamnrnh64v8sl816vd259y6j7r8rjy8avxwlfp65ah4xlcdcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -68990,12 +69094,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20180103.1837"; + version = "20180109.1407"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "f5576f36885f97c9c753e5f1b80318efc626210f"; - sha256 = "1ylmqlv2n0f3qqxf60gq93fr7z9zjghivy5swml3s8r3pc8a3iyy"; + rev = "936bb1a1f3df903e73d1485a14dc483a790b2573"; + sha256 = "0hrs1mmw03aylxmmrp6gcnzs5by2fp18zsyiw4jkmzwg4fhxb1ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -69997,12 +70101,12 @@ texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "texfrag"; - version = "20171229.1913"; + version = "20180109.1546"; src = fetchFromGitHub { owner = "TobiasZawada"; repo = "texfrag"; - rev = "ba1382c073b1f73cb411fb30e618480b9a804916"; - sha256 = "19cinynqicsfdvpa8jmrrx9xmbplw2wnykm3bcii8rs5vkwdh61b"; + rev = "204349999ed8655f1013267e90caed68c1e7b6e7"; + sha256 = "0x6mgpds5gbm9igqwzglnddxbm3dbdba16xg73m7c20ws3wjdz2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; @@ -70274,8 +70378,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "1b855d47aab32dc89e6e4271e8ac8872b049e1ba"; - sha256 = "1qrisw42nzbd1m09aihpigc63xm0yhhli5103aibww0pa904fr2d"; + rev = "f64a3fcaf9ae03b94b6b462168eb6f990f71084e"; + sha256 = "06fc8gxxyf4x5j7hbp6p7zipncqwmai7k6clcma5d5wmgjal3wj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -71108,8 +71212,8 @@ src = fetchFromGitHub { owner = "raghavgautam"; repo = "tramp-hdfs"; - rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35"; - sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy"; + rev = "f8406f77bf83b66306ced693a5e4aaf606f46762"; + sha256 = "15zr1fcmjk4mzjvmfbbkz5v9ryfgcjk0ag6rwxk8rp6wzwxcxvvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs"; @@ -71272,12 +71376,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180107.1246"; + version = "20180110.923"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; - sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; + rev = "692f5be4ab6a4868978dcb2639334f78a267cfd2"; + sha256 = "1r279a4avaccqjgw4wczai293rxcvacp9iw8gfqimfhl02gacklp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -71293,12 +71397,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20171225.951"; + version = "20180110.905"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; - sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; + rev = "692f5be4ab6a4868978dcb2639334f78a267cfd2"; + sha256 = "1r279a4avaccqjgw4wczai293rxcvacp9iw8gfqimfhl02gacklp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -71318,8 +71422,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; - sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; + rev = "692f5be4ab6a4868978dcb2639334f78a267cfd2"; + sha256 = "1r279a4avaccqjgw4wczai293rxcvacp9iw8gfqimfhl02gacklp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -72582,12 +72686,12 @@ use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20171226.1104"; + version = "20180108.1754"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -72607,8 +72711,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; @@ -72628,8 +72732,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; @@ -73678,8 +73782,8 @@ src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1"; - sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d"; + rev = "d56e64b44cebb53a06c5a1eadafdbeba696dc9df"; + sha256 = "1l5kl8y46c62q9fhb173zkygfli9cnya8n9k3vc52k3i43xikg90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -73778,12 +73882,12 @@ wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20171103.513"; + version = "20180112.454"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "83c0c723dae7d8a37e67a9d9f2d00e005b5486ca"; - sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4"; + rev = "e8939812e03255fff3e15c5d0f9d4da849aaf07b"; + sha256 = "0l79vhf0s5rz9s02bmcfyx7yn4pvn3dnxkr50qfhqajrvfx1105g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; @@ -74240,12 +74344,12 @@ weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; - version = "20171128.440"; + version = "20180112.1217"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "f8e6a2361f4de2299b861dd8fea1d0a5502be7c4"; - sha256 = "1hqjc43bmn5bgad6iais9b4plb6ijcwwvvgyfgjfjmpb81inxdvh"; + rev = "4842e966a557e13fa4f16052cb60d221cdb886cf"; + sha256 = "0y4vdsm4rb221hmr2a2sn0kj51jsgndkmhwcjiryqxzn2giy9siw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -74429,12 +74533,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20171217.1916"; + version = "20180108.1930"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "ef384e781e6107850c7fadc78cb0675d7fe72e69"; - sha256 = "1xiw2blc1z2fvpz30i350gk28nfwlallnqvqmxibb84rydadx705"; + rev = "1219622b756f149efe4b44c625f2140c5229f936"; + sha256 = "14wfaqlixiqg79q6vb89jjvgvxwfgcdkgxyqh2bqsjwam9xksmlp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -74999,8 +75103,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "52fa9101d8c4"; - sha256 = "1ijzd3xmygkkkwm0ckkmi576y93drcs63l6bsc8qz2pvjcn5k8sw"; + rev = "d04938232934"; + sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -75037,12 +75141,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20171217.1239"; + version = "20180111.433"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "05338d893f3879391d7283324364b472e3f4f4d1"; - sha256 = "0h5wlskfb0xpw1jjijcvyl2ivylky3y2czmfi8f0qv9vz6g495w3"; + rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; + sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -75583,12 +75687,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170821.400"; + version = "20180114.506"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307"; - sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4"; + rev = "281b079fca7e3889f56f754dd00b0ae08fb55090"; + sha256 = "1mszy0xav31wk936gwj1xb43mp10l3nfh2cnk3baq2jx55z1cm1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -76322,8 +76426,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "b851eb86a8a78378ad0f734e2c56f3f5f4d052ec"; - sha256 = "009j6b7k5dc4n2zyi86d0bnl2a77ril9phqkx29jz5lcr0ndarwj"; + rev = "b028fc03a1526b166043e783add3be4f04b7a92e"; + sha256 = "0abl81q726jdhlirz77vl55xdbhpyfqrfqc2x6qdz9jmh04r912g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76591,12 +76695,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180102.1824"; + version = "20180111.1533"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "04062d8b4f7391069058345e1efd673add0357f8"; - sha256 = "11xn4h182p738apiphxvdzrnb4gc2nam039xzxfx9fsvfxph6ziw"; + rev = "203059a95e320b031ac0d2cabe9c1de68604baec"; + sha256 = "186varms4zmvlvakwnyip19z46fagwa05mnahhpb8ncmpjg6i7cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76612,12 +76716,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20180107.147"; + version = "20180112.516"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "3ab16fb46517d3f084ce838bb5fce71d22601a16"; - sha256 = "1nw95nmnc4y1l3dm44yn1kb88179x5455g5sap20dm7a6zxbf94g"; + rev = "f76efc2054ac41434544de96ed0a09a455b6c040"; + sha256 = "0lnmhlz1xml9ykishqn18ivpyf5il6lgv3bi5dx9bfnnd55j41wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -76633,12 +76737,12 @@ yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "20161108.1305"; + version = "20180114.734"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "07da11de32feb6cbce0f8c140c0304e3ba1b42c0"; - sha256 = "10af3pa8rh3rs0vpm436vm5wlwvqkfa3zpqyhdf2i3q4gaqfb902"; + rev = "caa8734afc559a28eb4ec5dc3f240434e51cafc9"; + sha256 = "0zzmhkadyyw56j1z6dgj3x81sb5mxd0s2r20vy5mrfm18cyvsdd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -76653,11 +76757,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20180106.654"; + version = "20180108.2035"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "668632d9392e"; - sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n"; + rev = "cef987df070f"; + sha256 = "1nryf7pizmwhyk2jw5dgild031xb6xylyyhr8pwx74iijcbpz2qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -76935,12 +77039,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20171216.1027"; + version = "20180114.907"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "62d91fd7c054b0747f1309c012976deb471d4608"; - sha256 = "1ddr47xy86kajwwf7dnzz9a9qh7bd9wkf7x30qwlygc41mg6w6zy"; + rev = "ce1f08372391fa17a974769930b904a0b893fec2"; + sha256 = "0dx7xcvgvsbd3y0glc8pwjzrra3a5gpwm894lay2ql1fcf8z8lhh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; From e73ac924c62369cc4ac05912e7a67facfc2e66b8 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:22:38 -0500 Subject: [PATCH 195/197] melpa-stable: Don't `markBroken rcirc-menu` (that doesn't exist) This `markBroken` annotation was either added in error (by me), or the package was removed from melpa-stable, but either way, it's no longer in that package set, so remove the annotation. --- .../applications/editors/emacs-modes/melpa-stable-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 6d23d508228b..a2ba794933ea 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -164,9 +164,6 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing file header - rcirc-menu = markBroken super.rcirc-menu; - # upstream issue: missing file header speech-tagger = markBroken super.speech-tagger; From ab06f3e99c7858657762649b9ebd23aba1c05d0b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 11 Dec 2017 17:26:41 +0900 Subject: [PATCH 196/197] neovim: init wrapper Adding a python package to the neovim environment should not trigger a recompilation. This adds a wrapper to prevent that. --- pkgs/applications/editors/neovim/default.nix | 87 +-------------- pkgs/applications/editors/neovim/wrapper.nix | 109 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 118 insertions(+), 84 deletions(-) create mode 100644 pkgs/applications/editors/neovim/wrapper.nix diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 0233d6345285..d7cfcf34a4d2 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,16 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey , libtool, libuv, luaPackages, ncurses, perl, pkgconfig -, unibilium, makeWrapper, vimUtils, xsel, gperf, callPackage - -, withPython ? true, pythonPackages, extraPythonPackages ? [] -, withPython3 ? true, python3Packages, extraPython3Packages ? [] +, unibilium, vimUtils, xsel, gperf, callPackage , withJemalloc ? true, jemalloc -, withRuby ? true, bundlerEnv, ruby - -, withPyGUI ? false -, vimAlias ? false -, viAlias ? false -, configure ? null }: with stdenv.lib; @@ -46,47 +37,8 @@ let }; }; - rubyEnv = bundlerEnv { - name = "neovim-ruby-env"; - gemdir = ./ruby_provider; - postBuild = '' - ln -s ${ruby}/bin/* $out/bin - ''; - }; - rubyWrapper = ''--cmd \"let g:ruby_host_prog='$out/bin/nvim-ruby'\" ''; - - pluginPythonPackages = if configure == null then [] else builtins.concatLists - (map ({ pythonDependencies ? [], ...}: pythonDependencies) - (vimUtils.requiredPlugins configure)); - pythonEnv = pythonPackages.python.buildEnv.override { - extraLibs = ( - if withPyGUI - then [ pythonPackages.neovim_gui ] - else [ pythonPackages.neovim ] - ) ++ extraPythonPackages ++ pluginPythonPackages; - ignoreCollisions = true; - }; - pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" ''; - - pluginPython3Packages = if configure == null then [] else builtins.concatLists - (map ({ python3Dependencies ? [], ...}: python3Dependencies) - (vimUtils.requiredPlugins configure)); - python3Env = python3Packages.python.buildEnv.override { - extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages; - ignoreCollisions = true; - }; - python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" ''; - - additionalFlags = - optionalString (withPython || withPython3 || withRuby) - ''--add-flags "${(optionalString withPython pythonWrapper) + - (optionalString withPython3 python3Wrapper) + - (optionalString withRuby rubyWrapper)}" --unset PYTHONPATH '' + - optionalString (withRuby) - ''--suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath} ''; - neovim = stdenv.mkDerivation rec { - name = "neovim-${version}"; + name = "neovim-unwrapped-${version}"; version = "0.2.1"; src = fetchFromGitHub { @@ -113,7 +65,6 @@ let nativeBuildInputs = [ cmake gettext - makeWrapper pkgconfig ]; @@ -140,17 +91,6 @@ let install_name_tool -change libjemalloc.1.dylib \ ${jemalloc}/lib/libjemalloc.1.dylib \ $out/bin/nvim - '' + optionalString withPython '' - ln -s ${pythonEnv}/bin/python $out/bin/nvim-python - '' + optionalString withPython3 '' - ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 - '' + optionalString withPython3 '' - ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' + optionalString withPyGUI '' - makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ - --prefix PATH : "$out/bin" - '' + optionalString (withPython || withPython3 || withRuby) '' - wrapProgram $out/bin/nvim ${additionalFlags} ''; meta = { @@ -175,24 +115,5 @@ let }; }; -in if (vimAlias == false && viAlias == false && configure == null) - then neovim - else stdenv.mkDerivation { - name = "neovim-${neovim.version}-configured"; - inherit (neovim) version meta; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - for item in ${neovim}/bin/*; do - ln -s $item $out/bin/ - done - '' + optionalString vimAlias '' - ln -s $out/bin/nvim $out/bin/vim - '' + optionalString viAlias '' - ln -s $out/bin/nvim $out/bin/vi - '' + optionalString (configure != null) '' - wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" - ''; -} +in + neovim diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix new file mode 100644 index 000000000000..2acba83d00bb --- /dev/null +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, makeDesktopItem, makeWrapper, lndir +, vimUtils +, neovim +, bundlerEnv, ruby +, pythonPackages +, python3Packages +}: +with stdenv.lib; + +neovim: + +let + wrapper = { + name ? "neovim" + , withPython ? true, extraPythonPackages ? [] + , withPython3 ? true, extraPython3Packages ? [] + , withRuby ? true + , withPyGUI ? false + , vimAlias ? false + , viAlias ? false + , configure ? null + }: + let + + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + postBuild = '' + ln -s ${ruby}/bin/* $out/bin + ''; + }; + + pluginPythonPackages = if configure == null then [] else builtins.concatLists + (map ({ pythonDependencies ? [], ...}: pythonDependencies) + (vimUtils.requiredPlugins configure)); + pythonEnv = pythonPackages.python.buildEnv.override { + extraLibs = ( + if withPyGUI + then [ pythonPackages.neovim_gui ] + else [ pythonPackages.neovim ] + ) ++ extraPythonPackages ++ pluginPythonPackages; + ignoreCollisions = true; + }; + + pluginPython3Packages = if configure == null then [] else builtins.concatLists + (map ({ python3Dependencies ? [], ...}: python3Dependencies) + (vimUtils.requiredPlugins configure)); + python3Env = python3Packages.python.buildEnv.override { + extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages; + ignoreCollisions = true; + }; + + in + stdenv.mkDerivation { + inherit name; + buildCommand = let bin="${neovim}/bin/nvim"; in '' + if [ ! -x "${bin}" ] + then + echo "cannot find executable file \`${bin}'" + exit 1 + fi + + makeWrapper "$(readlink -v --canonicalize-existing "${bin}")" \ + "$out/bin/nvim" --add-flags " \ + --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \ + --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \ + --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \ + --unset PYTHONPATH \ + ${optionalString withRuby '' --suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } + + # copy and patch the original neovim.destkop file + mkdir -p $out/share/applications + substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ + --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ + --replace 'Name=Neovim' 'Name=WrappedNeovim' + '' + + optionalString withPython '' + ln -s ${pythonEnv}/bin/python $out/bin/nvim-python + '' + optionalString withPython3 '' + ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 + '' + optionalString withRuby '' + ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby + '' + + optionalString withPyGUI '' + makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ + --prefix PATH : "$out/bin" + '' + optionalString vimAlias '' + ln -s $out/bin/nvim $out/bin/vim + '' + optionalString viAlias '' + ln -s $out/bin/nvim $out/bin/vi + '' + optionalString (configure != null) '' + wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" + '' + ; + + preferLocalBuild = true; + + buildInputs = [makeWrapper]; + passthru = { unwrapped = neovim; }; + + meta = neovim.meta // { + description = neovim.meta.description; + hydraPlatforms = []; + # prefer wrapper over the package + priority = (neovim.meta.priority or 0) - 1; + }; + }; +in + lib.makeOverridable wrapper diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50d21a120d88..651f1015e440 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17415,10 +17415,14 @@ with pkgs; vimpc = callPackage ../applications/audio/vimpc { }; - neovim = callPackage ../applications/editors/neovim { + wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; + + neovim-unwrapped = callPackage ../applications/editors/neovim { luaPackages = luajitPackages; }; + neovim = wrapNeovim neovim-unwrapped { }; + neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-pygui = pythonPackages.neovim_gui; From 7e5346c5844afcbe77d88d0729d1c45d0d615195 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Jan 2018 19:07:05 -0600 Subject: [PATCH 197/197] kwidgetsaddons: 5.42.0 -> 5.42.1 Fix regression with Kate sidebar. See also: https://mail.kde.org/pipermail/release-team/2018-January/010780.html --- pkgs/development/libraries/kde-frameworks/srcs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d4390da66506..f8d4bcf5c8f9 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -499,11 +499,11 @@ }; }; kwidgetsaddons = { - version = "5.42.0"; + version = "5.42.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.0.tar.xz"; - sha256 = "19fhcscc0irznqmjpi57sl22vrv2lcmqbhkcg2smimgd0r7pm7wg"; - name = "kwidgetsaddons-5.42.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz"; + sha256 = "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg"; + name = "kwidgetsaddons-5.42.1.tar.xz"; }; }; kwindowsystem = {